[Pkg-xfce-commits] r5301 - in goodies/trunk/xfce4-power-manager: . debian debian/patches

Sat Apr 2 10:24:05 UTC 2011

Author: mrpouit-guest
Date: 2011-04-02 22:24:04 +0000 (Sat, 02 Apr 2011)
New Revision: 5301

Removed:
   goodies/trunk/xfce4-power-manager/debian/patches/01_assume-hal-is-available.patch
   goodies/trunk/xfce4-power-manager/debian/patches/02_fix-indirect-dso-linking.patch
   goodies/trunk/xfce4-power-manager/debian/patches/series
Modified:
   goodies/trunk/xfce4-power-manager/
   goodies/trunk/xfce4-power-manager/debian/changelog
   goodies/trunk/xfce4-power-manager/debian/control
   goodies/trunk/xfce4-power-manager/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-power-manager
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-power-manager:3824-5300
/goodies/tags/xfce4-power-manager/0.8.4.2-1:3692-3823

Modified: goodies/trunk/xfce4-power-manager/debian/changelog
===================================================================

--- goodies/trunk/xfce4-power-manager/debian/changelog	2011-04-02 22:18:38 UTC (rev 5300)
+++ goodies/trunk/xfce4-power-manager/debian/changelog	2011-04-02 22:24:04 UTC (rev 5301)
@@ -1,3 +1,27 @@
+xfce4-power-manager (1.0.10-1) experimental; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/control:
+    - switch libxfcegui4 build-dep to libxfce4ui.
+    - add build-dep on libpolkit-gobject-1-dev, libxext-dev and libx11-dev.
+    - replace dep on hal by upower.
+    - add suggest on udisks for disk spinning.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+
+  [ Lionel Le Folgoc ]
+  * debian/control:
+    - add myself to Uploaders
+    - bump Standards-Version to 3.9.1, no changes required.
+  * Switch to 3.0 (quilt).
+  * debian/rules:
+    - use dpkg-buildflags for cflags/ldflags handling.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 20 Feb 2011 14:56:52 +0100
+
 xfce4-power-manager (0.8.5-3) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Modified: goodies/trunk/xfce4-power-manager/debian/control
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/control	2011-04-02 22:18:38 UTC (rev 5300)
+++ goodies/trunk/xfce4-power-manager/debian/control	2011-04-02 22:24:04 UTC (rev 5301)
@@ -6,8 +6,8 @@
  Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50), intltool, pkg-config, libgtk2.0-dev,
  libdbus-1-dev, libdbus-glib-1-dev, libxfconf-0-dev (>= 4.6.0),
- libxfcegui4-dev (>= 4.6.0), libnotify-dev, xfce4-panel-dev (>= 4.6.0),
- automake, autoconf, libtool, xfce4-dev-tools
+ libxfce4ui-1-dev (>= 4.7.0), libnotify-dev, xfce4-panel-dev (>= 4.6.0),
+ libpolkit-gobject-1-dev, libxext-dev, libx11-dev, hardening-includes
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-power-manager/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-power-manager/
@@ -16,10 +16,10 @@
 Package: xfce4-power-manager
 Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.14-4~), 
+Depends: ${shlibs:Depends}, ${misc:Depends}, upower,
  xfce4-power-manager-data (=${source:Version})
 Recommends: consolekit
-Suggests: xfce4-power-manager-plugins
+Suggests: xfce4-power-manager-plugins, udisks
 Description: power manager for Xfce desktop
  This power manager for the Xfce desktop enables laptop users to set up
  a power profile for two different modes "on battery power" and "on ac
@@ -51,7 +51,7 @@
 Package: xfce4-power-manager-plugins
 Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, 
+Depends: ${shlibs:Depends}, ${misc:Depends},
  xfce4-power-manager (>= 0.8.0~)
 Description: power manager plugins for Xfce panel
  This power manager for the Xfce desktop enables laptop users to set up

Deleted: goodies/trunk/xfce4-power-manager/debian/patches/01_assume-hal-is-available.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/01_assume-hal-is-available.patch	2011-04-02 22:18:38 UTC (rev 5300)
+++ goodies/trunk/xfce4-power-manager/debian/patches/01_assume-hal-is-available.patch	2011-04-02 22:24:04 UTC (rev 5301)
@@ -1,26 +0,0 @@
-From 71207ec4de6ee7fabe06c21f02bbf0785bc308a9 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit at ubuntu.com>
-Date: Wed, 20 Jan 2010 20:10:29 +0100
-Subject: [PATCH] Assume Hal is always available (it'll be spawned by dbus on demand anyway).
-
----
- src/xfpm-dbus-monitor.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/xfpm-dbus-monitor.c b/src/xfpm-dbus-monitor.c
-index b77b21d..95b66f7 100644
---- a/src/xfpm-dbus-monitor.c
-+++ b/src/xfpm-dbus-monitor.c
-@@ -349,8 +349,7 @@ xfpm_dbus_monitor_init (XfpmDBusMonitor *monitor)
- 				monitor, 
- 				NULL);
- 				
--    monitor->priv->hal_connected  = xfpm_dbus_name_has_owner (dbus_g_connection_get_connection (monitor->priv->system_bus), 
--							      "org.freedesktop.Hal");
-+    monitor->priv->hal_connected  = TRUE;
- 							      
-     xfpm_dbus_monitor_add_service (monitor, DBUS_BUS_SESSION, "org.freedesktop.Hal");
- }
--- 
-1.6.3.3
-

Deleted: goodies/trunk/xfce4-power-manager/debian/patches/02_fix-indirect-dso-linking.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/02_fix-indirect-dso-linking.patch	2011-04-02 22:18:38 UTC (rev 5300)
+++ goodies/trunk/xfce4-power-manager/debian/patches/02_fix-indirect-dso-linking.patch	2011-04-02 22:24:04 UTC (rev 5301)
@@ -1,17 +0,0 @@
-Description: Fix linking with --no-add-needed option
-Origin: backport, http://git.xfce.org/apps/xfce4-power-manager/commit/?id=7f977d69a0ca4c17dc27554762f50acee1530b07
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6954
---- xfce4-power-manager-0.8.5.orig/libxfpm/Makefile.am
-+++ xfce4-power-manager-0.8.5/libxfpm/Makefile.am
-@@ -47,6 +47,11 @@ libxfpmcommon_la_CFLAGS =       	\
- 	$(LIBXFCEGUI4_CFLAGS)		\
- 	$(LIBNOTIFY_CFLAGS)
- 
-+libxfpmcommon_la_LIBADD =		\
-+	$(GTK_LIBS)					\
-+	$(GLIB_LIBS)				\
-+	$(DBUS_LIBS)
-+
- if MAINTAINER_MODE
- 
- BUILT_SOURCES =				\

Deleted: goodies/trunk/xfce4-power-manager/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/series	2011-04-02 22:18:38 UTC (rev 5300)
+++ goodies/trunk/xfce4-power-manager/debian/patches/series	2011-04-02 22:24:04 UTC (rev 5301)
@@ -1,2 +0,0 @@
-01_assume-hal-is-available.patch
-02_fix-indirect-dso-linking.patch

Modified: goodies/trunk/xfce4-power-manager/debian/rules
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/rules	2011-04-02 22:18:38 UTC (rev 5300)
+++ goodies/trunk/xfce4-power-manager/debian/rules	2011-04-02 22:24:04 UTC (rev 5301)
@@ -1,17 +1,16 @@
 #!/usr/bin/make -f
 
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-override_dh_install:
-	dh_install --list-missing
+include /usr/share/hardening-includes/hardening.make
 
-override_dh_auto_configure:
-	NOCONFIGURE=1 xdt-autogen
-	dh_auto_configure
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
 
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -f $$(find -name 'Makefile.in')
-	rm -f aclocal.m4 config.* configure ltmain.sh
+export CFLAGS LDFLAGS
 
+override_dh_install:
+	dh_install --list-missing
+
 %:
 	dh $@


