This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository junit.
commit b7176551903a4de76f55ff1954262984c62203ef
Author: Wolfgang Bär <wb...@gmx.de>
Date: Sat Oct 1 18:59:22 2005 +0000
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
---
debian/README.Debian | 12 ++++++++
debian/README.debian | 20 ------------
debian/changelog | 12 ++++++++
debian/control | 10 +++---
debian/copyright | 7 ++---
debian/dirs | 1 +
debian/junit-doc.docs | 2 --
debian/junit-doc.links | 1 +
debian/junit-doc.postinst | 9 ------
debian/junit-doc.prerm | 6 ----
debian/junit.files | 2 --
debian/junit.links | 4 +--
debian/junit.postinst | 3 --
debian/junit.prerm | 6 ----
debian/manpages | 1 +
debian/rules | 78 ++++++++++++-----------------------------------
16 files changed, 55 insertions(+), 119 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..44427d6
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,12 @@
+JUnit for Debian
+----------------------
+
+* Debian specific parts (debian/*) are distributed under GPL.
+
+* /usr/bin/junit script provides the following options:
+
+ -text run junit.textui.TestRunner
+ -swing run junit.swingui.TestRunner
+ -awt run junit.awtui.TestRunner
+
+Takashi Okamoto <t...@debian.org>, Thu, 28 Jun 2001 18:47:32 +0900
diff --git a/debian/README.debian b/debian/README.debian
deleted file mode 100644
index 652e05e..0000000
--- a/debian/README.debian
+++ /dev/null
@@ -1,20 +0,0 @@
-JUnit for Debian
-----------------------
-
-* debian specific parts (debian/*) are distributed under GPL.
-* junit is installed to /usr/share/java/junit.jar.
-* for excute
- java -classpath /usr/share/java/junit.jar:. junit.textui.TestRunner
- java -classpath /usr/share/java/junit.jar:. junit.swingui.TestRunner
- java -classpath /usr/share/java/junit.jar:. junit.ui.LoadingTestRunner
-
-* /usr/bin/junit script provid same as above function with following options:
-
- -text: run junit.textui.TestRunner
- -swing: run junit.ui.TestRunner
- -awt: run junit.swingui.TestRunner
-
-* junit.swingui.TestRunner doesn't use with Kaffe because it doesn't support
- swing.
-
-Takashi Okamoto <t...@debian.org>, Thu, 28 Jun 2001 18:47:32 +0900
diff --git a/debian/changelog b/debian/changelog
index 0f5a3e1..522077d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <wb...@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)
diff --git a/debian/control b/debian/control
index 27b2e2c..d3722fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,15 @@ Source: junit
Section: devel
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Takashi Okamoto <t...@debian.org>, Michael Koch <konque...@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 <konque...@gmx.de>, Wolfgang Baer <wb...@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
diff --git a/debian/copyright b/debian/copyright
index 16ece9b..52e94bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
This package was debianized by Takashi Okamoto t...@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 @@ a) it must be made available under this Agreement; and
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 @@ intellectual property laws of the United States of America.
No party to this
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.
-
diff --git a/debian/dirs b/debian/dirs
index e4bc73a..4b0ca84 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,3 @@
usr/bin
usr/share/java
+usr/share/ant/lib
diff --git a/debian/junit-doc.docs b/debian/junit-doc.docs
index 2863815..5d8dd77 100644
--- a/debian/junit-doc.docs
+++ b/debian/junit-doc.docs
@@ -1,4 +1,2 @@
-cpl-v10.html
doc
-javadoc
README.html
diff --git a/debian/junit-doc.links b/debian/junit-doc.links
new file mode 100644
index 0000000..1f3b27f
--- /dev/null
+++ b/debian/junit-doc.links
@@ -0,0 +1 @@
+usr/share/doc/junit-doc/doc/api usr/share/doc/junit-doc/javadoc
diff --git a/debian/junit-doc.postinst b/debian/junit-doc.postinst
deleted file mode 100644
index 00089be..0000000
--- a/debian/junit-doc.postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/junit-doc -a -d /usr/share/doc/junit-doc
]; then
- ln -sf /usr/share/doc/junit-doc /usr/doc/junit-doc
- fi
-fi
-
-#DEBHELPER#
diff --git a/debian/junit-doc.prerm b/debian/junit-doc.prerm
deleted file mode 100644
index 214b4ad..0000000
--- a/debian/junit-doc.prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/junit-doc ]; then
- rm -f /usr/doc/junit-doc
-fi
-#DEBHELPER#
diff --git a/debian/junit.files b/debian/junit.files
deleted file mode 100644
index a5301fa..0000000
--- a/debian/junit.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/java/junit-3.8.1.jar
-usr/bin/junit
diff --git a/debian/junit.links b/debian/junit.links
index f91c968..5fbb783 100644
--- a/debian/junit.links
+++ b/debian/junit.links
@@ -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
-
diff --git a/debian/junit.postinst b/debian/junit.postinst
deleted file mode 100644
index a2c66fa..0000000
--- a/debian/junit.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-#DEBHELPER#
diff --git a/debian/junit.prerm b/debian/junit.prerm
deleted file mode 100644
index 6ea146b..0000000
--- a/debian/junit.prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/junit ]; then
- rm -f /usr/doc/junit
-fi
-#DEBHELPER#
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..60647d2
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/junit.1
diff --git a/debian/rules b/debian/rules
index 992eace..01efe13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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)
+ (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)
- touch build
-
-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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/junit.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
