This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository okio.
commit 97f557376c6a79105f4f39f129f6612ae22d9f3d Author: Kai-Chung Yan <[email protected]> Date: Fri May 20 10:56:37 2016 +0800 Use a patch instead of commandlines to exclude modules --- debian/.gitignore | 3 +++ debian/control | 3 ++- debian/libokio-java-doc.javadoc | 2 +- debian/libokio-java.poms | 2 +- debian/patches/exclude_benchmarks.diff | 14 ++++++++++++++ debian/patches/series | 1 + debian/rules | 10 ++++++---- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/debian/.gitignore b/debian/.gitignore index 832eead..6c18a2c 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,4 +1,5 @@ .debhelper/ +.javahelper_clean .mh/ *.doc-base.javadoc *.log @@ -7,4 +8,6 @@ debhelper-build-stamp files libokio-java*/ maven-repo/ +maven.cleanIgnoreRules +maven.publishedRules stamp-poms-patched \ No newline at end of file diff --git a/debian/control b/debian/control index cd0d990..925d7ad 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 9), default-jdk-doc, javahelper, libanimal-sniffer-java, - maven-debian-helper + maven-debian-helper, + maven-repo-helper Standards-Version: 3.9.8 Homepage: https://github.com/square/okio Vcs-Git: https://anonscm.debian.org/git/pkg-java/okio.git diff --git a/debian/libokio-java-doc.javadoc b/debian/libokio-java-doc.javadoc index 6dc4a08..25d2d6b 100644 --- a/debian/libokio-java-doc.javadoc +++ b/debian/libokio-java-doc.javadoc @@ -1 +1 @@ -okio/target/site/apidocs usr/share/doc/libokio-java/api \ No newline at end of file +okio/target/apidocs usr/share/doc/libokio-java/api \ No newline at end of file diff --git a/debian/libokio-java.poms b/debian/libokio-java.poms index 84391af..f041dfc 100644 --- a/debian/libokio-java.poms +++ b/debian/libokio-java.poms @@ -1,2 +1,2 @@ -okio/pom.xml --no-parent --artifact=okio/target/okio-*.jar --java-lib +okio/pom.xml --no-parent --artifact=okio/target/okio-1.8.0.jar --java-lib pom.xml --no-parent --ignore-pom diff --git a/debian/patches/exclude_benchmarks.diff b/debian/patches/exclude_benchmarks.diff new file mode 100644 index 0000000..331f138 --- /dev/null +++ b/debian/patches/exclude_benchmarks.diff @@ -0,0 +1,14 @@ +Description: Using patches to exclude benchmarks module simplies debian/rules. +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2016-05-20 + +--- a/pom.xml ++++ b/pom.xml +@@ -19,7 +19,6 @@ + + <modules> + <module>okio</module> +- <module>benchmarks</module> + </modules> + + <properties> diff --git a/debian/patches/series b/debian/patches/series index dde5b23..b7c4f8f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ dependencies_versions.diff +exclude_benchmarks.diff diff --git a/debian/rules b/debian/rules index 5923d27..bf826d8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,11 +3,13 @@ %: dh $@ --buildsystem=maven --with maven_repo_helper,javahelper -override_dh_auto_build: - dh_auto_build -- -pl !benchmarks package javadoc:javadoc +override_mh_install: + mh_install + $(RM) -r debian/libokio-java/usr/share/maven-repo/com/squareup/okio/okio-parent -override_dh_auto_test: - dh_auto_test -- -pl !benchmarks verify +override_dh_auto_clean: + dh_auto_clean + $(RM) debian/maven.cleanIgnoreRules debian/maven.publishedRules get-orig-source: uscan --download-current-version --force-download --rename \ No newline at end of file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/okio.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
