tags 547391 + patch
thank you
Torsten Werner wrote:
Hi,
http://people.debian.org/~bdefreese/cdbs/ combined with
http://people.debian.org/~twerner/0001-fix-ant-build-test.patch fixes
the problem.
Cheers,
Torsten
Here I've have turned this into a debdiff to combine both fixes. This
debdiff is against 0.4.61+nmu1 though and not the svn branch.
Thanks,
Barry deFreese
Debian QA
diff -urN cdbs-0.4.61+nmu1/debian/changelog cdbs-0.4.61+nmu2/debian/changelog
--- cdbs-0.4.61+nmu1/debian/changelog 2009-09-20 18:04:42.000000000 -0400
+++ cdbs-0.4.61+nmu2/debian/changelog 2009-09-30 08:57:47.000000000 -0400
@@ -1,3 +1,13 @@
+cdbs (0.4.61+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with default-jdk.
+ + Update kaffe build-deps/deps to default-jdk. (Closes: #547391).
+ * Update cdbs-doc example for junit to use default-jdk.
+ * Fix test/ant-1.sh to work with default-jdk.
+
+ -- Barry deFreese <[email protected]> Mon, 28 Sep 2009 17:33:37 -0400
+
cdbs (0.4.61+nmu1) unstable; urgency=low
* Non-maintainer upload.
diff -urN cdbs-0.4.61+nmu1/debian/control cdbs-0.4.61+nmu2/debian/control
--- cdbs-0.4.61+nmu1/debian/control 2009-07-10 04:59:44.000000000 -0400
+++ cdbs-0.4.61+nmu2/debian/control 2009-09-28 17:33:21.000000000 -0400
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: CDBS Hackers <[email protected]>
-Build-Depends-Indep: debhelper (>= 5), graphviz, realpath, fakeroot,
python-dev, python-all-dev, python-central, python-support, libxml2-utils,
xsltproc, docbook-xml, docbook-xsl, dblatex, ant, kaffe, sharutils, gs-common,
texlive-extra-utils, lzma
+Build-Depends-Indep: debhelper (>= 5), graphviz, realpath, fakeroot,
python-dev, python-all-dev, python-central, python-support, libxml2-utils,
xsltproc, docbook-xml, docbook-xsl, dblatex, ant, default-jdk, sharutils,
gs-common, texlive-extra-utils, lzma
Uploaders: Jonas Smedegaard <[email protected]>, Marc Dequènes (Duck)
<[email protected]>, Peter Eisentraut <[email protected]>
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/viewsvn/build-common/trunk
diff -urN cdbs-0.4.61+nmu1/doc/cdbs-doc.xml cdbs-0.4.61+nmu2/doc/cdbs-doc.xml
--- cdbs-0.4.61+nmu1/doc/cdbs-doc.xml 2009-07-10 04:59:44.000000000 -0400
+++ cdbs-0.4.61+nmu2/doc/cdbs-doc.xml 2009-09-28 21:35:33.000000000 -0400
@@ -1588,9 +1588,9 @@
<varname>JAVA_HOME</varname>. For Ant-using packages in the
Debian main archive, you would typically use either
<programlisting>
-JAVA_HOME = /usr/lib/kaffe
+JAVA_HOME = /usr/lib/jvm/default-java
</programlisting>
- which requires a build dependency on <literal>kaffe</literal>, or
+ which requires a build dependency on <literal>default-jdk</literal>, or
<programlisting>
JAVA_HOME = /usr/lib/jvm/java-gcj
</programlisting>
@@ -2325,26 +2325,30 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
-Uploaders: Peter Eisentraut <[email protected]>
-Build-Depends-Indep: cdbs (>= 0.4.36), debhelper (>= 5), kaffe, jikes, ant,
junit
-Standards-Version: 3.6.2
+Uploaders: Varun Hiremath <[email protected]>, Kumar Appaiah
<[email protected]>,
+ Torsten Werner <[email protected]>
+Build-Depends: cdbs, debhelper (>= 5), default-jdk, ant
+Build-Depends-Indep: maven-repo-helper, junit, openjdk-6-doc
+Standards-Version: 3.8.2
+Homepage: http://jline.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jline
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jline
Package: libjline-java
Section: libs
Architecture: all
-Depends: kaffe | java2-runtime | java1-runtime
-Suggests: kaffe | java-virtual-machine, libjline-java-doc
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless |
java1-runtime-headless
+Suggests: libjline-java-doc
Description: Java library for handling console input
JLine is a 100% pure Java library for reading and editing console input.
It is similar in functionality to BSD editline and GNU readline. People
familiar with the readline/editline capabilities for modern shells will
find most of the command editing features of JLine to be familiar.
- .
- Web site: http://jline.sourceforge.net/
Package: libjline-java-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
Suggests: libjline-java
Description: documentation for JLine
JLine is a 100% pure Java library for reading and editing console input.
@@ -2353,8 +2357,6 @@
find most of the command editing features of JLine to be familiar.
.
This package contains the documentation for JLine.
- .
- Web site: http://jline.sourceforge.net/
]]></programlisting>
</para>
@@ -2362,32 +2364,33 @@
<programlisting><![CDATA[
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-PACKAGE_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version:
\(.*\)-[^-]*$$/\1/p')
-
-JAVA_HOME = /usr/lib/kaffe
-DEB_JARS = junit
-DEB_ANT_BUILD_TARGET = jars
-DEB_ANT_COMPILER = jikes
-
-DEB_INSTALL_DOCS_ALL =
-DEB_INSTALL_EXAMPLES_libjline-java-doc = release/jline-demo.jar
+include /usr/share/cdbs/1/class/ant.mk
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := junit
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_BUILD_TARGET := jar javadoc
+
+DEB_INSTALL_EXAMPLES_libjline-java-doc = jline-demo.jar
+
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l debian/pom.xml jline.jar
-install/libjline-java:: DEB_FINALDIR=$(CURDIR)/debian/libjline-java
-install/libjline-java::
- install -m 644 -D release/jline-0_9_5.jar
$(DEB_FINALDIR)/usr/share/java/jline-$(PACKAGE_VERSION).jar
- dh_link /usr/share/java/jline-$(PACKAGE_VERSION).jar
/usr/share/java/jline.jar
+clean::
+ -rm -rf debian/tmp
+get-orig-source:
+ -uscan --upstream-version 0
-clean::
- rm -rf build/ release/ reports/ tmp/
- rm -f VERSION.txt]]></programlisting>
+get-orig-pom:
+ wget -O debian/pom.xml
http://repository.sonatype.org/service/local/repositories/central/content/jline/jline/$(VERSION)/jline-$(VERSION).pom]]>
+ </programlisting>
</para>
- </sect1>
+ </sect1>
</chapter>
<chapter>
diff -urN cdbs-0.4.61+nmu1/test/ant-1.sh cdbs-0.4.61+nmu2/test/ant-1.sh
--- cdbs-0.4.61+nmu1/test/ant-1.sh 2009-07-10 04:58:50.000000000 -0400
+++ cdbs-0.4.61+nmu2/test/ant-1.sh 2009-09-30 08:57:16.000000000 -0400
@@ -13,8 +13,8 @@
include \$(_cdbs_package_root_dir)/1/rules/debhelper.mk.in
include \$(_cdbs_package_root_dir)/1/class/ant.mk.in
-DEB_CLASSPATH := /tmp/nothing.jar:\$(DEB_CLASSPATH)
-JAVA_HOME_DIRS = /var/tmp/ /usr/lib/kaffe/
+DEB_JARS := /tmp/nothing.jar
+JAVA_HOME := /usr/lib/jvm/default-java
JAVACMD += -Dfoo=bar
EOF
chmod +x $WORKDIR/debian/rules
