[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.4.3-13-g84cb794



The following commit has been merged in the master branch:
commit d15295e01828223fcbf9db58f86f741272f0dc75
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Dec 21 22:32:07 2010 +0100

    Bump debhelper compat and build dependency (some tests use override_ targets).

diff --git a/debian/changelog b/debian/changelog
index b624235..2b1478d 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,13 @@ lintian (2.4.4) UNRELEASED; urgency=low
       work to determine which packages are required.  (Closes: #593832)
     + [RA] Remove versions from dependencies when those versions are
       satisifed by stable (lenny).
+    + [NT] Bump debhelper build dependency to 7.0.50~, since some tests
+      depend on using dh7 with override targets. (Closes: #607730)
   * debian/rules:
     + [RA] Run the test suite during the package build.
+    + [NT] Replace dh_clean -k with dh_prep.
+  * debian/compat:
+    + [NT] Bump debhelper comat to 7.
 
  -- Raphael Geissert <geissert@debian.org>  Thu, 29 Jul 2010 21:09:55 -0400
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index f3bb62a..a0638f1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Josip Rodin <joy-packages@debian.org>,
  Colin Watson <cjwatson@debian.org>, Russ Allbery <rra@debian.org>,
  Adam D. Barratt <adam@adam-barratt.org.uk>,
  Raphael Geissert <geissert@debian.org>
-Build-Depends: debhelper (>= 5), binutils, debiandoc-sgml, diffstat,
+Build-Depends: debhelper (>= 7.0.50~), binutils, debiandoc-sgml, diffstat,
  fakeroot, file, gettext, intltool-debian, libapt-pkg-perl,
  libclass-accessor-perl, libapt-pkg-perl, libdigest-sha-perl,
  libipc-run-perl, libparse-debianchangelog-perl,
diff --git a/debian/rules b/debian/rules
index 77861c5..81ceab8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ binary-indep: $(neededfiles) build
 	@echo .... binary-indep ....
 	dh_testdir
 	dh_testroot
-	dh_clean -k -Xtestset/diffs/binary.c~
+	dh_prep -Xtestset/diffs/binary.c~
 	dh_installdirs
 
 	dh_install

-- 
Debian package checker


Reply to: