[maven-debian-helper] 02/03: Generate DH 10 compliant packages

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Oct 28 22:47:23 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.

commit e32b99fc18e77e6881d343f55a3f4cd1d5b750e4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Oct 29 00:42:02 2016 +0200

    Generate DH 10 compliant packages
---
 debian/changelog                                       | 4 +++-
 maven-packager-utils/src/main/resources/compat.vm      | 2 +-
 maven-packager-utils/src/main/resources/control.ant.vm | 2 +-
 maven-packager-utils/src/main/resources/control.vm     | 2 +-
 maven-packager-utils/src/main/resources/rules.vm       | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1caf7d4..1a6508d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
 maven-debian-helper (2.1.2) UNRELEASED; urgency=medium
 
-  [ tony mancill ]
   * Team upload.
+
+  [ tony mancill ]
   * Update mh_make to no longer always be --verbose (Closes: #826430)
     - Thank you Christopher Hoskin for the patch.
   * Resolve mh_resolve_dependencies exception when run with --non-interactive
     - Thank you Christopher Hoskin for the patch.  (Closes: #820163) 
 
   [ Emmanuel Bourg ]
+  * Generate DH 10 compliant packages
   * Switch to debhelper level 10
 
  -- tony mancill <tmancill at debian.org>  Mon, 25 Jul 2016 20:54:03 -0700
diff --git a/maven-packager-utils/src/main/resources/compat.vm b/maven-packager-utils/src/main/resources/compat.vm
index ec63514..f599e28 100644
--- a/maven-packager-utils/src/main/resources/compat.vm
+++ b/maven-packager-utils/src/main/resources/compat.vm
@@ -1 +1 @@
-9
+10
diff --git a/maven-packager-utils/src/main/resources/control.ant.vm b/maven-packager-utils/src/main/resources/control.ant.vm
index ea80dbe..b32635f 100644
--- a/maven-packager-utils/src/main/resources/control.ant.vm
+++ b/maven-packager-utils/src/main/resources/control.ant.vm
@@ -18,7 +18,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper (>= 9), default-jdk, maven-repo-helper (>= 1.9)#if ($project.packaging != "pom" || $project.modules.size() > 0), ant-optional, maven-ant-helper (>= 7.6)#end$space
+Build-Depends: debhelper (>= 10), default-jdk, maven-repo-helper (>= 1.9)#if ($project.packaging != "pom" || $project.modules.size() > 0), ant-optional, maven-ant-helper (>= 7.6)#end$space
 #if(!$buildDependencies.isEmpty())
 Build-Depends-Indep:#printDependencies($buildDependencies)$space
 #end
diff --git a/maven-packager-utils/src/main/resources/control.vm b/maven-packager-utils/src/main/resources/control.vm
index cfbf221..ce30850 100644
--- a/maven-packager-utils/src/main/resources/control.vm
+++ b/maven-packager-utils/src/main/resources/control.vm
@@ -18,7 +18,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper (>= 9),#if ($helper == "cdbs") cdbs,#end default-jdk, maven-debian-helper (>= 2.1)
+Build-Depends: debhelper (>= 10),#if ($helper == "cdbs") cdbs,#end default-jdk, maven-debian-helper (>= 2.1)
 #if(!$buildDependencies.isEmpty())
 Build-Depends-Indep:#printDependencies($buildDependencies)$space
 #end
diff --git a/maven-packager-utils/src/main/resources/rules.vm b/maven-packager-utils/src/main/resources/rules.vm
index aba914b..5985cac 100644
--- a/maven-packager-utils/src/main/resources/rules.vm
+++ b/maven-packager-utils/src/main/resources/rules.vm
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=maven
+	dh $@
 
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git



More information about the pkg-java-commits mailing list