[librepository] 20/22: Build with the DH sequencer instead of CDBS

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository librepository.

commit 2edc7889e40de94824e9b8dcf1ee1b7f9685b12c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 8 10:36:12 2016 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                      |  1 +
 debian/control                        |  1 -
 debian/dirs                           |  1 -
 debian/librepository-java-doc.install |  1 +
 debian/librepository-java.classpath   |  1 +
 debian/librepository-java.docs        |  1 -
 debian/librepository-java.jlibs       |  1 +
 debian/rules                          | 34 ++++++----------------------------
 8 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3a8dd1..5c8fc61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ librepository (1.1.6-3) UNRELEASED; urgency=medium
   * Team upload.
   * Depend on libmail-java instead of libgnumail-java
   * Removed the recommended dependency on librepository-java-gcj
+  * Build with the DH sequencer instead of CDBS
   * Added the Homepage field
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
diff --git a/debian/control b/debian/control
index b8ac60a..d774fbd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Rene Engelhard <rene at debian.org>
 Build-Depends:
  ant,
  ant-contrib,
- cdbs,
  debhelper (>= 10),
  default-jdk,
  javahelper,
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/librepository-java-doc.install b/debian/librepository-java-doc.install
new file mode 100644
index 0000000..7e1970e
--- /dev/null
+++ b/debian/librepository-java-doc.install
@@ -0,0 +1 @@
+bin/javadoc/docs/api/*  /usr/share/doc/librepository-java/api/
diff --git a/debian/librepository-java.classpath b/debian/librepository-java.classpath
new file mode 100644
index 0000000..6f782fa
--- /dev/null
+++ b/debian/librepository-java.classpath
@@ -0,0 +1 @@
+/usr/share/java/librepository.jar /usr/share/java/jcommon.jar
diff --git a/debian/librepository-java.docs b/debian/librepository-java.docs
deleted file mode 100644
index 7e0aefa..0000000
--- a/debian/librepository-java.docs
+++ /dev/null
@@ -1 +0,0 @@
-javadoc/*
diff --git a/debian/librepository-java.jlibs b/debian/librepository-java.jlibs
new file mode 100644
index 0000000..8fc2706
--- /dev/null
+++ b/debian/librepository-java.jlibs
@@ -0,0 +1 @@
+dist/librepository.jar
diff --git a/debian/rules b/debian/rules
index 58cdb56..d96b7de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,10 @@
 #!/usr/bin/make -f
-# debian/rules file for libfonts-java (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+export CLASSPATH = /usr/share/java/jcommon.jar:/usr/share/java/libbase.jar:/usr/share/java/javax.mail.jar:/usr/share/java/commons-logging.jar
 
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon libbase javax.mail commons-logging ant-contrib
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := compile jar javadoc
-
-DEB_UPSTREAM_VERSION := 1.1-SNAPSHOT
-
-clean::
-	-rm -rf build
-	-rm -rf javadoc
-	-rm -f librepository-$(DEB_UPSTREAM_VERSION).jar
-	# don't use them, go sure
-	-rm -f lib/* lib/optional/*
-
-install/librepository-java::
-	install -m 644 dist/librepository-$(DEB_UPSTREAM_VERSION).jar debian/librepository-java/usr/share/java/librepository-$(DEB_UPSTREAM_VERSION).jar
-	ln -s librepository-$(DEB_UPSTREAM_VERSION).jar debian/librepository-java/usr/share/java/librepository.jar
-	jh_classpath -plibrepository-java --classpath="/usr/share/java/jcommon.jar" debian/librepository-java/usr/share/java/librepository-$(DEB_UPSTREAM_VERSION).jar
-	jh_depends
-
-install/librepository-java-doc::
-	dh_install -plibrepository-java-doc 'bin/javadoc/*' usr/share/doc/librepository-java/api
+%:
+	dh $@ --with javahelper
 
+override_dh_auto_build:
+	dh_auto_build -- compile jar javadoc
+	mv dist/librepository-*.jar dist/librepository.jar

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