[xsom] 03/04: Switch to cdbs

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Dec 17 15:47:58 UTC 2013


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

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

commit 554f21f2ab67f2be81050dac91816aeb9e188f4d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 17 16:40:09 2013 +0100

    Switch to cdbs
---
 debian/control | 2 +-
 debian/rules   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 5a2a756..8f81e71 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: Timo Aaltonen <tjaalton at ubuntu.com>
-Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.6)
+Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.6)
 Build-Depends-Indep: libbuild-helper-maven-plugin-java,
  libmaven-antrun-plugin-java,
  librelaxng-datatype-java (>= 1.0),
diff --git a/debian/rules b/debian/rules
index d8ef6a9..1dd7439 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
-JAVA_HOME := /usr/lib/jvm/default-java
+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_clean:
+clean::
 	rm -Rf build
-	dh_auto_clean
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

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



More information about the pkg-java-commits mailing list