This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ant.
commit 10a27238b52b63a223b82c976448ee3807276e66 Author: Matthias Klose <[email protected]> Date: Thu Jun 29 19:19:57 2017 +0200 Restore the GCJ packages --- debian/changelog | 7 +++++++ debian/control | 36 ++++++++++++++++++++++++++++++++++-- debian/rules | 14 +++++++++++++- 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f20dd9b..e28a5ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ant (1.9.9-3) unstable; urgency=medium + + * Team upload. + * Restore the GCJ packages. + + -- Matthias Klose <[email protected]> Thu, 29 Jun 2017 08:56:24 +0200 + ant (1.9.9-2) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index c562ce8..5f29cdc 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Uploaders: Matthias Klose <[email protected]>, Build-Depends: antlr, debhelper (>= 10), default-jdk, + gcj-native-helper, junit, junit4 (>= 4.11), libbcel-java (>= 5.0), @@ -35,7 +36,7 @@ Architecture: all Depends: default-jre-headless | java5-runtime-headless | java6-runtime-headless | java7-runtime-headless, ${misc:Depends} Recommends: ant-optional -Suggests: ant-doc, default-jdk | java-compiler | java-sdk +Suggests: ant-doc, ant-gcj, default-jdk | java-compiler | java-sdk Conflicts: libant1.6-java Replaces: ant-doc (<= 1.6.5-1), libant1.6-java Breaks: ant-doc (<= 1.6.5-1) @@ -51,10 +52,26 @@ Description: Java based build tool like make . This package contains the scripts and the core tasks libraries. +Package: ant-gcj +Architecture: any +Depends: ant, ${misc:Depends}, ${shlibs:Depends} +Description: Java based build tool like make (GCJ) + Apache Ant is a Java library and command-line tool whose mission is to drive + processes described in build files as targets and extension points dependent + upon each other. The main known usage of Ant is the build of Java applications. + Ant supplies a number of built-in tasks allowing to compile, assemble, test + and run Java applications. Ant can also be used effectively to build non Java + applications, for instance C or C++ applications. More generally, Ant can be + used to pilot any type of process which can be described in terms of targets + and tasks. + . + This package contains a native version of ant built using gcj. + Package: ant-optional Architecture: all Depends: ant (= ${source:Version}), ${misc:Depends} -Suggests: antlr, +Suggests: ant-optional-gcj, + antlr, javacc, junit, junit4, @@ -86,6 +103,21 @@ Description: Java based build tool like make - optional libraries . This package contains the optional tasks libraries. +Package: ant-optional-gcj +Architecture: any +Depends: ant-optional, ${misc:Depends}, ${shlibs:Depends} +Description: Java based build tool like make - optional libraries (GCJ) + Apache Ant is a Java library and command-line tool whose mission is to drive + processes described in build files as targets and extension points dependent + upon each other. The main known usage of Ant is the build of Java applications. + Ant supplies a number of built-in tasks allowing to compile, assemble, test + and run Java applications. Ant can also be used effectively to build non Java + applications, for instance C or C++ applications. More generally, Ant can be + used to pilot any type of process which can be described in terms of targets + and tasks. + . + This package contains the optional tasks libraries compiled natively. + Package: ant-doc Architecture: all Section: doc diff --git a/debian/rules b/debian/rules index 956cd14..3fbb865 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,8 @@ override_dh_auto_configure: # Normal build bootstrap/bin/ant -propertyfile debian/ant.properties jars test-jar -override_dh_auto_build: +override_dh_auto_build-arch: +override_dh_auto_build-indep: bootstrap/bin/ant -propertyfile debian/ant.properties javadocs override_dh_installdocs: @@ -44,6 +45,17 @@ override_dh_install-indep: install -m 755 src/script/antRun debian/ant/usr/share/ant/bin install -m 755 src/script/*.pl debian/ant/usr/share/ant/bin +# Hardening +export AOT_GCJFLAGS=$(shell dpkg-buildflags --get CFLAGS) +export AOT_LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) + +include /usr/share/gcj/debian_defaults +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) +override_dh_link-arch: + DH_VERBOSE=1 dh_nativejava -pant-gcj + DH_VERBOSE=1 dh_nativejava -pant-optional-gcj +endif + override_dh_auto_clean: rm -Rf bin build bootstrap lib/optional/*.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
