[libmiglayout-java] 04/05: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Aug 1 21:13:08 UTC 2016


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

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

commit 36f9ebad36b42f83e48c1592ff61ae01c2c6fe62
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Aug 1 23:09:26 2016 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/rules     | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd44367..0bdada7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libmiglayout-java (4.2-2) UNRELEASED; urgency=medium
 
   * Transition to libswt-gtk-4-java
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
 
diff --git a/debian/control b/debian/control
index d6f9316..2610483 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, 
  Andrew Ross <ubuntu at rossfamily.co.uk>
-Build-Depends: debhelper (>= 9), cdbs, maven-debian-helper
+Build-Depends: debhelper (>= 9), maven-debian-helper
 Build-Depends-Indep: ant, default-jdk, libswt-gtk-4-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libmiglayout-java.git
diff --git a/debian/rules b/debian/rules
index 88ab733..6b1bfcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@ --buildsystem=maven
 
-JAVA_HOME := /usr/lib/jvm/default-java
+override_dh_auto_install:
+	dh_auto_install
 
-binary-install/libmiglayout-java::
 	# Create a all in one jar to ensure the backward compatibility
 	mkdir target/classes
 	cp -R core/target/classes/*    target/classes
@@ -17,4 +17,4 @@ binary-install/libmiglayout-java::
 	dh_link -plibmiglayout-java /usr/share/java/miglayout.jar /usr/share/java/miglayout-$(DEB_UPSTREAM_VERSION).jar
 
 get-orig-source:
-	-uscan --upstream-version $(DEB_UPSTREAM_VERSION) --rename
+	uscan --download-current-version --rename --repack --compression xz

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



More information about the pkg-java-commits mailing list