[libjaxen-java] 44/49: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Oct 25 13:22:14 UTC 2017


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

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

commit f98163d820f880cf1e50c0157ef98bea9eea22ae
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 25 14:41:49 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog         | 1 +
 debian/control           | 4 ++--
 debian/maven.ignoreRules | 1 +
 debian/rules             | 8 +++-----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d9aa4e..8a0b6a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libjaxen-java (1.1.6-2) UNRELEASED; urgency=medium
 
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 28f5306..1c4f0a0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,15 +7,15 @@ Uploaders:
  Emmanuel Bourg <ebourg at apache.org>,
  Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends:
- cdbs,
  debhelper (>= 10),
  default-jdk,
  junit,
  libdom4j-java,
  libjdom1-java,
+ libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
  libxom-java,
- maven-debian-helper
+ maven-debian-helper (>= 2.2)
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjaxen-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjaxen-java.git
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..8a62c52
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+org.apache.maven.plugins maven-assembly-plugin * * * *
diff --git a/debian/rules b/debian/rules
index 4af27cf..194b340 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/maven.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@
 
 get-orig-source:
-	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
+	uscan --force-download --download-current-version --rename

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



More information about the pkg-java-commits mailing list