diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2017-06-18 22:49:50 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2017-06-19 16:37:33 +0000 |
| commit | 855f38abc12bf18d7a1570056120279d5898dc4e (patch) | |
| tree | 6e9ffb9c3bc8b30c18d706811b3136a8da775653 | |
| parent | 5a2dc2e96a7786df683d3ab33b82f22d400f2537 (diff) | |
| parent | 88402a52a385f898f2bb1506e777cfe31a07e5ee (diff) | |
2.11.0-8 (patches applied)applied/2.11.0-8applied/ubuntu/bionic-develapplied/ubuntu/bionicapplied/ubuntu/artful-proposedapplied/ubuntu/artful-develapplied/ubuntu/artful
Imported using git-ubuntu import.
| -rw-r--r-- | debian/ant.properties | 4 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/clean | 1 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 35 | ||||
| -rw-r--r-- | debian/libxerces2-java-doc.examples | 1 | ||||
| -rw-r--r-- | debian/libxerces2-java-doc.install | 1 | ||||
| -rw-r--r-- | debian/libxerces2-java.docs | 1 | ||||
| -rw-r--r-- | debian/libxerces2-java.install | 1 | ||||
| -rw-r--r-- | debian/libxerces2-java.poms | 3 | ||||
| -rwxr-xr-x | debian/rules | 61 |
11 files changed, 50 insertions, 71 deletions
diff --git a/debian/ant.properties b/debian/ant.properties new file mode 100644 index 0000000..9771673 --- /dev/null +++ b/debian/ant.properties @@ -0,0 +1,4 @@ +ant.build.javac.source=1.4 +ant.build.javac.target=1.4 +javac.source=1.4 +javac.target=1.4 diff --git a/debian/changelog b/debian/changelog index a34351c..5f6c96b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libxerces2-java (2.11.0-8) unstable; urgency=medium + + * Team upload. + * Removed the GCJ package + * Build with the DH sequencer instead of CDBS + * Moved the package to Git + * Standards-Version updated to 3.9.8 + * Switch to debhelper level 10 + + -- Emmanuel Bourg <ebourg@apache.org> Sun, 18 Jun 2017 22:49:50 +0200 + libxerces2-java (2.11.0-7) unstable; urgency=low * Upload to unstable diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..567609b --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +build/ diff --git a/debian/compat b/debian/compat index 7f8f011..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/debian/control b/debian/control index 0013b28..7ad46e9 100644 --- a/debian/control +++ b/debian/control @@ -2,24 +2,30 @@ Source: libxerces2-java Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Marcus Better <marcus@better.se>, +Uploaders: + Marcus Better <marcus@better.se>, Matthias Klose <doko@ubuntu.com>, Damien Raude-Morvan <drazzib@debian.org>, Jakub Adam <jakub.adam@ktknet.cz>, Emmanuel Bourg <ebourg@apache.org> -Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7), default-jdk, gcj-native-helper, ant, - maven-repo-helper, javahelper, libxml-commons-resolver1.1-java, libstylebook-java, - libxml-commons-external-java (>= 1.4.01-2) -Standards-Version: 3.9.4 -Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libxerces2-java -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libxerces2-java +Build-Depends: + ant, + debhelper (>= 10), + default-jdk, + javahelper, + libstylebook-java, + libxml-commons-external-java (>= 1.4.01-2), + libxml-commons-resolver1.1-java, + maven-repo-helper +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/libxerces2-java.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libxerces2-java.git Homepage: http://xerces.apache.org/xerces2-j/ Package: libxerces2-java Architecture: all -Depends: ${misc:Depends}, libxml-commons-resolver1.1-java, - libxml-commons-external-java (>= 1.4.01-2) -Suggests: libxerces2-java-doc, libxerces2-java-gcj +Depends: ${misc:Depends}, libxml-commons-external-java (>= 1.4.01-2), libxml-commons-resolver1.1-java +Suggests: libxerces2-java-doc Description: Validating XML parser for Java with DOM level 3 support The Xerces2 Java parser is the reference implementation of XNI, the Xerces Native Interface, and also a fully conforming XML Schema processor. @@ -44,15 +50,6 @@ Description: Validating XML parser for Java with DOM level 3 support Candidate Recommendation, and will correctly serialize XML 1.1 documents if the DOM level 3 load/save API's are in use. -Package: libxerces2-java-gcj -Architecture: any -Depends: libxerces2-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: Validating XML parser for Java with DOM level 3 support (native code) - The Xerces2 Java parser is the reference implementation of XNI, the - Xerces Native Interface, and also a fully conforming XML Schema processor. - . - This package contains the natively compiled code for use by gij. - Package: libxerces2-java-doc Architecture: all Section: doc diff --git a/debian/libxerces2-java-doc.examples b/debian/libxerces2-java-doc.examples index 039a091..c64b05c 100644 --- a/debian/libxerces2-java-doc.examples +++ b/debian/libxerces2-java-doc.examples @@ -1,3 +1,2 @@ build/samples/* build/xercesSamples.jar - diff --git a/debian/libxerces2-java-doc.install b/debian/libxerces2-java-doc.install new file mode 100644 index 0000000..e815b13 --- /dev/null +++ b/debian/libxerces2-java-doc.install @@ -0,0 +1 @@ +build/docs/javadocs/* usr/share/doc/libxerces2-java-doc/api diff --git a/debian/libxerces2-java.docs b/debian/libxerces2-java.docs index 1910a27..a543f9d 100644 --- a/debian/libxerces2-java.docs +++ b/debian/libxerces2-java.docs @@ -3,4 +3,3 @@ NOTICE.resolver.txt NOTICE.serializer.txt README Readme.html - diff --git a/debian/libxerces2-java.install b/debian/libxerces2-java.install new file mode 100644 index 0000000..d922827 --- /dev/null +++ b/debian/libxerces2-java.install @@ -0,0 +1 @@ +build/xercesSamples.jar /usr/share/java/ diff --git a/debian/libxerces2-java.poms b/debian/libxerces2-java.poms index 1b8f054..360e0d3 100644 --- a/debian/libxerces2-java.poms +++ b/debian/libxerces2-java.poms @@ -1,2 +1 @@ -debian/pom.xml --no-parent - +debian/pom.xml --no-parent --has-package-version --java-lib --artifact=build/xercesImpl.jar diff --git a/debian/rules b/debian/rules index 43f3f9b..4752ef1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,53 +1,20 @@ #!/usr/bin/make -f -# debian/rules file for libxerces2-java (uses cdbs) - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/javahelper.mk -include /usr/share/cdbs/1/class/ant.mk - -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -ANT_HOME := /usr/share/ant -ANT_OPTS = -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Djavac.source=1.4 -Djavac.target=1.4 - -# hardening -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -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 - -# Ant targets to call -DEB_ANT_CLEAN_TARGET := clean -DEB_ANT_BUILD_TARGET := jar sampjar javadocs -#docs - -install/$(PACKAGE):: - mh_installpoms -p$(PACKAGE); - mh_installjar -p$(PACKAGE) -l debian/pom.xml $(DEB_BUILDDIR)/build/xercesImpl.jar - dh_install -p$(PACKAGE) $(DEB_BUILDDIR)/build/xercesSamples.jar /usr/share/java/ - -ifeq ($(with_gcj_native),yes) -install/libxerces2-java-gcj:: install/libxerces2-java - dh_nativejava -plibxerces2-java-gcj -endif - -clean:: - rm -rf build - -rm -rf debian/tmp - mh_clean - -binary-post-install/libxerces2-java-doc:: - dh_install -plibxerces2-java-doc build/docs/javadocs/* \ - usr/share/doc/libxerces2-java-doc/api + +VERSION := 2.11.0 + +%: + dh $@ --with maven-repo-helper --with javahelper + +override_dh_auto_build: + dh_auto_build -- jar sampjar javadocs + +override_dh_compress: + dh_compress -X.java + +override_dh_auto_clean: get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack + -uscan --download-current-version --force-download --rename --repack get-orig-pom: wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/xerces/xercesImpl/$(VERSION)/xercesImpl-$(VERSION).pom |