This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository commons-daemon.
commit b6ba778a3b71c87e47fb2ad28d3bfef1887b00e7 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 1 13:47:39 2013 +0200 Imported Debian patch 1.0.15-3 --- debian/changelog | 9 +++++++++ debian/control | 4 ++-- debian/patches/s390x_support.diff | 13 +++++++++++++ debian/patches/series | 1 + debian/rules | 4 +++- 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 202ee5e..41f0325 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +commons-daemon (1.0.15-3) unstable; urgency=low + + * Use canonical URLs for the Vcs-* fields + * Generate Java 6 compatible bytecode + * debian/rules: Improved the clean target to allow rebuilds + * Restored the patch for s390x support + + -- Emmanuel Bourg <[email protected]> Tue, 01 Oct 2013 13:47:39 +0200 + commons-daemon (1.0.15-2) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index 3253caf..f22e280 100644 --- a/debian/control +++ b/debian/control @@ -16,9 +16,9 @@ Build-Depends: ant, xsltproc Build-Conflicts: autoconf2.13 Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/commons-daemon/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/commons-daemon/ Homepage: http://commons.apache.org/daemon/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-daemon/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-daemon/ Package: libcommons-daemon-java Architecture: all diff --git a/debian/patches/s390x_support.diff b/debian/patches/s390x_support.diff new file mode 100644 index 0000000..1d9b15a --- /dev/null +++ b/debian/patches/s390x_support.diff @@ -0,0 +1,13 @@ +Description: Adds support for s390x +Author: Emmanuel Bourg <[email protected]> +--- a/src/native/unix/support/apsupport.m4 ++++ b/src/native/unix/support/apsupport.m4 +@@ -161,7 +161,7 @@ + HOST_CPU=ia64 + fi + ;; +- s390) ++ s390 | s390x) + CFLAGS="$CFLAGS -DCPU=\\\"s390\\\"" + supported_os="s390" + HOST_CPU=s390 diff --git a/debian/patches/series b/debian/patches/series index 2fe91c3..1baa465 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ libgcj_PR31700.diff kfreebsd_support.diff +s390x_support.diff diff --git a/debian/rules b/debian/rules index 9935209..f5f71f8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f JAVA_HOME := /usr/lib/jvm/default-java -ANT_ARGS := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 +ANT_ARGS := -Dcompile.source=1.6 -Dcompile.target=1.6 MAN_STYLESHEET := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl XSLTPROC := xsltproc --nonet @@ -28,6 +28,8 @@ override_dh_auto_clean: JAVA_HOME=$(JAVA_HOME) ant $(ANT_ARGS) clean dh_auto_clean rm -f jsvc.1 + mh_clean + rm -f src/native/unix/configure override_dh_auto_install: dh_auto_install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-daemon.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
