[eclipse-pydev] 01/03: 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-pydev.

commit dfb2711726a79ed3f3d7a5a7841c200dee423ea5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 7 12:11:13 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index e910fbf..7f47501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ eclipse-pydev (3.9.2-5) UNRELEASED; urgency=medium
   * Fixed the build failure with GCC 6 (Closes: #831097)
   * Standards-Version updated to 3.9.8
   * Use a secure Vcs-Git URL
+  * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Oct 2016 00:25:49 +0200
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 7cabc86..92b5447 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends:
  antlr3 (>= 3.2-9),
- debhelper (>= 9),
+ debhelper (>= 10),
  eclipse-mylyn (>= 3.8.2-2),
  eclipse-pde (>= 3.8),
  eclipse-rse,
diff --git a/debian/rules b/debian/rules
index 3cd9f17..6d0ccc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,13 @@ export JAVA_HOME:=/usr/lib/jvm/default-java
 BUILD_ID:=dist
 
 %:
-	# build.xml confuses dh, so move it aside
+	# build.xml and pom.xml confuses dh, so move them aside
 	if [ -f build.xml ]; then \
 		mv build.xml build.xml.unused; \
 	fi
+	if [ -f pom.xml ]; then \
+		mv pom.xml pom.xml.unused; \
+	fi
 	dh $@ --with eclipse-helper
 
 override_dh_auto_build-arch:
@@ -41,6 +44,9 @@ override_dh_auto_clean:
 	if [ -f build.xml.unused ]; then \
 		mv build.xml.unused build.xml; \
 	fi
+	if [ -f pom.xml.unused ]; then \
+		mv pom.xml.unused pom.xml; \
+	fi
 	rm -f attach_linux.so
 
 get-orig-source:

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