This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository geronimo-interceptor-3.0-spec.
commit c2492e5ce287d23d651c67b2c09f67c3e260693d
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Mar 23 00:35:00 2018 +0100
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/control | 1 -
debian/libgeronimo-interceptor-3.0-spec-java.poms | 1 +
debian/rules | 27 ++++++++++++-----------
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9179ba6..37e9c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
geronimo-interceptor-3.0-spec (1.0.1-4) UNRELEASED; urgency=medium
+ * Build with the DH sequencer instead of CDBS
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
* Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index 9cd2e5a..9ba357c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Uploaders:
Thierry Carrez <thierry.car...@ubuntu.com>
Build-Depends:
ant,
- cdbs,
debhelper (>= 11),
default-jdk,
maven-repo-helper
diff --git a/debian/libgeronimo-interceptor-3.0-spec-java.poms
b/debian/libgeronimo-interceptor-3.0-spec-java.poms
new file mode 100644
index 0000000..32f7205
--- /dev/null
+++ b/debian/libgeronimo-interceptor-3.0-spec-java.poms
@@ -0,0 +1 @@
+pom.xml --no-parent --java-lib --usj-name=geronimo-interceptor-3.0-spec
--artifact=build/geronimo-interceptor-3.0-spec-*.jar
diff --git a/debian/rules b/debian/rules
index de19238..5333e1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,32 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/pkg-info.mk
-SVN :=
tags/geronimo-interceptor_3.0_spec-$(DEB_UPSTREAM_VERSION)
+SVN :=
tags/geronimo-interceptor_3.0_spec-$(DEB_VERSION_UPSTREAM)
ASFREPO := http://svn.apache.org/repos/asf/geronimo/specs/$(SVN)
REQUIRED_JVM_VERSION := 1.5
JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -DartifactVersion=$(DEB_UPSTREAM_VERSION) \
- -DartifactId=$(DEB_SOURCE_PACKAGE) \
+DEB_ANT_ARGS := -DartifactVersion=$(DEB_VERSION_UPSTREAM) \
+ -DartifactId=$(DEB_SOURCE) \
-DsourceVersion=$(REQUIRED_JVM_VERSION) \
-DtargetVersion=$(REQUIRED_JVM_VERSION)
-binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
- mh_installpom -plib$(DEB_SOURCE_PACKAGE)-java --no-parent pom.xml
- mh_installjar -plib$(DEB_SOURCE_PACKAGE)-java --java-lib
--usj-name=geronimo-interceptor-3.0-spec pom.xml
build/geronimo-interceptor-3.0-spec-*.jar
+%:
+ dh $@ --buildsystem=ant --with maven-repo-helper
-clean::
- mh_clean
+override_dh_auto_build:
+ dh_auto_build -- -f debian/build.xml $(DEB_ANT_ARGS)
+
+override_dh_auto_clean:
+ dh_auto_clean -- -f debian/build.xml
get-orig-source:
- echo "Getting version $(DEB_UPSTREAM_VERSION) from $(SVN)"
+ echo "Getting version $(DEB_VERSION_UPSTREAM) from $(SVN)"
mkdir orig_tmp
cd orig_tmp && \
- svn export -q $(ASFREPO)
$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) && \
- GZIP=-9 tar czf
../../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+ svn export -q $(ASFREPO)
$(DEB_SOURCE_PACKAGE)-$(DEB_VERSION_UPSTREAM) && \
+ GZIP=-9 tar czf
../../$(DEB_SOURCE_PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
$(DEB_SOURCE_PACKAGE)-$(DEB_VERSION_UPSTREAM)
rm -rf orig_tmp
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/geronimo-interceptor-3.0-spec.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
