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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-02-16 20:34:34 +0000 (Wed, 16 Feb 2011)
New Revision: 4986

Added:
   goodies/trunk/xfce4-power-manager/debian/patches/02_fix-indirect-dso-linking.patch
   goodies/trunk/xfce4-power-manager/debian/source/
   goodies/trunk/xfce4-power-manager/debian/source/format
Modified:
   goodies/trunk/xfce4-power-manager/debian/changelog
   goodies/trunk/xfce4-power-manager/debian/control
   goodies/trunk/xfce4-power-manager/debian/patches/series
   goodies/trunk/xfce4-power-manager/debian/rules
Log:
* Switch to 3.0 (quilt) source format.
  - 02_fix-indirect-dso-linking.patch: fix FTBFS with --no-add-needed.
  - series: add them.
* debian/rules: call xdt-autogen before configure, and clean up
  autogenerated files on clean.
  - build-depends on automake, autoconf, libtool and xfce4-dev-tools.

Modified: goodies/trunk/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/changelog	2011-02-16 17:17:08 UTC (rev 4985)
+++ goodies/trunk/xfce4-power-manager/debian/changelog	2011-02-16 20:34:34 UTC (rev 4986)
@@ -1,10 +1,15 @@
 xfce4-power-manager (0.8.5-3) UNRELEASED; urgency=low
 
+  * Switch to 3.0 (quilt) source format.
   * debian/patches:
     - 01_assume-hal-is-available.patch: do not check for hal presence on
       the bus, it'll be spawned automatically on demand.        Closes: #612611
-    - series: added.
+    - 02_fix-indirect-dso-linking.patch: fix FTBFS with --no-add-needed.
+    - series: add them.
+  * debian/rules: call xdt-autogen before configure, and clean up
+    autogenerated files on clean.
   * debian/control:
+    - build-depends on automake, autoconf, libtool and xfce4-dev-tools.
     - bump hal dep to (>= 0.5.14-4~) for the dbus activation.
     - add myself to Uploaders.
 

Modified: goodies/trunk/xfce4-power-manager/debian/control
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/control	2011-02-16 17:17:08 UTC (rev 4985)
+++ goodies/trunk/xfce4-power-manager/debian/control	2011-02-16 20:34:34 UTC (rev 4986)
@@ -6,7 +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)
+ libxfcegui4-dev (>= 4.6.0), libnotify-dev, xfce4-panel-dev (>= 4.6.0),
+ automake, autoconf, libtool, xfce4-dev-tools
 Standards-Version: 3.8.4
 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/

Added: 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	                        (rev 0)
+++ goodies/trunk/xfce4-power-manager/debian/patches/02_fix-indirect-dso-linking.patch	2011-02-16 20:34:34 UTC (rev 4986)
@@ -0,0 +1,14 @@
+--- 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 =				\

Modified: goodies/trunk/xfce4-power-manager/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/series	2011-02-16 17:17:08 UTC (rev 4985)
+++ goodies/trunk/xfce4-power-manager/debian/patches/series	2011-02-16 20:34:34 UTC (rev 4986)
@@ -1 +1,2 @@
 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-02-16 17:17:08 UTC (rev 4985)
+++ goodies/trunk/xfce4-power-manager/debian/rules	2011-02-16 20:34:34 UTC (rev 4986)
@@ -4,5 +4,14 @@
 override_dh_install:
 	dh_install --list-missing
 
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f $$(find -name 'Makefile.in')
+	rm -f aclocal.m4 config.* configure ltmain.sh
+
 %:
 	dh $@

Added: goodies/trunk/xfce4-power-manager/debian/source/format
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/source/format	                        (rev 0)
+++ goodies/trunk/xfce4-power-manager/debian/source/format	2011-02-16 20:34:34 UTC (rev 4986)
@@ -0,0 +1 @@
+3.0 (quilt)