[eclipse-mylyn] 02/05: Switch to debhelper level 10

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository eclipse-mylyn.

commit 9c15d4e8a160b96805a24a60325f5c02ecbba716
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 7 15:03:53 2016 +0100

    Switch to debhelper level 10
---
 debian/changelog |  1 +
 debian/compat    |  2 +-
 debian/control   |  2 +-
 debian/rules     | 10 ++++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6217ae6..cf36e2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ eclipse-mylyn (3.12.0-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Standards-Version updated to 3.9.8
+  * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 07 Nov 2016 15:03:30 +0100
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 9a0aa77..7ff1542 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Adrian Perez <adrianperez.deb at gmail.com>,
            Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: debhelper (>= 8~),
+Build-Depends: debhelper (>= 10),
                default-jdk,
                eclipse-jdt (>= 3.7~exp),
                eclipse-pde (>= 3.7~exp),
diff --git a/debian/rules b/debian/rules
index 249e373..e22d95c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,10 @@
 export JAVA_HOME:=/usr/lib/jvm/default-java
 
 %:
+	# pom.xml confuses dh, so move ot aside
+	if [ -f pom.xml ]; then \
+		mv pom.xml pom.xml.unused; \
+	fi
 	dh $@ --with eclipse-helper
 
 override_jh_compilefeatures:
@@ -16,3 +20,9 @@ override_jh_compilefeatures:
 	        -consoleLog -noSplash
 
 	jh_compilefeatures --build-opts="-DjavacTarget=1.6 -DjavacSource=1.6"
+
+override_dh_auto_clean:
+	dh_auto_clean
+	if [ -f pom.xml.unused ]; then \
+		mv pom.xml.unused pom.xml; \
+	fi

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