This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libcommons-modeler-java.
commit bbf1875b37be641561ce5d35fac2f5a4426309bc
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Thu Oct 26 23:31:52 2017 +0200
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/control | 1 -
debian/dirs | 1 -
debian/libcommons-modeler-java.poms | 2 +-
debian/pom.xml | 2 +-
debian/rules | 26 ++++++--------------------
6 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2aebbd6..fedf61d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
libcommons-modeler-java (2.0.1-8) 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 8d32536..19752ed 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.or
Uploaders: Marcus Better <mar...@better.se>
Build-Depends:
ant,
- cdbs (>= 0.4.8),
debhelper (>= 10),
default-jdk,
junit,
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libcommons-modeler-java.poms
b/debian/libcommons-modeler-java.poms
index 623bd24..c009b71 100644
--- a/debian/libcommons-modeler-java.poms
+++ b/debian/libcommons-modeler-java.poms
@@ -1 +1 @@
-debian/pom.xml --no-parent
+debian/pom.xml --no-parent --java-lib --has-package-version
--artifact=dist/commons-modeler.jar
diff --git a/debian/pom.xml b/debian/pom.xml
index dd0c124..4dcb07c 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-modeler</groupId>
<artifactId>commons-modeler</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<name>Commons Modeler</name>
<inceptionYear>2002</inceptionYear>
<description>
diff --git a/debian/rules b/debian/rules
index 1488bd3..6987477 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,10 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+ dh $@ --with maven-repo-helper
-JAVA_HOME := /usr/lib/jvm/default-java
+override_dh_auto_build:
+ dh_auto_build -- dist
-# Additional JARs to add to the class path, either full path or just the
-# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS := commons-digester commons-logging junit
-
-# Ant targets to call
-DEB_ANT_BUILD_TARGET := dist
-DEB_ANT_CHECK_TARGET := test
-
-LIBRARY_PACKAGE := commons-modeler
-
-install/lib$(LIBRARY_PACKAGE)-java::
- mh_installpoms -plib$(LIBRARY_PACKAGE)-java -e$(DEB_UPSTREAM_VERSION)
- mh_installjar -plib$(LIBRARY_PACKAGE)-java -e$(DEB_UPSTREAM_VERSION) \
- -l debian/pom.xml dist/commons-modeler.jar
-
-clean::
- mh_clean
+override_dh_auto_test:
+ dh_auto_build -- test
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libcommons-modeler-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
