[Pkg-xfce-commits] r6428 - in goodies/trunk/xfce4-cellmodem-plugin/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-02-19 16:19:51 +0000 (Sun, 19 Feb 2012)
New Revision: 6428

Added:
   goodies/trunk/xfce4-cellmodem-plugin/debian/patches/03_fix-crash-on-remove.patch
Modified:
   goodies/trunk/xfce4-cellmodem-plugin/debian/changelog
   goodies/trunk/xfce4-cellmodem-plugin/debian/compat
   goodies/trunk/xfce4-cellmodem-plugin/debian/control
   goodies/trunk/xfce4-cellmodem-plugin/debian/patches/series
   goodies/trunk/xfce4-cellmodem-plugin/debian/rules
Log:
* debian/patches:
  - 03_fix-crash-on-remove.patch: fix incorrect callback signature, should
    prevent the plugin from crashing on remove.                   lp: #934307
* debian/rules:
  - use debhelper 9 hardening support.
* debian/compat bumped to 9.
* debian/control:
  - drop hardening-includes build-dep.
  - update debhelper build-dep to 9 for hardening support.
  - add dpkg-dev 1.16.1 build-dep for hardening support.
* debian/rules: fix paths for multiarch.

Modified: goodies/trunk/xfce4-cellmodem-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-cellmodem-plugin/debian/changelog	2012-02-19 16:16:20 UTC (rev 6427)
+++ goodies/trunk/xfce4-cellmodem-plugin/debian/changelog	2012-02-19 16:19:51 UTC (rev 6428)
@@ -1,3 +1,19 @@
+xfce4-cellmodem-plugin (0.0.5-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 03_fix-crash-on-remove.patch: fix incorrect callback signature, should
+      prevent the plugin from crashing on remove.                   lp: #934307
+  * debian/rules:
+    - use debhelper 9 hardening support.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - drop hardening-includes build-dep.
+    - update debhelper build-dep to 9 for hardening support.
+    - add dpkg-dev 1.16.1 build-dep for hardening support.
+  * debian/rules: fix paths for multiarch.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 19 Feb 2012 17:03:17 +0100
+
 xfce4-cellmodem-plugin (0.0.5-2) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/trunk/xfce4-cellmodem-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-cellmodem-plugin/debian/compat	2012-02-19 16:16:20 UTC (rev 6427)
+++ goodies/trunk/xfce4-cellmodem-plugin/debian/compat	2012-02-19 16:19:51 UTC (rev 6428)
@@ -1 +1 @@
-5
+9

Modified: goodies/trunk/xfce4-cellmodem-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-cellmodem-plugin/debian/control	2012-02-19 16:16:20 UTC (rev 6427)
+++ goodies/trunk/xfce4-cellmodem-plugin/debian/control	2012-02-19 16:19:51 UTC (rev 6428)
@@ -4,9 +4,9 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni at debian.org>, 
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libpci-dev, libusb-dev,
+Build-Depends: debhelper (>= 9), autotools-dev, libpci-dev, libusb-dev,
  libxml-parser-perl, pkg-config, xfce4-panel-dev (>= 4.8), libxfcegui4-dev,
- intltool, automake, autoconf, xfce4-dev-tools, hardening-includes
+ intltool, automake, autoconf, xfce4-dev-tools, dpkg (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin
 Vcs-Svn: svn://svn.debian.org/svn/pkg-xfce/goodies/trunk/xfce4-cellmodem-plugin/

Added: goodies/trunk/xfce4-cellmodem-plugin/debian/patches/03_fix-crash-on-remove.patch
===================================================================
--- goodies/trunk/xfce4-cellmodem-plugin/debian/patches/03_fix-crash-on-remove.patch	                        (rev 0)
+++ goodies/trunk/xfce4-cellmodem-plugin/debian/patches/03_fix-crash-on-remove.patch	2012-02-19 16:19:51 UTC (rev 6428)
@@ -0,0 +1,16 @@
+Description: fix incorrect callback signature
+Origin: other, https://bugzilla.xfce.org/attachment.cgi?id=4217
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=6747
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xfce4-cellmodem-plugin/+bug/934307
+
+--- xfce4-cellmodem-plugin-0.0.5.dfsg.orig/panel-plugin/cellmodem.c
++++ xfce4-cellmodem-plugin-0.0.5.dfsg/panel-plugin/cellmodem.c
+@@ -586,7 +586,7 @@ cellmodem_t_update_monitors( cellmodem_t
+  */
+ 
+ static void
+-cellmodem_t_delete(cellmodem_t *monitor)
++cellmodem_t_delete(XfcePanelPlugin *plugin, cellmodem_t *monitor)
+ {
+     DEBUG("Destroying cellmodem object");
+     cellmodem_t_close_modem( monitor /*, TRUE*/ );

Modified: goodies/trunk/xfce4-cellmodem-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-cellmodem-plugin/debian/patches/series	2012-02-19 16:16:20 UTC (rev 6427)
+++ goodies/trunk/xfce4-cellmodem-plugin/debian/patches/series	2012-02-19 16:19:51 UTC (rev 6428)
@@ -1,2 +1,3 @@
 01_typo-linking.patch
 02_explicit-linking-to-libxfcegui4.patch
+03_fix-crash-on-remove.patch

Modified: goodies/trunk/xfce4-cellmodem-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-cellmodem-plugin/debian/rules	2012-02-19 16:16:20 UTC (rev 6427)
+++ goodies/trunk/xfce4-cellmodem-plugin/debian/rules	2012-02-19 16:19:51 UTC (rev 6428)
@@ -1,20 +1,13 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
-
-export CFLAGS LDFLAGS
-
 override_dh_auto_configure:
 	NOCONFIGURE=1 xdt-autogen
 	echo panel-plugin/cellmodem.desktop.in.in >> po/POTFILES.skip
 	dh_auto_configure -- --mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info --libexecdir=\$${prefix}/lib
+		--infodir=\$${prefix}/share/info --libexecdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_clean:
 	dh_auto_clean