[Pkg-wmaker-commits] [wmauda] 16/17: Import Debian changes 0.8-3

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch master
in repository wmauda.

commit 289a595436d7bef05015e8ec94c80fdc449ac94e
Author: Rodolfo García Peñas (kix) <kix at debian.org>
Date:   Fri Jul 19 18:15:54 2013 +0200

    Import Debian changes 0.8-3
    
    wmauda (0.8-3) unstable; urgency=low
    
      * debian/patches/link-against-missing-libraries.patch: Link against
        libdbus-glib-1 and libX11. Patch created by Sebastian Ramacher
        <sramacher at debian.org> (Closes: #713481).
      * Updated maintainer email address from kix at kix.es to kix at debian.org.
      * Bump Standards-Version to 3.9.4 (no changes).
      * Debhelper compatibility bumped to 9.
      * debian/rules
        + Added DEB_CFLAGS_MAINT_APPEND to include hardening flags. This
          change avoids the lintian warning "hardening-no-relro usr/bin/wmauda".
      * Added debian/lintian-overrides file to avoid lintian warning about
        no-upstream-changelog.
---
 debian/changelog                                   | 16 ++++++++++++++++
 debian/compat                                      |  2 +-
 debian/control                                     |  6 +++---
 debian/lintian-overrides                           |  2 ++
 .../patches/link-against-missing-libraries.patch   | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 10 ++--------
 7 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff37042..dcd7d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+wmauda (0.8-3) unstable; urgency=low
+
+  * debian/patches/link-against-missing-libraries.patch: Link against
+    libdbus-glib-1 and libX11. Patch created by Sebastian Ramacher
+    <sramacher at debian.org> (Closes: #713481).
+  * Updated maintainer email address from kix at kix.es to kix at debian.org.
+  * Bump Standards-Version to 3.9.4 (no changes).
+  * Debhelper compatibility bumped to 9.
+  * debian/rules
+    + Added DEB_CFLAGS_MAINT_APPEND to include hardening flags. This
+      change avoids the lintian warning "hardening-no-relro usr/bin/wmauda".
+  * Added debian/lintian-overrides file to avoid lintian warning about
+    no-upstream-changelog.
+
+ -- Rodolfo García Peñas (kix) <kix at debian.org>  Fri, 19 Jul 2013 18:15:54 +0200
+
 wmauda (0.8-2) unstable; urgency=low
 
   [ Rodolfo García Peñas (kix) ]
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 0b4d23e..b52c3c0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: wmauda
 Section: sound
 Priority: extra
-Maintainer: Rodolfo García Peñas (kix) <kix at kix.es>
-Build-Depends: debhelper (>= 7.0.50~), audacious-dev (>= 1.4.0), libgtk2.0-dev
-Standards-Version: 3.9.3
+Maintainer: Rodolfo García Peñas (kix) <kix at debian.org>
+Build-Depends: debhelper (>= 9), audacious-dev (>= 1.4.0), libgtk2.0-dev
+Standards-Version: 3.9.4
 Homepage: http://www.netswarm.net/misc/
 
 Package: wmauda
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..c249266
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,2 @@
+# upstream do not include any changelog file.
+wmauda: no-upstream-changelog
diff --git a/debian/patches/link-against-missing-libraries.patch b/debian/patches/link-against-missing-libraries.patch
new file mode 100644
index 0000000..0fc4cb2
--- /dev/null
+++ b/debian/patches/link-against-missing-libraries.patch
@@ -0,0 +1,22 @@
+Description: link against libdbus-glib-1 and libX11
+Author: Sebastian Ramacher <sramacher at debian.org>
+Bug-Debian: http://bugs.debian.org/713481
+Last-Update: 2013-07-19
+
+--- a/Makefile
++++ b/Makefile
+@@ -7,11 +7,11 @@
+ PIXMAP_DIR	:= $(PREFIX)/share/pixmaps
+ MANPAGE_DIR	:= $(PREFIX)/share/man/man1
+ 
+-CFLAGS 	+= $(shell pkg-config audacious --cflags) $(shell pkg-config dbus-1 --cflags)
+-LIBS 	:= $(shell pkg-config audacious --libs) $(shell pkg-config audclient --libs)  $(shell pkg-config dbus-1 --libs)
++CFLAGS 	+= $(shell pkg-config audacious --cflags) $(shell pkg-config dbus-glib-1 --cflags)
++LIBS 	:= $(shell pkg-config audacious --libs) $(shell pkg-config audclient --libs)  $(shell pkg-config dbus-glib-1 --libs)
+ 
+ CFLAGS  += $(shell pkg-config gtk+-2.0 --cflags)
+-LIBS    += $(shell pkg-config gtk+-2.0 --libs)
++LIBS    += $(shell pkg-config gtk+-2.0 --libs) -lX11
+ 
+ OBJS 	= wmauda.o
+ HEADERS = config.h dock-master.xpm
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1848df2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+link-against-missing-libraries.patch
diff --git a/debian/rules b/debian/rules
index a8f5da7..2445233 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,8 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g -Wl,--as-needed
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
+export CFLAGS=$(shell dpkg-buildflags --get CFLAGS) -Wl,--as-needed
+export DEB_CFLAGS_MAINT_APPEND += $(shell dpkg-buildflags --get LDFLAGS)
 
 %:
 	dh $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmauda.git