This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ant.
commit f4cf129e27dfc6475e512657686c1f211649d6df Author: Emmanuel Bourg <[email protected]> Date: Sun Jun 18 11:35:12 2017 +0200 Removed the GCJ packages --- debian/changelog | 7 +++++++ debian/control | 36 ++---------------------------------- debian/rules | 14 +------------- 3 files changed, 10 insertions(+), 47 deletions(-) diff --git a/debian/changelog b/debian/changelog index 87f229a..36e7e97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ant (1.9.9-2) UNRELEASED; urgency=medium + + * Team upload. + * Removed the GCJ packages + + -- Emmanuel Bourg <[email protected]> Sun, 18 Jun 2017 11:34:41 +0200 + ant (1.9.9-1) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 5f29cdc..c562ce8 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Uploaders: Matthias Klose <[email protected]>, Build-Depends: antlr, debhelper (>= 10), default-jdk, - gcj-native-helper, junit, junit4 (>= 4.11), libbcel-java (>= 5.0), @@ -36,7 +35,7 @@ Architecture: all Depends: default-jre-headless | java5-runtime-headless | java6-runtime-headless | java7-runtime-headless, ${misc:Depends} Recommends: ant-optional -Suggests: ant-doc, ant-gcj, default-jdk | java-compiler | java-sdk +Suggests: ant-doc, 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) @@ -52,26 +51,10 @@ 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: ant-optional-gcj, - antlr, +Suggests: antlr, javacc, junit, junit4, @@ -103,21 +86,6 @@ 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 d78238f..956cd14 100755 --- a/debian/rules +++ b/debian/rules @@ -16,8 +16,7 @@ override_dh_auto_configure: # Normal build bootstrap/bin/ant -propertyfile debian/ant.properties jars test-jar -override_dh_auto_build-arch: -override_dh_auto_build-indep: +override_dh_auto_build: bootstrap/bin/ant -propertyfile debian/ant.properties javadocs override_dh_installdocs: @@ -45,17 +44,6 @@ 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_nativejava -pant-gcj - 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
