This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libxpp3-java.
commit f36ea7a712ba7d7cbe1cf0d9083698d9c717e871
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Mar 16 12:58:56 2018 +0100
Build with the DH sequencer instead of CDBS
---
debian/README.source | 17 -----------------
debian/changelog | 1 +
debian/clean | 1 +
debian/control | 1 -
debian/libxpp3-java.dirs | 1 -
debian/libxpp3-java.poms | 7 +++----
debian/rules | 30 +++++++++---------------------
7 files changed, 14 insertions(+), 44 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 328fb4e..ffb1b10 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,20 +3,3 @@ Upstream tarball changes
From the original upstream distribution the prebuilt
jar files were removed with rm *.jar in the basedir.
-
-
-Patch management
-================
-
-This package uses the simple patch system of CDBS to manage
-modifications to the upstream source code.
-
-To apply all patches to the source, invoke
- debian/rules patch
-
-To unapply all patches, invoke
- debian/rules unpatch
-
-All patches are diff files located in debian/patches and should end
-with ".patch". To add a patch, just drop the diff in this
-directory.
diff --git a/debian/changelog b/debian/changelog
index edc583e..f89d808 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxpp3-java (1.1.4c-3) UNRELEASED; urgency=medium
* Team upload.
* Fixed the build failure with Java 9 (Closes: #893084)
+ * 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..07e0351
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+doc/api/
diff --git a/debian/control b/debian/control
index eb0a360..9cb257c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Uploaders:
Build-Depends:
ant,
ant-optional,
- cdbs,
debhelper (>= 11),
default-jdk,
junit,
diff --git a/debian/libxpp3-java.dirs b/debian/libxpp3-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libxpp3-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libxpp3-java.poms b/debian/libxpp3-java.poms
index 78f0e0d..a4119f3 100644
--- a/debian/libxpp3-java.poms
+++ b/debian/libxpp3-java.poms
@@ -1,4 +1,3 @@
-debian/xpp3.pom
-debian/xpp3_min.pom
-debian/xpp3_xpath.pom
-
+debian/xpp3.pom --java-lib --artifact=build/xpp3-*.jar
+debian/xpp3_min.pom --java-lib --artifact=build/xpp3_min-*.jar
--usj-name=xpp3-min
+debian/xpp3_xpath.pom --java-lib --artifact=build/xpp3_xpath-*.jar
--usj-name=xpp3-xpath
diff --git a/debian/rules b/debian/rules
index b9673a8..649dc89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,19 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/pkg-info.mk
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit
-DEB_ANT_BUILD_TARGET := xpp3 junit apidoc
+%:
+ dh $@ --with maven-repo-helper
-clean::
- -rm -rf doc/api
- -rm -rf debian/tmp
-
-binary-post-install/$(PACKAGE)::
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l debian/xpp3.pom build/xpp3-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=xpp3-min debian/xpp3_min.pom
build/xpp3_min-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=xpp3-xpath
debian/xpp3_xpath.pom build/xpp3_xpath-$(VERSION).jar
+override_dh_auto_build:
+ dh_auto_build -- xpp3 junit apidoc
get-orig-source:
- -uscan --download-version $(VERSION) --force-download --rename
+ -uscan --download-current-version --force-download --rename
get-orig-pom: XPP3_XPATH_VERSION=1.1.3.4.O
get-orig-pom:
- wget -O debian/xpp3.pom
http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3/$(VERSION)/xpp3-$(VERSION).pom
- wget -O debian/xpp3_min.pom
http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3_min/$(VERSION)/xpp3_min-$(VERSION).pom
+ wget -O debian/xpp3.pom
http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3/$(DEB_VERSION_UPSTREAM)/xpp3-$(DEB_VERSION_UPSTREAM).pom
+ wget -O debian/xpp3_min.pom
http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3_min/$(DEB_VERSION_UPSTREAM)/xpp3_min-$(DEB_VERSION_UPSTREAM).pom
wget -O debian/xpp3_xpath.pom
http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3_xpath/$(XPP3_XPATH_VERSION)/xpp3_xpath-$(XPP3_XPATH_VERSION).pom
- perl -p -i -e 's/<version>$(XPP3_XPATH_VERSION)/<version>$(VERSION)/'
debian/xpp3_xpath.pom
-
+ perl -p -i -e
's/<version>$(XPP3_XPATH_VERSION)/<version>$(DEB_VERSION_UPSTREAM)/'
debian/xpp3_xpath.pom
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libxpp3-java.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
