[SCM] bluedevil packaging branch, master, updated. debian/1.1-1-9-gf2d908d

Pino Toscano pino at alioth.debian.org
Fri Mar 30 18:45:49 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/bluedevil.git;a=commitdiff;h=f2d908d

The following commit has been merged in the master branch:
commit f2d908dc0b57beb65daf34d949ecc3382eebed9e
Author: Pino Toscano <pino at debian.org>
Date:   Fri Mar 30 20:45:14 2012 +0200

    bump debhelper compatibility to 9
    
    - move arguments of `dh' to pass sequence first
    - bump debhelper build dependency to 9
    - bump compat to 9 (this also makes use of dpkg-buildflags)
    - switch to DEB_LDFLAGS_MAINT_APPEND to append our custom LDFLAGS
---
 debian/changelog |    5 +++++
 debian/compat    |    2 +-
 debian/control   |    2 +-
 debian/rules     |    8 ++------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2dbdc4c..b3b2068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ bluedevil (1.2.2-0r1) UNRELEASED; urgency=low
   * Add a watch file.
   * Bump Standards-Version to 3.9.3, no changes required.
   * Update lintian overrides.
+  * Bump debhelper compatibility to 9:
+    - move arguments of `dh' to pass sequence first
+    - bump debhelper build dependency to 9
+    - bump compat to 9 (this also makes use of dpkg-buildflags)
+    - switch to DEB_LDFLAGS_MAINT_APPEND to append our custom LDFLAGS
 
  -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Fri, 16 Sep 2011 15:37:40 +0200
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 88194eb..614b881 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Florian Reinhard <florian.reinhard at googlemail.com>, George Kiagiadakis <kiagiadakis.george at gmail.com>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7.3.16), pkg-kde-tools (>= 0.5), cmake, libbluedevil-dev (>= 1.8.1),
+Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.5), cmake, libbluedevil-dev (>= 1.8.1),
  kdelibs5-dev (>= 4.4), shared-mime-info
 Standards-Version: 3.9.3
 Homepage: https://projects.kde.org/projects/extragear/base/bluedevil
diff --git a/debian/rules b/debian/rules
index f9cac87..0df1f7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
 
-override_dh_auto_configure:
-	dh_auto_configure --buildsystem=kde -- \
-			-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-			-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-			-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 %:
-	dh --parallel --with kde $@
+	dh $@ --parallel --with kde

-- 
bluedevil packaging



More information about the pkg-kde-commits mailing list