This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository easyconf.
commit 0d9e5422478cc9e1432bc30082a67a45bf68b869
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Sun Mar 18 23:51:10 2018 +0100
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/clean | 1 +
debian/control | 1 -
debian/libeasyconf-java.poms | 2 +-
debian/rules | 33 ++++++++++++++++-----------------
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bc0173e..1814901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ easyconf (0.9.5-6) UNRELEASED; urgency=medium
* Team upload.
* Fixed the build failure with Java 9 (Closes: #893143)
+ * Build with the DH sequencer instead of CDBS
* Moved the package to Git
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f18e1b9
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+src/conf/
diff --git a/debian/control b/debian/control
index 9949cd4..3651a8e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.or
Uploaders: Damien Raude-Morvan <draz...@debian.org>
Build-Depends: ant,
ant-optional,
- cdbs,
debhelper (>= 11),
default-jdk,
junit,
diff --git a/debian/libeasyconf-java.poms b/debian/libeasyconf-java.poms
index 1a7e280..b3a89ac 100644
--- a/debian/libeasyconf-java.poms
+++ b/debian/libeasyconf-java.poms
@@ -1 +1 @@
-debian/pom.xml
+debian/pom.xml --java-lib --artifact=target/easyconf-*.jar
diff --git a/debian/rules b/debian/rules
index a47a867..4f464c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,27 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
POM_VERSION := 0.9.5
MAVEN_REPO :=
http://repository.sonatype.org/service/local/repositories/central/content
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := commons-collections3 commons-logging commons-lang
commons-digester commons-configuration commons-beanutils \
- servlet-api-3.1 jsp-api-2.3 xstream junit ant-junit
-DEB_ANT_BUILD_TARGET := jar javadoc
-DEB_ANT_CHECK_TARGET := internal-test
+export CLASSPATH=/usr/share/java/commons-collections3.jar\
+ :/usr/share/java/commons-configuration.jar\
+ :/usr/share/java/commons-digester\
+ :/usr/share/java/commons-beanutils\
+ :/usr/share/java/commons-lang\
+ :/usr/share/java/commons-logging.jar\
+ :/usr/share/java/servlet-api-3.1.jar\
+ :/usr/share/java/jsp-api-2.3.jar\
+ :/usr/share/java/xstream.jar
-makebuilddir::
- -mkdir -p src/conf
+%:
+ dh $@ --with maven-repo-helper
-clean::
- -rm -rf src/conf
- -rm debian/tmp
- mh_clean
+override_dh_auto_build:
+ -mkdir -p src/conf
+ dh_auto_build -- jar javadoc
-binary-post-install/libeasyconf-java::
- mh_installpoms -plibeasyconf-java
- mh_installjar -plibeasyconf-java -l debian/pom.xml
target/easyconf-$(DEB_UPSTREAM_VERSION).jar
+overrideèdh_auto_test:
+ dh_auto_build -- internal-test
get-orig-source::
uscan --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/easyconf.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
