This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libxalan2-java.
commit 7bfe8501140e11e1be9d262f513df38376b4659e Author: Emmanuel Bourg <[email protected]> Date: Fri Oct 13 16:40:27 2017 +0200 Build with the DH sequencer instead of CDBS --- debian/changelog | 1 + debian/clean | 2 ++ debian/control | 1 - debian/libxalan2-java-doc.install | 1 + debian/libxalan2-java.poms | 5 ++--- debian/libxsltc-java.dirs | 1 - debian/libxsltc-java.install | 1 + debian/rules | 45 +++++++++------------------------------ 8 files changed, 17 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97f4c5f..a85bb87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libxalan2-java (2.7.2-1) UNRELEASED; urgency=medium * New upstream release - Removed CVE-2014-0107.patch (fixed upstream) * Simplified debian/patches/build.patch + * Build with the DH sequencer instead of CDBS * Moved the package to Git * Use XZ compression for the upstream tarball * Updated debian/watch diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..7a1790d --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +xdocs/sources/xalan/*DONE +XSLTCDONE diff --git a/debian/control b/debian/control index 1297867..0e918bb 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Marcus Better <[email protected]>, Matthias Klose <[email protected]>, Jakub Adam <[email protected]> Build-Depends: ant (>= 1.6.3), - cdbs (>= 0.4.8), cup, debhelper (>= 10), default-jdk, diff --git a/debian/libxalan2-java-doc.install b/debian/libxalan2-java-doc.install new file mode 100644 index 0000000..f606a3e --- /dev/null +++ b/debian/libxalan2-java-doc.install @@ -0,0 +1 @@ +build/docs/apidocs/* /usr/share/doc/libxalan2-java/api/ diff --git a/debian/libxalan2-java.poms b/debian/libxalan2-java.poms index e7cfa67..1b63994 100644 --- a/debian/libxalan2-java.poms +++ b/debian/libxalan2-java.poms @@ -1,3 +1,2 @@ -debian/xalan.pom --no-parent -debian/serializer.pom --no-parent - +debian/xalan.pom --no-parent --java-lib --artifact=build/xalan.jar --usj-name=xalan2 +debian/serializer.pom --no-parent --java-lib --artifact=build/serializer.jar diff --git a/debian/libxsltc-java.dirs b/debian/libxsltc-java.dirs deleted file mode 100644 index b67bc01..0000000 --- a/debian/libxsltc-java.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/share/java diff --git a/debian/libxsltc-java.install b/debian/libxsltc-java.install new file mode 100644 index 0000000..ca42e55 --- /dev/null +++ b/debian/libxsltc-java.install @@ -0,0 +1 @@ +build/xsltc.jar /usr/share/java/ diff --git a/debian/rules b/debian/rules index 698cfd6..c8e880d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,44 +1,19 @@ #!/usr/bin/make -f -# debian/rules file for libxalan2-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 +include /usr/share/dpkg/pkg-info.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -ANT_HOME := /usr/share/ant +%: + dh $@ --with maven-repo-helper -ANT_OPTS := -Dgnu.java.awt.peer.gtk.Graphics=Graphics2D -DEB_JARS := xml-apis xercesImpl bsf bcel cup regexp stylebook JLex +override_dh_auto_build: + dh_auto_build -- jar xsltc.unbundledjar javadocs docs -DEB_ANT_CLEAN_TARGET := clean xsltc.clean -DEB_ANT_BUILD_TARGET := jar xsltc.unbundledjar javadocs docs - -clean:: - rm -f xdocs/sources/xalan/*DONE XSLTCDONE - mh_clean - -install/libxalan2-java:: - mh_installpoms -p$(PACKAGE); - mh_installjar -p$(PACKAGE) -l --usj-name=xalan2 debian/xalan.pom build/xalan.jar - mh_installjar -p$(PACKAGE) -l debian/serializer.pom build/serializer.jar - -install/libxsltc-java:: - install -m 644 build/xsltc.jar debian/libxsltc-java/usr/share/java/xsltc.jar - -install/libxalan2-java-doc:: - # install the javadocs into api directory - install -d $(CURDIR)/debian/libxalan2-java-doc/usr/share/doc/libxalan2-java/api/ - cp -a build/docs/apidocs/* $(CURDIR)/debian/libxalan2-java-doc/usr/share/doc/libxalan2-java/api/ - # make lintian happy and remove zero-byte files - rm -Rf $(CURDIR)/samples/extensions/instantdb/tables +override_dh_auto_clean: + dh_auto_clean -- clean xsltc.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/xalan.pom http://repository.sonatype.org/service/local/repositories/central/content/xalan/xalan/$(VERSION)/xalan-$(VERSION).pom - wget -O debian/serializer.pom http://repository.sonatype.org/service/local/repositories/central/content/xalan/serializer/$(VERSION)/serializer-$(VERSION).pom - + wget -O debian/xalan.pom http://repository.sonatype.org/service/local/repositories/central/content/xalan/xalan/$(DEB_VERSION_UPSTREAM)/xalan-$(DEB_VERSION_UPSTREAM).pom + wget -O debian/serializer.pom http://repository.sonatype.org/service/local/repositories/central/content/xalan/serializer/$(DEB_VERSION_UPSTREAM)/serializer-$(DEB_VERSION_UPSTREAM).pom -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxalan2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
