[okio] 03/03: Simplify build scripts

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Fri May 27 15:55:32 UTC 2016


This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository okio.

commit d57facda64e10b54691df0eceb94365bb2ededb3
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Fri May 27 22:48:14 2016 +0800

    Simplify build scripts
---
 debian/control           |  7 +++----
 debian/libokio-java.poms |  2 +-
 debian/rules             | 10 +---------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 925d7ad..f7b6274 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 9),
                default-jdk-doc,
                javahelper,
                libanimal-sniffer-java,
-               maven-debian-helper,
-               maven-repo-helper
+               libmaven-javadoc-plugin-java,
+               maven-debian-helper
 Standards-Version: 3.9.8
 Homepage: https://github.com/square/okio
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/okio.git
@@ -25,8 +25,7 @@ Package: libokio-java-doc
 Section: doc
 Architecture: all
 Depends: ${maven:DocDepends}, ${misc:Depends}
-Recommends: default-jdk-doc
-Description: Modern I/O API for Java - Documentation
+Description: Modern I/O API for Java - Documentations
  Okio is a new library that complements java.io and java.nio to make it much
  easier to access, store, and process your data.
  .
diff --git a/debian/libokio-java.poms b/debian/libokio-java.poms
index f041dfc..51028c9 100644
--- a/debian/libokio-java.poms
+++ b/debian/libokio-java.poms
@@ -1,2 +1,2 @@
-okio/pom.xml --no-parent --artifact=okio/target/okio-1.8.0.jar --java-lib
+okio/pom.xml --no-parent --java-lib
 pom.xml --no-parent --ignore-pom
diff --git a/debian/rules b/debian/rules
index bf826d8..8ef1330 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=maven --with maven_repo_helper,javahelper
-
-override_mh_install:
-	mh_install
-	$(RM) -r debian/libokio-java/usr/share/maven-repo/com/squareup/okio/okio-parent
-
-override_dh_auto_clean:
-	dh_auto_clean
-	$(RM) debian/maven.cleanIgnoreRules debian/maven.publishedRules
+	dh $@ --buildsystem=maven --with=javahelper
 
 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



More information about the pkg-java-commits mailing list