This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libj2ssh-java.
commit 1d010b1234a430d0dc39d1e00318e7c312030098
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Thu Jan 4 00:22:45 2018 +0100
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/clean | 1 +
debian/control | 1 -
debian/rules | 31 +++++++++++++------------------
4 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9519018..46be7bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libj2ssh-java (0.2.9-5) UNRELEASED; urgency=medium
+ Remove Kumar Appaiah from uploaders
[ Emmanuel Bourg ]
+ * Build with the DH sequencer instead of CDBS
* Moved the package to Git
* Standards-Version updated to 4.1.3
* Switch to debhelper level 10
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..77f12ae
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+docs/
diff --git a/debian/control b/debian/control
index f480245..98c3b7b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
Emmanuel Bourg <ebo...@apache.org>
Build-Depends:
ant,
- cdbs,
debhelper (>= 10),
default-jdk,
javahelper,
diff --git a/debian/rules b/debian/rules
index 32730a6..573fbaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,20 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/dpkg/pkg-info.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := javadoc
-DEB_JARS := commons-logging
+export CLASSPATH=/usr/share/java/commons-logging.jar
-clean::
- rm -rf docs
+%:
+ dh $@ --with javahelper
-install/libj2ssh-java::
- dh_link /usr/share/java/j2ssh-core-$(DEB_UPSTREAM_VERSION).jar \
- /usr/share/java/j2ssh-core.jar
- dh_link /usr/share/java/j2ssh-ant-$(DEB_UPSTREAM_VERSION).jar \
- /usr/share/java/j2ssh-ant.jar
- dh_link /usr/share/java/j2ssh-dameon-$(DEB_UPSTREAM_VERSION).jar \
- /usr/share/java/j2ssh-dameon.jar
- dh_link /usr/share/java/j2ssh-common-$(DEB_UPSTREAM_VERSION).jar \
- /usr/share/java/j2ssh-common.jar
+override_dh_auto_build:
+ dh_auto_build -- javadoc
+
+override_dh_auto_install:
+ dh_link /usr/share/java/j2ssh-core-$(DEB_VERSION_UPSTREAM).jar
/usr/share/java/j2ssh-core.jar
+ dh_link /usr/share/java/j2ssh-ant-$(DEB_VERSION_UPSTREAM).jar
/usr/share/java/j2ssh-ant.jar
+ dh_link /usr/share/java/j2ssh-dameon-$(DEB_VERSION_UPSTREAM).jar
/usr/share/java/j2ssh-dameon.jar
+ dh_link /usr/share/java/j2ssh-common-$(DEB_VERSION_UPSTREAM).jar
/usr/share/java/j2ssh-common.jar
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
+ uscan --download-current-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libj2ssh-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
