[pkg-java] r7553 - trunk/junit4/debian

varun at alioth.debian.org varun at alioth.debian.org
Sat Dec 6 23:58:49 UTC 2008 

Author: varun
Date: 2008-12-06 23:58:48 +0000 (Sat, 06 Dec 2008)
New Revision: 7553

Added:
   trunk/junit4/debian/ant.properties
   trunk/junit4/debian/build.xml
   trunk/junit4/debian/docs
   trunk/junit4/debian/orig-tar.sh
Removed:
   trunk/junit4/debian/junit4.install
   trunk/junit4/debian/patches/
Modified:
   trunk/junit4/debian/changelog
   trunk/junit4/debian/control
   trunk/junit4/debian/rules
   trunk/junit4/debian/watch
Log:
* New upstream release (Closes: #446464)
* Switch to openjdk
* Remove old patches, no longer used
* Rename debian/junit4.install to debian/docs
* Add debian/build.xml and debian/ant.properties to build sources
* Add orig-tar.sh script to generate source tarball
* Clean up debian/rules file and add get-orig-source target
* Update watch file

Added: trunk/junit4/debian/ant.properties
===================================================================
--- trunk/junit4/debian/ant.properties	                        (rev 0)
+++ trunk/junit4/debian/ant.properties	2008-12-06 23:58:48 UTC (rev 7553)
@@ -0,0 +1,6 @@
+class.dir=build
+build-src.dir=build-src
+org.dir=org
+junit.dir=junit
+doc.dir=javadoc
+jar.name=junit4.jar


Property changes on: trunk/junit4/debian/ant.properties
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/junit4/debian/build.xml
===================================================================
--- trunk/junit4/debian/build.xml	                        (rev 0)
+++ trunk/junit4/debian/build.xml	2008-12-06 23:58:48 UTC (rev 7553)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="jar" name="junit4" basedir="..">
+  <property file="ant.properties"/>
+
+  <target name="clean" description="Clean up">
+    <delete dir="${class.dir}"/>
+    <delete dir="${build-src.dir}"/>
+    <delete file="${jar.name}"/>
+  </target>
+
+  <target name="compile" description="Compile the sources">
+    <mkdir dir="${class.dir}"/>
+    <mkdir dir="${build-src.dir}"/>
+    <copy todir="${build-src.dir}">
+      <fileset dir="${junit.dir}"/>
+      <fileset dir="${org.dir}"/>
+    </copy>
+    <javac srcdir="${build-src.dir}" destdir="${class.dir}"
+      deprecation="true" debug="true" optimize="false"/>
+  </target>
+
+  <target name="javadoc" description="Creates Javadoc documentation">
+    <mkdir dir="${doc.dir}"/>
+    <javadoc packagenames="*"
+      sourcepath="${build-src.dir}" destdir="${doc.dir}"/>
+  </target>
+
+  <target name="jar" description="Create the jar" depends="compile">
+    <jar jarfile="${jar.name}" basedir="${class.dir}"/>
+  </target>
+
+</project>


Property changes on: trunk/junit4/debian/build.xml
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/junit4/debian/changelog
===================================================================
--- trunk/junit4/debian/changelog	2008-12-06 23:48:34 UTC (rev 7552)
+++ trunk/junit4/debian/changelog	2008-12-06 23:58:48 UTC (rev 7553)
@@ -1,3 +1,16 @@
+junit4 (4.5-1) experimental; urgency=low
+
+  * New upstream release (Closes: #446464)
+  * Switch to openjdk
+  * Remove old patches, no longer used
+  * Rename debian/junit4.install to debian/docs
+  * Add debian/build.xml and debian/ant.properties to build sources
+  * Add orig-tar.sh script to generate source tarball
+  * Clean up debian/rules file and add get-orig-source target
+  * Update watch file
+
+ -- Varun Hiremath <varun at debian.org>  Sat, 06 Dec 2008 18:54:44 -0500
+
 junit4 (4.3.1-4) unstable; urgency=low
 
   * Fix junit4.jar symlink (Closes: #470451)

Modified: trunk/junit4/debian/control
===================================================================
--- trunk/junit4/debian/control	2008-12-06 23:48:34 UTC (rev 7552)
+++ trunk/junit4/debian/control	2008-12-06 23:58:48 UTC (rev 7553)
@@ -3,16 +3,16 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Florian Weimer <fw at deneb.enyo.de>, Michael Koch <konqueror at gmx.de>, Varun Hiremath <varun at debian.org>
 Priority: optional
-Build-Depends: cdbs (>= 0.4.8), debhelper (>> 5), quilt
-Build-Depends-Indep: ant, java-gcj-compat-dev (>= 1.0.69)
-Standards-Version: 3.7.3
+Build-Depends: cdbs (>= 0.4.8), debhelper (>> 5)
+Build-Depends-Indep: ant, openjdk-6-jdk, libhamcrest-java
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junit4
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junit4
 Homepage: http://www.junit.org/
 
 Package: junit4
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre | java2-runtime
 Description: JUnit regression test framework for Java
  JUnit is a simple framework to write repeatable tests. It is an
  instance of the xUnit architecture for unit testing frameworks.

Copied: trunk/junit4/debian/docs (from rev 7544, trunk/junit4/debian/junit4.install)
===================================================================
--- trunk/junit4/debian/docs	                        (rev 0)
+++ trunk/junit4/debian/docs	2008-12-06 23:58:48 UTC (rev 7553)
@@ -0,0 +1,3 @@
+*.html
+doc/*
+javadoc/*


Property changes on: trunk/junit4/debian/docs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: trunk/junit4/debian/junit4.install
===================================================================
--- trunk/junit4/debian/junit4.install	2008-12-06 23:48:34 UTC (rev 7552)
+++ trunk/junit4/debian/junit4.install	2008-12-06 23:58:48 UTC (rev 7553)
@@ -1,2 +0,0 @@
-*.html			/usr/share/doc/junit4
-doc/*			/usr/share/doc/junit4/doc

Added: trunk/junit4/debian/orig-tar.sh
===================================================================
--- trunk/junit4/debian/orig-tar.sh	                        (rev 0)
+++ trunk/junit4/debian/orig-tar.sh	2008-12-06 23:58:48 UTC (rev 7553)
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=junit4-$2
+TAR=../junit4_$2.orig.tar.gz
+
+# clean up the upstream tarball
+mkdir $DIR
+(cd $DIR; jar xf ../$3)
+GZIP=--best tar czf $TAR $DIR
+rm -rf $DIR $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/junit4/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/junit4/debian/rules
===================================================================
--- trunk/junit4/debian/rules	2008-12-06 23:48:34 UTC (rev 7552)
+++ trunk/junit4/debian/rules	2008-12-06 23:58:48 UTC (rev 7553)
@@ -2,19 +2,21 @@
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME 		:= /usr/lib/jvm/java-6-openjdk
+DEB_ANT_BUILDFILE	:= debian/build.xml
+DEB_ANT_BUILD_TARGET 	:= jar javadoc
+DEB_JARS  		:= hamcrest-core
+ANT_OPTS		:= -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
 
 install/junit4::
-	install -D -m 644 junit$(DEB_UPSTREAM_VERSION)/junit-$(DEB_UPSTREAM_VERSION).jar \
-	  debian/junit4/usr/share/java/junit4-$(DEB_UPSTREAM_VERSION).jar
+	install -D -m 644 junit4.jar debian/junit4/usr/share/java/junit4-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -pjunit4 /usr/share/java/junit4-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/junit4.jar
-	mkdir -p debian/junit4/usr/share/doc/junit4
-	cp -a junit$(DEB_UPSTREAM_VERSION)/javadoc \
-	   debian/junit4/usr/share/doc/junit4/
 
 upstream-from-git:
 	git-archive --format=tar --prefix=junit4-$(DEB_UPSTREAM_VERSION)/ \
 		v$(DEB_UPSTREAM_VERSION) | gzip -9 \
 		> ../junit4_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+
+get-orig-source:
+	-uscan --upstream-version 0 --rename

Modified: trunk/junit4/debian/watch
===================================================================
--- trunk/junit4/debian/watch	2008-12-06 23:48:34 UTC (rev 7552)
+++ trunk/junit4/debian/watch	2008-12-06 23:58:48 UTC (rev 7553)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/junit/ junit-([\d\.]*).jar
+http://sf.net/junit/ junit-([\d\.]*)-src.jar debian debian/orig-tar.sh
+

More information about the pkg-java-commits mailing list