[libsaxon-java] 29/33: 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 libsaxon-java.

commit 4889186c0489fa0fab598db671afae3fd4df8dd9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 19 11:23:23 2017 +0200

    Removed the GCJ package
---
 debian/changelog |  1 +
 debian/control   | 18 +-----------------
 debian/rules     | 32 +-------------------------------
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 398515a..9a01c55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libsaxon-java (1:6.5.5-11) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Removed the GCJ package
   * Moved the package to Git
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 19 Jun 2017 11:12:34 +0200
diff --git a/debian/control b/debian/control
index a08fd5d..8494618 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>
 Build-Depends: debhelper (>= 9), default-jdk, javahelper (>= 0.32~),
- libjdom1-java, gcj-native-helper, maven-repo-helper
+ libjdom1-java, maven-repo-helper
 Build-Depends-Indep: default-jdk-doc, libjdom1-java-doc
 Standards-Version: 3.9.4
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libsaxon-java.git
@@ -24,22 +24,6 @@ Description: Saxon XSLT Processor
  with the DocBook XSL Stylesheets. Related packages make the process
  straightforward.
 
-Package: libsaxon-java-gcj
-Architecture: any
-Depends: libsaxon-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends},
- ${java:Depends}
-Recommends: ${java:Recommends}
-Description: Saxon XSLT Processor (native code)
- The saxon package is a collection of tools for processing XML documents and
- implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
- .
- Saxon is known to work well for processing DocBook XML documents
- with the DocBook XSL Stylesheets. Related packages make the process
- straightforward.
- .
- This package contains the native compiled byte code for the Saxon XSLT
- processor.
-
 Package: libsaxon-java-doc
 Section: doc
 Architecture: all
diff --git a/debian/rules b/debian/rules
index d14e788..e10b394 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,4 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 UPSTREAM_VERSION=6.5.5
 JAVA_HOME=/usr/lib/jvm/default-java
@@ -14,22 +9,6 @@ JDOM=com/icl/saxon/jdom
 CLASSPATH = /usr/share/java/jdom1.jar
 JAVADOC = $(JAVA_HOME)/bin/javadoc -encoding ISO-8859-1
 
-# hardening
-#CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-# pass compile option to gcj:
-# CPPFLAGS is not use, since leads to:
-# gcj: can't specify '-D' without '--main'
-export AOT_GCJFLAGS=$(CFLAGS)
-export AOT_LDFLAGS=$(LDFLAGS)
-
-include /usr/share/gcj/debian_defaults
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
-  with_gcj_native := yes
-endif
-
 %:
 	dh $@ --with javahelper
 
@@ -41,13 +20,10 @@ override_dh_auto_build:
 	# split off jdom classes, everything else into saxon.jar
 	(cd $(BUILD); $(JAVA_HOME)/bin/jar -cfM ../saxon.jar META-INF `find . -name \*.class | egrep -v $(JDOM)`; \
 	 $(JAVA_HOME)/bin/jar -cfM ../saxon-jdom.jar $(JDOM)/*.class )
-	touch build-stamp
 
-binary binary-indep:
-	# Only compile the javadoc if we have too
+	# build the javadoc
 	(cd $(APIDOC) ; $(JAVADOC) -sourcepath ../../$(SOURCES) -link /usr/share/doc/default-jdk-doc/api \
 		-link /usr/share/doc/libjdom1-java/api @../../debian/javadoc-args )
-	dh $@ --with javahelper
 
 override_dh_auto_clean:
 	rm -f build-stamp configure-stamp saxon*.jar
@@ -61,12 +37,6 @@ override_jh_depends:
 	# jh_depends chokes on the jar file for some reason
 	jh_depends -plibsaxon-java-doc
 
-override_dh_strip:
-ifeq ($(with_gcj_native),yes)
-	dh_nativejava -plibsaxon-java-gcj
-endif
-	dh_strip
-
 override_dh_auto_install:
 	mh_installpoms -plibsaxon-java
 	mh_installjar -plibsaxon-java debian/saxon.pom saxon.jar

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