[libhtmlparser-java] 24/25: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Aug 2 12:48:53 UTC 2017 

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

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

commit 3b6fb67663e8f6d21401722a35e06a4b14af0d73
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 2 14:32:36 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                       |  1 +
 debian/clean                           |  2 ++
 debian/control                         |  2 +-
 debian/libhtmlparser-java-doc.dirs     |  2 --
 debian/libhtmlparser-java-doc.doc-base |  4 ++--
 debian/libhtmlparser-java-doc.docs     |  2 --
 debian/libhtmlparser-java-doc.install  | 16 +++++++++++++++
 debian/libhtmlparser-java-doc.links    |  1 +
 debian/libhtmlparser-java.dirs         |  1 -
 debian/libhtmlparser-java.jlibs        |  1 +
 debian/rules                           | 37 ++++++----------------------------
 11 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1a91da..52b0aef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libhtmlparser-java (1.6.20060610.dfsg0-6) UNRELEASED; urgency=medium
 
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..7b556cb
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+src/docs/
+src/lib/
diff --git a/debian/control b/debian/control
index c859ebd..c455099 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Tiago Saboga <tiagosaboga at gmail.com>
-Build-Depends: cdbs, debhelper (>= 10), ant, default-jdk
+Build-Depends: debhelper (>= 10), ant, default-jdk, javahelper
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libhtmlparser-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libhtmlparser-java.git
diff --git a/debian/libhtmlparser-java-doc.dirs b/debian/libhtmlparser-java-doc.dirs
deleted file mode 100644
index a409516..0000000
--- a/debian/libhtmlparser-java-doc.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/libhtmlparser-java-doc/examples/lib
-usr/share/doc/libhtmlparser-java-doc/examples/bin
diff --git a/debian/libhtmlparser-java-doc.doc-base b/debian/libhtmlparser-java-doc.doc-base
index 0cad567..6f70148 100644
--- a/debian/libhtmlparser-java-doc.doc-base
+++ b/debian/libhtmlparser-java-doc.doc-base
@@ -4,5 +4,5 @@ Author: Derrick Oswald
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libhtmlparser-java-doc/api/index.html
-Files: /usr/share/doc/libhtmlparser-java-doc/api/*.html
+Index: /usr/share/doc/libhtmlparser-java/api/index.html
+Files: /usr/share/doc/libhtmlparser-java/api/*.html
diff --git a/debian/libhtmlparser-java-doc.docs b/debian/libhtmlparser-java-doc.docs
index 2b29cc9..b2b2a78 100644
--- a/debian/libhtmlparser-java-doc.docs
+++ b/debian/libhtmlparser-java-doc.docs
@@ -1,3 +1 @@
-src/docs/javadoc/
-docs
 readme.txt
diff --git a/debian/libhtmlparser-java-doc.install b/debian/libhtmlparser-java-doc.install
new file mode 100644
index 0000000..1690d36
--- /dev/null
+++ b/debian/libhtmlparser-java-doc.install
@@ -0,0 +1,16 @@
+src/docs/javadoc/*        usr/share/doc/libhtmlparser-java/api
+
+src/lib/filterbuilder.jar usr/share/doc/libhtmlparser-java/examples/lib/
+src/lib/thumbelina.jar    usr/share/doc/libhtmlparser-java/examples/lib/
+
+bin/beanybaby             usr/share/doc/libhtmlparser-java/examples/bin/
+bin/filterbuilder         usr/share/doc/libhtmlparser-java/examples/bin/
+bin/lexer                 usr/share/doc/libhtmlparser-java/examples/bin/
+bin/linkextractor         usr/share/doc/libhtmlparser-java/examples/bin/
+bin/parser                usr/share/doc/libhtmlparser-java/examples/bin/
+bin/sitecapturer          usr/share/doc/libhtmlparser-java/examples/bin/
+bin/stringextractor       usr/share/doc/libhtmlparser-java/examples/bin/
+bin/thumbelina            usr/share/doc/libhtmlparser-java/examples/bin/
+bin/translate             usr/share/doc/libhtmlparser-java/examples/bin/
+
+docs/*                    usr/share/doc/libhtmlparser-java/html
diff --git a/debian/libhtmlparser-java-doc.links b/debian/libhtmlparser-java-doc.links
new file mode 100644
index 0000000..f506d69
--- /dev/null
+++ b/debian/libhtmlparser-java-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libhtmlparser-java/api   usr/share/doc/libhtmlparser-java/html/javadoc
diff --git a/debian/libhtmlparser-java.dirs b/debian/libhtmlparser-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libhtmlparser-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libhtmlparser-java.jlibs b/debian/libhtmlparser-java.jlibs
new file mode 100644
index 0000000..c635a6c
--- /dev/null
+++ b/debian/libhtmlparser-java.jlibs
@@ -0,0 +1 @@
+src/lib/htmlparser.jar
diff --git a/debian/rules b/debian/rules
index 09881a8..a9630e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@ --buildsystem=ant --with javahelper
 
-JAVA_HOME = /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET = jarparser javadoc filterbuilder thumbelina
-DEB_ANT_BUILDFILE = src/build.xml
-DEB_ANT_ARGS      = -Dant.build.javac.target=1.5
-DEB_INSTALL_CHANGELOGS_ALL = docs/changes.txt
+override_dh_auto_build:
+	dh_auto_build -- -f src/build.xml -Dant.build.javac.target=1.5 jarparser javadoc filterbuilder thumbelina
 
-install/libhtmlparser-java::
-	install -m 644 -D 'src/lib/htmlparser.jar' \
-		$(CURDIR)/debian/libhtmlparser-java/usr/share/java/libhtmlparser-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -plibhtmlparser-java \
-		usr/share/java/libhtmlparser-$(DEB_UPSTREAM_VERSION).jar \
-		usr/share/java/libhtmlparser.jar
-
-install/libhtmlparser-java-doc::
-	install -m 644 src/lib/filterbuilder.jar src/lib/thumbelina.jar \
-		$(CURDIR)/debian/libhtmlparser-java-doc/usr/share/doc/libhtmlparser-java-doc/examples/lib
-	install -m 755 $(shell find bin -type f -regex '[^.]*') \
-		$(CURDIR)/debian/libhtmlparser-java-doc/usr/share/doc/libhtmlparser-java-doc/examples/bin
-
-binary-install/libhtmlparser-java-doc::
-	mv $(CURDIR)/debian/libhtmlparser-java-doc/usr/share/doc/libhtmlparser-java-doc/javadoc \
-		$(CURDIR)/debian/libhtmlparser-java-doc/usr/share/doc/libhtmlparser-java-doc/api
-	mv $(CURDIR)/debian/libhtmlparser-java-doc/usr/share/doc/libhtmlparser-java-doc/docs \
-		$(CURDIR)/debian/libhtmlparser-java-doc/usr/share/doc/libhtmlparser-java-doc/html
-	dh_link -plibhtmlparser-java-doc \
-		usr/share/doc/libhtmlparser-java-doc/api \
-		usr/share/doc/libhtmlparser-java-doc/html/javadoc
-
-clean::
-	-rm -rf src/docs src/lib
+override_dh_auto_clean:
+	dh_auto_clean -- -f src/build.xml

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

More information about the pkg-java-commits mailing list