[pkg-java] r18927 - trunk/commons-vfs/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2015-12-07 10:26:19 +0000 (Mon, 07 Dec 2015)
New Revision: 18927

Modified:
   trunk/commons-vfs/debian/changelog
   trunk/commons-vfs/debian/control
   trunk/commons-vfs/debian/rules
Log:
Build with the DH sequencer instead of CDBS



Modified: trunk/commons-vfs/debian/changelog
===================================================================
--- trunk/commons-vfs/debian/changelog	2015-12-06 21:13:39 UTC (rev 18926)
+++ trunk/commons-vfs/debian/changelog	2015-12-07 10:26:19 UTC (rev 18927)
@@ -3,6 +3,7 @@
   * Team upload.
   * Depend on libcommons-net-java instead of libcommons-net2-java
     (Closes: #800761)
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 05 Oct 2015 11:52:24 +0200
 

Modified: trunk/commons-vfs/debian/control
===================================================================
--- trunk/commons-vfs/debian/control	2015-12-06 21:13:39 UTC (rev 18926)
+++ trunk/commons-vfs/debian/control	2015-12-07 10:26:19 UTC (rev 18927)
@@ -19,7 +19,7 @@
                      libjsch-java,
                      libmaven-antrun-plugin-java,
                      libmaven-javadoc-plugin-java
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/commons-vfs
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/commons-vfs

Modified: trunk/commons-vfs/debian/rules
===================================================================
--- trunk/commons-vfs/debian/rules	2015-12-06 21:13:39 UTC (rev 18926)
+++ trunk/commons-vfs/debian/rules	2015-12-07 10:26:19 UTC (rev 18927)
@@ -1,14 +1,9 @@
 #!/usr/bin/make -f
-# debian/rules for commons-vfs
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
 
-JAVA_HOME            := /usr/lib/jvm/default-java
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
+%:
+	dh $@ --buildsystem=maven
 
-DEB_MAVEN_DOC_TARGET       := javadoc:aggregate
-
 get-orig-source:
-	uscan --force-download --rename
+	uscan --download-current-version --force-download --rename