[aspectj-maven-plugin] 05/14: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Aug 30 22:11:34 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository aspectj-maven-plugin.

commit d64d7dd63071d2fe1dc0d88c238f63de93b7c506
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 30 19:22:56 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/clean     |  1 +
 debian/control   |  2 +-
 debian/rules     | 11 +++--------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cd0edd..1e21593 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ aspectj-maven-plugin (1.7-2) UNRELEASED; urgency=medium
   * Team upload.
   * Depend on libmaven3-core-java instead of libmaven2-core-java
   * Depend on junit4 instead of junit
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.0
   * Switch to debhelper level 10
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..0c1c0f1
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+test.lst
diff --git a/debian/control b/debian/control
index 2257e83..ba9fd64 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: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2)
 Build-Depends-Indep: junit4,
                      libaspectj-java (>= 1.8.2),
                      libdoxia-sitetools-java,
diff --git a/debian/rules b/debian/rules
index 370d835..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-clean::
-	rm -f test.lst
+	uscan --download-current-version --force-download --rename

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



More information about the pkg-java-commits mailing list