[Pkg-xfce-commits] r4664 - in goodies/branches/experimental/xfce4-power-manager/debian: . patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Thu Dec 9 05:21:03 UTC 2010 

Author: mrpouit-guest
Date: 2010-12-09 17:20:56 +0000 (Thu, 09 Dec 2010)
New Revision: 4664

Added:
   goodies/branches/experimental/xfce4-power-manager/debian/patches/
   goodies/branches/experimental/xfce4-power-manager/debian/patches/01_fix-indirect-dso-linking.patch
   goodies/branches/experimental/xfce4-power-manager/debian/patches/series
Modified:
   goodies/branches/experimental/xfce4-power-manager/debian/changelog
   goodies/branches/experimental/xfce4-power-manager/debian/control
   goodies/branches/experimental/xfce4-power-manager/debian/rules
Log:
* debian/rules:
  - use dpkg-buildflags for cflags/ldflags handling.
  - call xdt-autogen before configure, and clean up autogenerated files.
* debian/control: build-depends on automake, autoconf, xfce4-dev-tools.
* debian/patches/01_fix-indirect-dso-linking.patch: fix FTBFS with gold.

Modified: goodies/branches/experimental/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/changelog	2010-12-09 12:56:51 UTC (rev 4663)
+++ goodies/branches/experimental/xfce4-power-manager/debian/changelog	2010-12-09 17:20:56 UTC (rev 4664)
@@ -17,7 +17,11 @@
     - 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.
+  * debian/rules:
+    - use dpkg-buildflags for cflags/ldflags handling.
+    - call xdt-autogen before configure, and clean up autogenerated files.
+  * debian/control: build-depends on automake, autoconf, xfce4-dev-tools.
+  * debian/patches/01_fix-indirect-dso-linking.patch: fix FTBFS with gold.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 12:32:16 +0100
 

Modified: goodies/branches/experimental/xfce4-power-manager/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/control	2010-12-09 12:56:51 UTC (rev 4663)
+++ goodies/branches/experimental/xfce4-power-manager/debian/control	2010-12-09 17:20:56 UTC (rev 4664)
@@ -7,7 +7,8 @@
 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),
  libxfce4ui-1-dev (>= 4.7.0), libnotify-dev, xfce4-panel-dev (>= 4.6.0),
- libpolkit-gobject-1-dev, libxext-dev, libx11-dev, hardening-includes
+ libpolkit-gobject-1-dev, libxext-dev, libx11-dev, hardening-includes,
+ automake, autoconf, xfce4-dev-tools
 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/

Added: goodies/branches/experimental/xfce4-power-manager/debian/patches/01_fix-indirect-dso-linking.patch
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/patches/01_fix-indirect-dso-linking.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-power-manager/debian/patches/01_fix-indirect-dso-linking.patch	2010-12-09 17:20:56 UTC (rev 4664)
@@ -0,0 +1,67 @@
+Description: Fix build with binutils-gold
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6954
+Origin: other, http://bugzilla.xfce.org/attachment.cgi?id=3261
+
+--- xfce4-power-manager-1.0.1.orig/configure.ac
++++ xfce4-power-manager-1.0.1/configure.ac
+@@ -65,6 +65,7 @@ m4_define([libxfce4panel_minimum_version
+ 
+ m4_define([libnotify_minimum_version], [0.4.1])
+ m4_define([xrandr_minimum_version], [1.2.0])
++m4_define([x11_minimum_version], [1.0.0])
+ 
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version])
+@@ -78,6 +79,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version])
+ XDT_CHECK_PACKAGE([LIBNOTIFY],[libnotify], [libnotify_minimum_version])
+ XDT_CHECK_PACKAGE([XRANDR],[xrandr], [xrandr_minimum_version])
++XDT_CHECK_PACKAGE([X11], [x11], [x11_minimum_version])
+ 
+ #=======================================================#
+ #              Polkit?			                #
+--- xfce4-power-manager-1.0.1.orig/common/Makefile.am
++++ xfce4-power-manager-1.0.1/common/Makefile.am
+@@ -16,12 +16,18 @@ libxfpmcommon_la_CFLAGS =
+ 	$(GLIB_CFLAGS)                  \
+ 	$(LIBXFCE4UTIL_CFLAGS)
+ 
++libxfpmcommon_la_LIBADD =               \
++	$(GTK_LIBS)                     \
++	$(GLIB_LIBS)                    \
++	$(XRANDR_LIBS)                   \
++	$(X11_LIBS)
++
+ if ENABLE_HAL
+ 
+ libxfpmcommon_la_CFLAGS += 		\
+ 	$(DBUS_GLIB_CFLAGS)		\
+ 	-I$(top_srcdir)/libhal
+ 
+-libxfpmcommon_la_LIBADD =		\
++libxfpmcommon_la_LIBADD +=		\
+ 	$(top_builddir)/libhal/libxfpmhal.la
+-endif
+\ No newline at end of file
++endif
+--- xfce4-power-manager-1.0.1.orig/libdbus/Makefile.am
++++ xfce4-power-manager-1.0.1/libdbus/Makefile.am
+@@ -17,6 +17,11 @@ libxfpmdbus_la_CFLAGS =			\
+ 	$(LIBXFCE4UTIL_CFLAGS)		\
+ 	$(DBUS_GLIB_CFLAGS)
+ 
++libxfpmdbus_la_LIBADD =			\
++	$(GLIB_LIBS)			\
++	$(DBUS_GLIB_LIBS)		\
++	$(DBUS_LIBS)
++
+ if MAINTAINER_MODE
+ 
+ BUILT_SOURCES =				\
+@@ -40,4 +45,4 @@ EXTRA_DIST =				\
+ 	xfpm-dbus-marshal.list
+ 
+ DISTCLEANFILES =			\
+-	$(BUILT_SOURCES)
+\ No newline at end of file
++	$(BUILT_SOURCES)

Added: goodies/branches/experimental/xfce4-power-manager/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/patches/series	                        (rev 0)
+++ goodies/branches/experimental/xfce4-power-manager/debian/patches/series	2010-12-09 17:20:56 UTC (rev 4664)
@@ -0,0 +1 @@
+01_fix-indirect-dso-linking.patch

Modified: goodies/branches/experimental/xfce4-power-manager/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/rules	2010-12-09 12:56:51 UTC (rev 4663)
+++ goodies/branches/experimental/xfce4-power-manager/debian/rules	2010-12-09 17:20:56 UTC (rev 4664)
@@ -10,5 +10,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 $@

More information about the Pkg-xfce-commits mailing list