[ant] 01/02: Drop GCJ packages (Closes: #892528)
tony mancill
tmancill at debian.org
Sun Mar 11 06:10:54 GMT 2018
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository ant.
commit 04625cde46eacd99771a87881015e0401b2d8c07
Author: tony mancill <tmancill at debian.org>
Date: Sat Mar 10 21:43:19 2018 -0800
Drop GCJ packages (Closes: #892528)
---
debian/control | 36 ++----------------------------------
debian/rules | 11 -----------
2 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/debian/control b/debian/control
index ca5d9e7..d179369 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Uploaders: Matthias Klose <doko at debian.org>,
Build-Depends: antlr,
debhelper (>= 11),
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
Description: Java based build tool like make
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
@@ -49,26 +48,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,
@@ -98,21 +81,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 d147c30..1fd9e4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,17 +48,6 @@ override_dh_install-indep:
override_dh_compress:
dh_compress -XWHATSNEW
-# 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
More information about the pkg-java-commits
mailing list