[tomcat8] 04/06: Switch back to debhelper level 9

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Feb 1 08:15:19 UTC 2017


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

ebourg-guest pushed a commit to annotated tag debian/8.5.11-1_bpo7+1
in repository tomcat8.

commit 4b00e798ac3020c5306a5db69d456125d8ad0418
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 25 13:02:27 2017 +0100

    Switch back to debhelper level 9
---
 debian/changelog | 1 +
 debian/clean     | 2 --
 debian/compat    | 2 +-
 debian/control   | 2 +-
 debian/rules     | 1 +
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab79ae6..86ca299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ tomcat8 (8.5.11-1~bpo7+1) wheezy-backports-sloppy; urgency=medium
     - Depend on openjdk-7 instead of openjdk-6 which is the default in Wheezy
     - Modified the tests to compile and run with the versions of JUnit,
       Hamcrest and EasyMock available in Wheezy
+    - Switch back to debhelper level 9
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 31 Jan 2017 22:58:42 +0100
 
diff --git a/debian/clean b/debian/clean
index a34277d..b893022 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,5 +1,3 @@
-output/
 webapps/examples/WEB-INF/lib/*.jar
 debian/tomcat8.postrm
 debian/tomcat8-user.NEWS
-debian/poms/
diff --git a/debian/compat b/debian/compat
index f599e28..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+9
diff --git a/debian/control b/debian/control
index 1d97620..bf27fc8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: James Page <james.page at ubuntu.com>,
            Jakub Adam <jakub.adam at ktknet.cz>,
            Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: ant-optional,
-               debhelper (>= 10),
+               debhelper (>= 9),
                openjdk-7-jdk,
                po-debconf
 Build-Depends-Indep: javahelper,
diff --git a/debian/rules b/debian/rules
index 6ad4ea3..8f0609b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,7 @@ override_dh_install-indep:
 override_dh_auto_clean:
 	dh_auto_clean
 	-$(ANT) clean
+	rm -Rf output debian/poms
 
 get-orig-source:
 	-uscan --force-download --rename

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



More information about the pkg-java-commits mailing list