CVS junit/debian

Wolfgang B??r wbaer-guest at haydn.debian.org
Sat Oct 1 18:59:22 UTC 2005 

Update of /cvsroot/pkg-java/junit/debian
In directory haydn:/tmp/cvs-serv21801/debian

Modified Files:
	changelog control copyright dirs junit-doc.docs junit.links 
	rules 
Added Files:
	README.Debian junit-doc.links manpages 
Removed Files:
	README.debian junit-doc.postinst junit-doc.prerm junit.files 
	junit.postinst junit.prerm 
Log Message:
junit (3.8.1.1-5) unstable; urgency=low

  * Converted to cdbs (closes: #311045)
  * Standards-Version 3.6.2 - removed /usr/doc link creation in postinst
  * Removed duplicated build dependencies which are implicit by kaffe
  * Removed postinst's which link to /usr/doc
  * Removed link into /usr/share/ant1.6/lib due to ant transition
  * Added Enhances: ant-optional
  * Added myself to uploaders


--- /cvsroot/pkg-java/junit/debian/changelog	2005/04/13 22:16:53	1.1
+++ /cvsroot/pkg-java/junit/debian/changelog	2005/10/01 18:59:22	1.2
@@ -1,3 +1,15 @@
+junit (3.8.1.1-5) unstable; urgency=low
+
+  * Converted to cdbs (closes: #311045)
+  * Standards-Version 3.6.2 - removed /usr/doc link creation in postinst
+  * Removed duplicated build dependencies which are implicit by kaffe
+  * Removed postinst's which link to /usr/doc
+  * Removed link into /usr/share/ant1.6/lib due to ant transition
+  * Added Enhances: ant-optional
+  * Added myself to uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Mon, 26 Sep 2005 20:33:40 +0200
+
 junit (3.8.1.1-4) unstable; urgency=low
 
   * Build with -target 1.3 (Closes: #270662)
--- /cvsroot/pkg-java/junit/debian/control	2005/04/13 22:16:53	1.1
+++ /cvsroot/pkg-java/junit/debian/control	2005/10/01 18:59:22	1.2
@@ -2,13 +2,15 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Takashi Okamoto <tora at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.1), kaffe (>= 1.1.1), jikes (>= 1:1.18-6), fastjar (>= 3.3.2), gjdoc (>= 0.7.2-2)
-Standards-Version: 3.6.1
+Uploaders: Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-3), fastjar
+Standards-Version: 3.6.2
 
 Package: junit
 Architecture: all
-Depends: kaffe | gij (>= 3.3) | java1-runtime | java2-runtime
+Depends: kaffe | java1-runtime | java2-runtime
+Suggests: junit-doc
+Enhances: ant-optional
 Description: Automated testing framework for Java
  JUnit is a simple framework for writing and running automated tests. 
  As a political gesture, it celebrates programmers testing their own 
--- /cvsroot/pkg-java/junit/debian/copyright	2005/04/13 22:16:53	1.1
+++ /cvsroot/pkg-java/junit/debian/copyright	2005/10/01 18:59:22	1.2
@@ -1,7 +1,7 @@
 This package was debianized by Takashi Okamoto tora at debian.org on
 Thu, 28 Jun 2001 18:47:32 +0900.
 
-It was downloaded from http://www.junit.org/.
+It was downloaded from <http://www.junit.org/>.
 
 Copyright:
                          Common Public License - v 1.0
@@ -109,9 +109,7 @@
 
 b) a copy of this Agreement must be included with each copy of the Program.
 
-[DEL::DEL]
-
-[DEL::DEL]Contributors may not remove or alter any copyright notices contained
+Contributors may not remove or alter any copyright notices contained
 within the Program.
 
 Each Contributor must identify itself as the originator of its Contribution, if
@@ -222,4 +220,3 @@
 Agreement will bring a legal action under this Agreement more than one year
 after the cause of action arose. Each party waives its rights to a jury trial
 in any resulting litigation.
-
--- /cvsroot/pkg-java/junit/debian/dirs	2005/04/13 22:16:53	1.1
+++ /cvsroot/pkg-java/junit/debian/dirs	2005/10/01 18:59:22	1.2
@@ -1,2 +1,3 @@
 usr/bin
 usr/share/java
+usr/share/ant/lib
--- /cvsroot/pkg-java/junit/debian/junit-doc.docs	2005/04/13 22:16:53	1.1
+++ /cvsroot/pkg-java/junit/debian/junit-doc.docs	2005/10/01 18:59:22	1.2
@@ -1,4 +1,2 @@
-cpl-v10.html
 doc
-javadoc
 README.html
--- /cvsroot/pkg-java/junit/debian/junit.links	2005/04/13 22:16:53	1.1
+++ /cvsroot/pkg-java/junit/debian/junit.links	2005/10/01 18:59:22	1.2
@@ -1,4 +1,2 @@
-usr/share/java/junit-3.8.1.jar usr/share/java/junit.jar
+usr/share/java/junit-3.8.1.1.jar usr/share/java/junit.jar
 usr/share/java/junit.jar usr/share/ant/lib/junit.jar
-usr/share/java/junit.jar usr/share/ant1.6/lib/junit.jar
-
--- /cvsroot/pkg-java/junit/debian/rules	2005/04/13 22:16:53	1.1
+++ /cvsroot/pkg-java/junit/debian/rules	2005/10/01 18:59:22	1.2
@@ -1,78 +1,38 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+# 
+# build file for junit uses cdbs
 
-package=junit
-version=3.8.1
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-export JAVA_HOME=/usr/lib/kaffe
+JAVA_HOME	:= /usr/lib/kaffe
 
-CLASSPATH=.:/usr/share/kaffe-common/lib/rt.jar
-JAVAC=jikes
-JAVADOC=/usr/bin/gjdoc
-JARNAME=junit.jar
-
-export LANG=C
+JAVAC 		= jikes
+CLASSPATH 	= .:/usr/share/kaffe-common/lib/rt.jar
+JAVADOC		= /usr/bin/gjdoc
+JARNAME		= junit.jar
 
+UPSTREAM_VERSION=$(shell echo $(DEB_VERSION) | cut -d- -f1)
 
 build:
-	dh_testdir
-
 	(mkdir src; cd src; fastjar xvf ../src.jar)
 	(rm  src/junit/swingui/*.java; cp debian/TestRunner.java src/junit/swingui)
 	patch -p0 < debian/AboutDialog.java.diff
-	(cd src;${JAVAC} -d ../classes -classpath ${CLASSPATH} -target 1.3 junit/*/*.java)
 
+	(cd src;${JAVAC} -target 1.3 -classpath ${CLASSPATH} -d ../classes junit/*/*.java)
 	cp -r src/junit/swingui/icons classes/junit/swingui
 	cp src/junit/runner/*.gif classes/junit/runner
 	cp src/junit/runner/excluded.properties classes/junit/runner
-	(jar cvf ${JARNAME} -C classes  junit)
-
-	mkdir javadoc
-	(cd src;${JAVADOC} -d ../javadoc junit.framework junit.awtui junit.swingui junit.runner junit.textui junit.extensions)
-
-	touch build
+	(fastjar cvf ${JARNAME} -C classes junit)
+	# build the api with gjdoc
+	mkdir -p doc/api
+	(cd src;${JAVADOC} -d ../doc/api junit.framework junit.awtui junit.swingui junit.runner junit.textui junit.extensions)
 
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean
-	-rm -f build
-	-rm -rf classes javadoc junit.jar
+clean::
+	-rm -rf classes doc/api ${JARNAME}
 	-rm -f `find . -name "*~"`
 	-rm -rf src
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
+install/junit:: 
 	-rm -f javadoc/package-list
-	install -d debian/tmp
-	cd debian/tmp && install -d `cat ../dirs`
-	install -m 644 ${JARNAME} debian/tmp/usr/share/java/junit-${version}.jar
-	install -m 755 debian/junit.sh debian/tmp/usr/bin/junit
-
-	dh_movefiles  
-	dh_installdirs
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installman -i debian/junit.1
-	dh_installchangelogs -i
-	dh_link -i
-	dh_compress -i
-	dh_installdocs -i
-	dh_installexamples  -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install 
-
-binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+	install -m 644 ${JARNAME} debian/junit/usr/share/java/junit-${UPSTREAM_VERSION}.jar
+	install -m 755 debian/junit.sh debian/junit/usr/bin/junit

More information about the pkg-java-commits mailing list