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

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-03-02 23:12:52 +0000 (Sun, 02 Mar 2008)
New Revision: 5936

Added:
   trunk/junit4/debian/watch
Modified:
   trunk/junit4/debian/
   trunk/junit4/debian/changelog
   trunk/junit4/debian/control
   trunk/junit4/debian/rules
Log:
junit4 (4.3.1-3) unstable; urgency=low

  * Added Depends on java-gcj-compat | java1-runtime | java2-runtime to
    junit4. Closes: #457254.
  * Made Debian Java Maintainers the Maintainer of this package, moved Florian
    to Uploaders and added myself too.
  * Removed "-1" in versioned build-dependency on java-gcj-compat-dev.
  * Added Homepage, Vcs-Browser and Vcs-Svn fields.
  * Updated Standards-Version to 3.7.3.
  * Added watch file.

 -- Michael Koch <konqueror at gmx.de>  Mon, 03 Mar 2008 00:12:54 +0100




Property changes on: trunk/junit4/debian
___________________________________________________________________
Name: svn:ignore
   + files
junit4
stamp-*


Modified: trunk/junit4/debian/changelog
===================================================================
--- trunk/junit4/debian/changelog	2008-03-02 23:09:46 UTC (rev 5935)
+++ trunk/junit4/debian/changelog	2008-03-02 23:12:52 UTC (rev 5936)
@@ -1,3 +1,16 @@
+junit4 (4.3.1-3) unstable; urgency=low
+
+  * Added Depends on java-gcj-compat | java1-runtime | java2-runtime to
+    junit4. Closes: #457254.
+  * Made Debian Java Maintainers the Maintainer of this package, moved Florian
+    to Uploaders and added myself too.
+  * Removed "-1" in versioned build-dependency on java-gcj-compat-dev.
+  * Added Homepage, Vcs-Browser and Vcs-Svn fields.
+  * Updated Standards-Version to 3.7.3.
+  * Added watch file.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 03 Mar 2008 00:12:54 +0100
+
 junit4 (4.3.1-2) unstable; urgency=low
 
   * Change section to main.

Modified: trunk/junit4/debian/control
===================================================================
--- trunk/junit4/debian/control	2008-03-02 23:09:46 UTC (rev 5935)
+++ trunk/junit4/debian/control	2008-03-02 23:12:52 UTC (rev 5936)
@@ -1,13 +1,18 @@
 Source: junit4
 Section: devel
-Standards-Version: 3.7.2.2
-Maintainer: Florian Weimer <fw at deneb.enyo.de>
+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>
 Priority: optional
 Build-Depends: cdbs (>= 0.4.8), debhelper (>> 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev (>= 1.0.69-1)
+Build-Depends-Indep: ant, java-gcj-compat-dev (>= 1.0.69)
+Standards-Version: 3.7.3
+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
 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.
@@ -15,5 +20,3 @@
  JUnit 4 uses Java 5 features such as generics and annotations.  If
  you need compatibility with previous Java versions, you should use
  the junit package (version 3) instead.
- .
- Homepage: http://www.junit.org/

Modified: trunk/junit4/debian/rules
===================================================================
--- trunk/junit4/debian/rules	2008-03-02 23:09:46 UTC (rev 5935)
+++ trunk/junit4/debian/rules	2008-03-02 23:12:52 UTC (rev 5936)
@@ -1,35 +1,19 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
+include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-export JAVA_HOME := /usr/lib/jvm/java-gcj
-JUNIT_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
+JAVA_HOME := /usr/lib/jvm/java-gcj
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=false
-else
-    export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=true
-endif
-
-build:
-	ant
-
 install/junit4::
-	install -D -m 644 junit$(JUNIT_VERSION)/junit-$(JUNIT_VERSION).jar \
-	  debian/junit4/usr/share/java/junit4-$(JUNIT_VERSION).jar
-	ln -s junit4-$(JUNIT_VERSION).jar \
-	   debian/junit4/usr/share/java/junit4.jar
+	install -D -m 644 junit$(DEB_UPSTREAM_VERSION)/junit-$(DEB_UPSTREAM_VERSION).jar \
+	  debian/junit4/usr/share/java/junit4-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -pjunit4 junit4-$(DEB_UPSTREAM_VERSION).jar usr/share/java/junit4.jar
 	mkdir -p debian/junit4/usr/share/doc/junit4
-	cp -a junit$(JUNIT_VERSION)/javadoc \
+	cp -a junit$(DEB_UPSTREAM_VERSION)/javadoc \
 	   debian/junit4/usr/share/doc/junit4/
 
-clean::
-	ant clean
-
 upstream-from-git:
-	git-archive --format=tar --prefix=junit4-$(JUNIT_VERSION)/ \
-		v$(JUNIT_VERSION) | gzip -9 \
-		> ../junit4_$(JUNIT_VERSION).orig.tar.gz
+	git-archive --format=tar --prefix=junit4-$(DEB_UPSTREAM_VERSION)/ \
+		v$(DEB_UPSTREAM_VERSION) | gzip -9 \
+		> ../junit4_$(DEB_UPSTREAM_VERSION).orig.tar.gz

Added: trunk/junit4/debian/watch
===================================================================
--- trunk/junit4/debian/watch	                        (rev 0)
+++ trunk/junit4/debian/watch	2008-03-02 23:12:52 UTC (rev 5936)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/junit/ junit-([\d\.]*).jar