[fenix-plugins] 02/10: Bump the debhelper compat to 9, use CFLAGS, etc, from dh.

Peter Pentchev roam at ringlet.net
Sat Dec 26 22:38:25 UTC 2015


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

roam-guest pushed a commit to branch master
in repository fenix-plugins.

commit 0dc29abf318fc6430a3866b6cb79505b417e616d
Author: Peter Pentchev <roam at ringlet.net>
Date:   Mon Dec 21 16:34:15 2015 +0200

    Bump the debhelper compat to 9, use CFLAGS, etc, from dh.
---
 debian/changelog |  3 +++
 debian/compat    |  2 +-
 debian/control   |  4 ++--
 debian/rules     | 10 ++++------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0290af..754aba7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 fenix-plugins (0.0.20070803-6) UNRELEASED; urgency=medium
 
   * Depend on automake, not automake1.10 or automake1.9.
+  * Bump the debhelper compatibility level to 9:
+    - use CPPFLAGS, CFLAGS, and LDFLAGS provided by debhelper
+    - thus, drop the explicit versioned dependency on dpkg-dev
 
  -- Peter Pentchev <roam at ringlet.net>  Mon, 21 Dec 2015 16:25:27 +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 4ce53b8..c8ccab8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>,
  Peter Pentchev <roam at ringlet.net>
-Build-Depends: debhelper (>= 8), autotools-dev (>= 20100122.1~),
- autoconf, automake, dpkg-dev (>= 1.15.7~),
+Build-Depends: debhelper (>= 9), autotools-dev (>= 20100122.1~),
+ autoconf, automake,
  zlib1g-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev,
  libsmpeg-dev, libfreetype6-dev, fenix, fenix-dev, libtool
 Standards-Version: 3.9.1
diff --git a/debian/rules b/debian/rules
index 7fa0bfb..5f2b361 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+DEB_CFLAGS_MAINT_APPEND= -Wall
+export DEB_CFLAGS_MAINT_APPEND
 
-CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
-CFLAGS += -Wall
-
-LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS += -Wl,-z,defs
+DEB_LDFLAGS_MAINT_APPEND= -Wl,-z,defs
+export DEB_LDFLAGS_MAINT_APPEND
 
 PLUGINS = \
 	plugins/fgfx.so plugins/agua.so plugins/fire.so \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix-plugins.git



More information about the Pkg-games-commits mailing list