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 462b7696c9f97d5579c87211a92d22c8a7b57ef2 Author: Emmanuel Bourg <[email protected]> Date: Mon Jun 19 11:40:47 2017 +0200 Simplified debian/rules --- debian/changelog | 1 + debian/clean | 2 ++ debian/libsaxon-java.jlibs | 1 - debian/libsaxon-java.poms | 2 +- debian/rules | 13 ++----------- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9a01c55..a7a7d32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libsaxon-java (1:6.5.5-11) UNRELEASED; urgency=medium * Team upload. * Removed the GCJ package * Moved the package to Git + * Simplified debian/rules -- Emmanuel Bourg <[email protected]> Mon, 19 Jun 2017 11:12:34 +0200 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..0dbc90e --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +saxon*.jar +build/ diff --git a/debian/libsaxon-java.jlibs b/debian/libsaxon-java.jlibs index 8d29126..5f1da8b 100644 --- a/debian/libsaxon-java.jlibs +++ b/debian/libsaxon-java.jlibs @@ -1,2 +1 @@ -saxon.jar saxon-jdom.jar diff --git a/debian/libsaxon-java.poms b/debian/libsaxon-java.poms index 29e4de5..1d43828 100644 --- a/debian/libsaxon-java.poms +++ b/debian/libsaxon-java.poms @@ -1 +1 @@ -debian/saxon.pom --has-package-version +debian/saxon.pom --has-package-version --java-lib --artifact=saxon.jar diff --git a/debian/rules b/debian/rules index e10b394..bd720f1 100755 --- a/debian/rules +++ b/debian/rules @@ -10,10 +10,10 @@ CLASSPATH = /usr/share/java/jdom1.jar JAVADOC = $(JAVA_HOME)/bin/javadoc -encoding ISO-8859-1 %: - dh $@ --with javahelper + dh $@ --with javahelper --with maven-repo-helper override_dh_auto_build: - if [ ! -d $(BUILD) ]; then mkdir $(BUILD); mkdir $(APIDOC); fi + mkdir -p $(BUILD) $(APIDOC) $(JAVA_HOME)/bin/javac -nowarn -source 1.5 -target 1.5 -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java` cp -r $(SOURCES)/META-INF $(BUILD) cp debian/MANIFEST.MF $(BUILD)/META-INF @@ -25,11 +25,6 @@ override_dh_auto_build: (cd $(APIDOC) ; $(JAVADOC) -sourcepath ../../$(SOURCES) -link /usr/share/doc/default-jdk-doc/api \ -link /usr/share/doc/libjdom1-java/api @../../debian/javadoc-args ) -override_dh_auto_clean: - rm -f build-stamp configure-stamp saxon*.jar - rm -rf $(BUILD) - mh_clean - override_jh_installlibs: jh_installlibs --upstream-version="$(UPSTREAM_VERSION)" @@ -37,10 +32,6 @@ override_jh_depends: # jh_depends chokes on the jar file for some reason jh_depends -plibsaxon-java-doc -override_dh_auto_install: - mh_installpoms -plibsaxon-java - mh_installjar -plibsaxon-java debian/saxon.pom saxon.jar - debian/saxon-xslt.1: debian/saxon-xslt.1.in help2man --include=$< --output=$@ --help-option="-?" \ --no-info `basename $@ .1` --version-string=$(UPSTREAM_VERSION) --no-discard-stderr -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libsaxon-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
