[SCM] gtk2-engines-oxygen packaging branch, master, updated. debian/1.1.3-1-7-g100a468

Kai Wasserbäch curan at alioth.debian.org
Tue Oct 18 19:27:05 UTC 2011


The following commit has been merged in the master branch:
commit 679136380985ad47e4c0b1994482afcc7ebd88f7
Author: Kai Wasserbäch <curan at debian.org>
Date:   Tue Oct 18 21:03:49 2011 +0200

    Move to debhelper compat level 9
    
    * debian/rules: Remove dpkg-architecture invocation, dh v9 does it for us.
    * debian/control: Bump the B-D on debhelper and correct the B-D on cmake
      for multiarch.
    * debian/source.lintian-overrides: Added (temp. only).
---
 debian/changelog                |    5 +++++
 debian/compat                   |    2 +-
 debian/control                  |    4 ++--
 debian/rules                    |    1 -
 debian/source.lintian-overrides |    2 ++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 599b4fb..5f34e32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ gtk2-engines-oxygen (1.1.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/patches/dont-build-demos.patch: Refreshed.
+  * Move to debhelper compat level 9:
+    - debian/rules: Remove dpkg-architecture invocation, dh v9 does it for us.
+    - debian/control: Bump the B-D on debhelper and correct the B-D on cmake
+      for multiarch.
+    - debian/source.lintian-overrides: Added (temp. only).
 
  -- Kai Wasserbäch <curan at debian.org>  Tue, 18 Oct 2011 20:58:40 +0200
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 5584370..48f8793 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: gnome
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Kai Wasserbäch <curan at debian.org>
-Build-Depends: cmake,
- debhelper (>= 8.1.3~),
+Build-Depends: cmake (>= 2.8.4+dfsg.1-3),
+ debhelper (>= 8.9.4),
  libdbus-glib-1-dev,
  libgtk2.0-dev (>= 2.24.5-4)
 Standards-Version: 3.9.2
diff --git a/debian/rules b/debian/rules
index 60a0979..440161a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --parallel
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..8d47e9e
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+# we're pre v9 but it works for us
+gtk2-engines-oxygen source: package-needs-versioned-debhelper-build-depends 9

-- 
gtk2-engines-oxygen packaging



More information about the pkg-kde-commits mailing list