[libjaxp1.3-java] 32/36: Removed the GCJ package

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjaxp1.3-java.

commit 7efc30d4d59ce6cf559af0a5a15707b3897749f7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jun 18 23:44:25 2017 +0200

    Removed the GCJ package
---
 debian/changelog |  1 +
 debian/control   | 10 +---------
 debian/rules     | 11 -----------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86c2e4d..5e33030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libjaxp1.3-java (1.3.05-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Removed the GCJ package
   * Moved the package to Git
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 18 Jun 2017 23:08:18 +0200
diff --git a/debian/control b/debian/control
index c0e76e4..f01df8f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Matthias Klose <doko at ubuntu.com>, Michael Koch <konqueror at gmx.de>,
  Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-repo-helper,
- javahelper, gcj-native-helper
+ javahelper
 Standards-Version: 3.9.2
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjaxp1.3-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjaxp1.3-java.git
@@ -14,7 +14,6 @@ Homepage: http://java.sun.com/xml/jaxp/index.jsp
 Package: libjaxp1.3-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libjaxp1.3-java-gcj
 Conflicts: libxalan2-java (<= 2.7.1-2)
 Description: Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)
  xml-apis.jar from the Apache XML Commons project is used by the Xerces-J XML
@@ -28,10 +27,3 @@ Description: Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)
  .
  These classes are also used in Sun's reference implementation. A GPL'ed
  implementation of these APIs can be found in the libgnujaxp-java package.
-
-Package: libjaxp1.3-java-gcj
-Architecture: any
-Depends: libjaxp1.3-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX) - GCJ
- xml-apis.jar from the Apache XML Commons project is used by the Xerces-J XML
- parser and Xalan-J XSLT processor.
diff --git a/debian/rules b/debian/rules
index b1b6005..25b8920 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,6 @@ VERSION              := $(DEB_UPSTREAM_VERSION)
 JAXP_VERSION         := 1.3
 JAVA_HOME            := /usr/lib/jvm/default-java
 
-include /usr/share/gcj/debian_defaults
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
-  with_gcj_native := yes
-endif
-
 clean::
 	rm -rf build debian/build-stamp
 	-rm -rf debian/tmp
@@ -22,7 +17,6 @@ build/libjaxp1.3-java:: debian/build-stamp
 debian/build-stamp:
 	mkdir -p build/license
 
-	# An alternative would be to build the classes using GCJ
 	$(JAVA_HOME)/bin/javac -source 1.4 -d build `find javax org -name \*.java`
 	cp LICENSE.*.txt README.*.txt build/license
 	cd build && $(JAVA_HOME)/bin/jar cmf ../manifest.commons \
@@ -34,11 +28,6 @@ install/libjaxp1.3-java::
 	mh_installjar -p$(PACKAGE) -l debian/xml-apis.pom build/jaxp-$(JAXP_VERSION).jar
 	mh_installjar -p$(PACKAGE) debian/jaxp.pom build/jaxp-$(JAXP_VERSION).jar /usr/share/java/jaxp-$(JAXP_VERSION).jar
 
-ifeq ($(with_gcj_native),yes)
-install/libjaxp1.3-java-gcj:: install/libjaxp1.3-java
-	dh_nativejava -plibjaxp1.3-java-gcj
-endif
-
 get-orig-pom:
 	wget -O debian/xml-apis.pom http://repository.sonatype.org/service/local/repositories/central/content/xml-apis/xml-apis/$(VERSION)/xml-apis-$(VERSION).pom
 	wget -O debian/jaxp.pom http://repository.sonatype.org/service/local/repositories/central/content/javax/xml/jaxp-api/$(JAXP_VERSION)/jaxp-api-$(JAXP_VERSION).pom

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaxp1.3-java.git