[openjdk-8] 03/03: Switch to debhelper level 9

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Apr 2 11:09:11 UTC 2014


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

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit 5e509c96fdb777419637a6e66bea5cdcf91dc18a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 2 13:08:45 2014 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 514de9b..c00a789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openjdk-8 (8~b132-1) UNRELEASED; urgency=medium
   * Initial OpenJDK 8 package derived from the OpenJDK 7 package
     (Closes: #742864)
   * Changed to 3.0 (quilt) source format
+  * Switch to debhelper level 9
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 28 Mar 2014 23:24:02 +0100
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index f58fd7c..e69a724 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: OpenJDK Team <openjdk at lists.launchpad.net>
 Uploaders: Matthias Klose <doko at ubuntu.com>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 5), quilt, binutils-dev [armel armhf], m4, lsb-release, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, fastjar (>= 2:0.96-0ubuntu2),  autoconf, automake, autotools-dev, libtool, g++-4.8,  ecj-gcj [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], gcj-jdk [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el mips m [...]
+Build-Depends: debhelper (>= 9), quilt, binutils-dev [armel armhf], m4, lsb-release, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, fastjar (>= 2:0.96-0ubuntu2),  autoconf, automake, autotools-dev, libtool, g++-4.8,  ecj-gcj [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], gcj-jdk [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el mips m [...]
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/openjdk-8.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/openjdk-8.git
diff --git a/debian/rules b/debian/rules
index 5a72d6b..25e16c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1227,7 +1227,7 @@ clean: debian-clean unpatch
 debian-clean:
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	for f in debian/templates/*.in debian/patches/*.in; do \
 	  f2=$$(echo $$f | sed 's/\/templates//;s/JB/$(basename)/;s/\.in$$//'); \
 	  case "$$f2" in debian/control) continue; esac; \
@@ -1245,7 +1245,7 @@ endif
 install: packaging-files
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	rm -f debian/*.install debian/*.links
 	dh_installdirs
 
diff --git a/debian/templates/control.in b/debian/templates/control.in
index 94bc918..74ad72b 100644
--- a/debian/templates/control.in
+++ b/debian/templates/control.in
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: OpenJDK Team <openjdk at lists.launchpad.net>
 Uploaders: Matthias Klose <doko at ubuntu.com>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 5), quilt, binutils-dev [armel armhf], m4, lsb-release, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, @bd_fastjar@ @bd_autotools@ @bd_cacao@ @bd_jamvm@ @bd_gcc@ @bd_bootstrap@ @bd_openjdk@ @bd_zero@ @bd_shark@ @bd_syslibs@ @bd_pulsejava@ @bd_nss@ @bd_systemtap@ @bd_mauve@ @bd_xvfb@
+Build-Depends: debhelper (>= 9), quilt, binutils-dev [armel armhf], m4, lsb-release, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, @bd_fastjar@ @bd_autotools@ @bd_cacao@ @bd_jamvm@ @bd_gcc@ @bd_bootstrap@ @bd_openjdk@ @bd_zero@ @bd_shark@ @bd_syslibs@ @bd_pulsejava@ @bd_nss@ @bd_systemtap@ @bd_mauve@ @bd_xvfb@
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/openjdk-8.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/openjdk-8.git

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



More information about the pkg-java-commits mailing list