This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository xml-commons-external.
commit 1dcae0e17270d09c8b51621564f51d6cc5ed9790
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Mar 12 00:11:40 2018 +0100
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/clean | 5 ++++
debian/control | 1 -
debian/libxml-commons-external-java-doc.install | 1 +
debian/libxml-commons-external-java.poms | 2 ++
debian/rules | 40 +++++++------------------
6 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9aab6d1..573db24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xml-commons-external (1.4.01-3) UNRELEASED; urgency=low
* No longer generate the javadoc for the javax.xml and org.w3c.dom packages
(Closes: #873250)
* Removed Damien Raude-Morvan from the uploaders (Closes: #889354)
+ * Build with the DH sequencer instead of CDBS
* Moved the package to Git
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..60e52fb
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,5 @@
+classes/
+xml-apis-ext.jar
+xml-apis.jar
+docs/
+api/
diff --git a/debian/control b/debian/control
index 7962151..18050ea 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders:
Vincent Fourmond <fourm...@debian.org>,
Onkar Shinde <onkarshi...@ubuntu.com>
Build-Depends:
- cdbs,
debhelper (>= 11),
default-jdk,
javahelper,
diff --git a/debian/libxml-commons-external-java-doc.install
b/debian/libxml-commons-external-java-doc.install
new file mode 100644
index 0000000..65f28bb
--- /dev/null
+++ b/debian/libxml-commons-external-java-doc.install
@@ -0,0 +1 @@
+api/* /usr/share/doc/libxml-commons-external-java/api/
diff --git a/debian/libxml-commons-external-java.poms
b/debian/libxml-commons-external-java.poms
new file mode 100644
index 0000000..17e47ab
--- /dev/null
+++ b/debian/libxml-commons-external-java.poms
@@ -0,0 +1,2 @@
+debian/xml-apis-ext.xml --java-lib --usj-name=xml-apis-ext
--artifact=xml-apis-ext.jar
+debian/xml-apis.xml --java-lib --usj-name=xml-apis
--artifact=xml-apis.jar --no-usj-versionless
diff --git a/debian/rules b/debian/rules
index ec0bf33..9a74fa4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,11 @@
#!/usr/bin/make -f
-# debian/rules for libxml-commons-external-java (uses CDBS)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
+include /usr/share/dpkg/pkg-info.mk
-VERSION := ${DEB_UPSTREAM_VERSION}
+%:
+ dh $@ --with maven-repo-helper --with javahelper
-JAVA_HOME := /usr/lib/jvm/default-java
-
-clean::
- rm -rf classes xml-apis-ext.jar xml-apis.jar docs
-
-build-indep:
+override_dh_auto_build:
# Build all classes
mkdir classes
javac -source 1.7 -d classes `find org/ javax/ -name '*.java'`
@@ -22,29 +16,15 @@ build-indep:
(cd classes/; jar -cvfm ../xml-apis.jar ../manifest.commons \
`find -type f ! \( -wholename "*/sac/*" -o -wholename "*/smil/*" -o
-wholename "*/svg/*" \)`)
- #Build api documentation
+ # Build api documentation
mkdir -p api
javadoc -d api org.apache.xmlcommons org.w3c.css.sac
-install/libxml-commons-external-java::
- # Install xml-apis-ext
- mh_installpom -v -plibxml-commons-external-java debian/xml-apis-ext.xml
- mh_installjar -plibxml-commons-external-java -l debian/xml-apis-ext.xml
\
- -s -nxml-apis-ext -i${VERSION} xml-apis-ext.jar
- dh_link -plibxml-commons-external-java
/usr/share/java/xml-apis-ext-${VERSION}.jar
/usr/share/java/xml-commons-external-${VERSION}.jar
- dh_link -plibxml-commons-external-java
/usr/share/java/xml-apis-ext-${VERSION}.jar
/usr/share/java/xml-commons-external.jar
- dh_link -plibxml-commons-external-java
/usr/share/java/xml-apis-ext-${VERSION}.jar /usr/share/java/xml-apis-ext.jar
-
- # Install xml-apis
- mh_installpom -v -plibxml-commons-external-java debian/xml-apis.xml
- mh_installjar -plibxml-commons-external-java -l debian/xml-apis.xml \
- -s -nxml-apis -i${VERSION} xml-apis.jar
- dh_link -plibxml-commons-external-java
/usr/share/java/xml-apis-${VERSION}.jar /usr/share/java/jaxp-1.4.jar
-
-install/libxml-commons-external-java-doc::
- # Install the documentation into the libxml-commons-java-doc package
- mkdir -p
debian/libxml-commons-external-java-doc/usr/share/doc/libxml-commons-external-java/
- cp -r api
debian/libxml-commons-external-java-doc/usr/share/doc/libxml-commons-external-java/
+override_dh_link:
+ dh_link
+ dh_link -plibxml-commons-external-java
/usr/share/java/xml-apis-ext-${DEB_VERSION_UPSTREAM}.jar
/usr/share/java/xml-commons-external-${DEB_VERSION_UPSTREAM}.jar
+ dh_link -plibxml-commons-external-java
/usr/share/java/xml-apis-ext-${DEB_VERSION_UPSTREAM}.jar
/usr/share/java/xml-commons-external.jar
+ dh_link -plibxml-commons-external-java
/usr/share/java/xml-apis-${DEB_VERSION_UPSTREAM}.jar
/usr/share/java/jaxp-1.4.jar
get-orig-source::
uscan --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/xml-commons-external.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
