[jcifs] 05/08: Switch from cdbs to dh sequencer.

Markus Koschany apo at moszumanska.debian.org
Fri Apr 29 13:41:41 UTC 2016


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

apo pushed a commit to branch master
in repository jcifs.

commit 46f8f5dae7cba8590471445fabe8dcf2d2da13cf
Author: Markus Koschany <apo at debian.org>
Date:   Fri Apr 29 15:18:00 2016 +0200

    Switch from cdbs to dh sequencer.
---
 debian/control |  1 -
 debian/rules   | 30 +++++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 7becd82..f68175c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
  Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 9),
  default-jdk,
  libservlet3.1-java
diff --git a/debian/rules b/debian/rules
index 278a088..4780b8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,30 @@
 #!/usr/bin/make -f
-# debian/rules file for jcifs (uses cdbs)
+export JAVA_HOME := /usr/lib/jvm/default-java
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --parallel --with maven_repo_helper --buildsystem=ant
 
-JAVA_HOME := /usr/lib/jvm/default-java
+override_dh_auto_build:
+	dh_auto_build -- jar javadoc
 
-DEB_JARS := servlet-api-3.1
-DEB_ANT_BUILD_TARGET := jar javadoc
-DEB_ANT_CLEAN_TARGET := clean
-DEB_COMPRESS_EXCLUDE := *.c *.java
-DEB_INSTALL_CHANGELOGS_ALL := README.txt
+override_dh_auto_clean:
+	dh_auto_clean -- clean
 
-clean::
+override_dh_compress:
+	dh_compress -X.c -X.java
+
+override_dh_installchangelogs:
+	dh_installchangelogs README.txt
+
+override_dh_clean:
+	dh_clean
 	-$(RM) *.jar
 	-$(RM) -Rf docs/api
 
-install/libjcifs-java::
+override_dh_install:
 	# remove empty generated package-lists
 	-$(RM) -f docs/api/package-list
-	install -m 644 jcifs-$(DEB_UPSTREAM_VERSION).jar debian/libjcifs-java/usr/share/java/jcifs-$(DEB_UPSTREAM_VERSION).jar
-	ln -s jcifs-$(DEB_UPSTREAM_VERSION).jar debian/libjcifs-java/usr/share/java/jcifs.jar
+	dh_install
 
 .PHONY: get-orig-source
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jcifs.git



More information about the pkg-java-commits mailing list