This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository commons-daemon.
commit 314fdb00674082a40e6e0509a979e42f44dfc85b Author: Emmanuel Bourg <[email protected]> Date: Sun Jan 26 16:31:01 2014 +0100 Imported Debian patch 1.0.15-4 --- debian/changelog | 9 +++++++++ debian/compat | 2 +- debian/control | 4 ++-- debian/patches/hurd_support.diff | 16 ++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41f0325..05e4539 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +commons-daemon (1.0.15-4) unstable; urgency=medium + + * Added a patch defining the PATH_MAX constant to compile on Hurd + * Revert to Java 5 source/target level + * Standards-Version updated to 3.9.5 (no changes) + * Switch to debhelper level 9 + + -- Emmanuel Bourg <[email protected]> Sun, 26 Jan 2014 16:31:01 +0100 + commons-daemon (1.0.15-3) unstable; urgency=low * Use canonical URLs for the Vcs-* fields diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index f22e280..04b05d4 100644 --- a/debian/control +++ b/debian/control @@ -8,14 +8,14 @@ Uploaders: Marcus Better <[email protected]>, Build-Depends: ant, autoconf, autotools-dev, - debhelper (>= 7.0.50~), + debhelper (>= 9), default-jdk, docbook-xsl, libcap-dev [linux-any], maven-repo-helper, xsltproc Build-Conflicts: autoconf2.13 -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 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/ diff --git a/debian/patches/hurd_support.diff b/debian/patches/hurd_support.diff new file mode 100644 index 0000000..e8bea16 --- /dev/null +++ b/debian/patches/hurd_support.diff @@ -0,0 +1,16 @@ +Description: Define the PATH_MAX constant not available for Hurd +Author: Emmanuel Bourg <[email protected]> +Forwarded: https://issues.apache.org/jira/browse/DAEMON-294 +--- a/src/native/unix/native/arguments.c ++++ b/src/native/unix/native/arguments.c +@@ -19,6 +19,10 @@ + #include <limits.h> + #include <glob.h> + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + /* Return the argument of a command line option */ + static char *optional(int argc, char *argv[], int argi) + { diff --git a/debian/patches/series b/debian/patches/series index 1baa465..19679ba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ libgcj_PR31700.diff kfreebsd_support.diff s390x_support.diff +hurd_support.diff diff --git a/debian/rules b/debian/rules index f5f71f8..3238160 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f JAVA_HOME := /usr/lib/jvm/default-java -ANT_ARGS := -Dcompile.source=1.6 -Dcompile.target=1.6 +ANT_ARGS := -Dcompile.source=1.5 -Dcompile.target=1.5 MAN_STYLESHEET := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl XSLTPROC := xsltproc --nonet -- 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
