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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-02-20 13:52:34 +0000 (Sun, 20 Feb 2011)
New Revision: 5009

Removed:
   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/rules
Log:
remove patch included upstream


Modified: goodies/branches/experimental/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/changelog	2011-02-20 13:51:16 UTC (rev 5008)
+++ goodies/branches/experimental/xfce4-power-manager/debian/changelog	2011-02-20 13:52:34 UTC (rev 5009)
@@ -19,12 +19,8 @@
   * Switch to 3.0 (quilt).
   * 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, libtool and
-    xfce4-dev-tools.
-  * debian/patches/01_fix-indirect-dso-linking.patch: fix FTBFS with gold.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 04 Jan 2011 20:51:52 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 20 Feb 2011 14:51:53 +0100
 
 xfce4-power-manager (0.8.5-1) unstable; urgency=low
 

Deleted: 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	2011-02-20 13:51:16 UTC (rev 5008)
+++ goodies/branches/experimental/xfce4-power-manager/debian/patches/01_fix-indirect-dso-linking.patch	2011-02-20 13:52:34 UTC (rev 5009)
@@ -1,54 +0,0 @@
-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
-
-Index: xfce4-power-manager-1.0.3/configure.ac
-===================================================================
---- xfce4-power-manager-1.0.3.orig/configure.ac	2011-01-04 14:37:58.000000000 +0100
-+++ xfce4-power-manager-1.0.3/configure.ac	2011-01-04 21:37:55.000000000 +0100
-@@ -70,6 +70,7 @@
- 
- 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])
-@@ -83,6 +84,7 @@
- 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?			                #
-Index: xfce4-power-manager-1.0.3/common/Makefile.am
-===================================================================
---- xfce4-power-manager-1.0.3.orig/common/Makefile.am	2011-01-04 14:33:55.000000000 +0100
-+++ xfce4-power-manager-1.0.3/common/Makefile.am	2011-01-04 21:37:55.000000000 +0100
-@@ -16,3 +16,9 @@
- 	$(GTK_CFLAGS)                   \
- 	$(GLIB_CFLAGS)                  \
- 	$(LIBXFCE4UTIL_CFLAGS)
-+
-+libxfpmcommon_la_LIBADD =               \
-+	$(GTK_LIBS)                     \
-+	$(GLIB_LIBS)                    \
-+	$(XRANDR_LIBS)                   \
-+	$(X11_LIBS)
-Index: xfce4-power-manager-1.0.3/libdbus/Makefile.am
-===================================================================
---- xfce4-power-manager-1.0.3.orig/libdbus/Makefile.am	2011-01-04 12:33:21.000000000 +0100
-+++ xfce4-power-manager-1.0.3/libdbus/Makefile.am	2011-01-04 21:37:55.000000000 +0100
-@@ -17,6 +17,11 @@
- 	$(LIBXFCE4UTIL_CFLAGS)		\
- 	$(DBUS_GLIB_CFLAGS)
- 
-+libxfpmdbus_la_LIBADD =			\
-+	$(GLIB_LIBS)			\
-+	$(DBUS_GLIB_LIBS)		\
-+	$(DBUS_LIBS)
-+
- if MAINTAINER_MODE
- 
- BUILT_SOURCES =				\

Deleted: goodies/branches/experimental/xfce4-power-manager/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/patches/series	2011-02-20 13:51:16 UTC (rev 5008)
+++ goodies/branches/experimental/xfce4-power-manager/debian/patches/series	2011-02-20 13:52:34 UTC (rev 5009)
@@ -1 +0,0 @@
-01_fix-indirect-dso-linking.patch

Modified: goodies/branches/experimental/xfce4-power-manager/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/rules	2011-02-20 13:51:16 UTC (rev 5008)
+++ goodies/branches/experimental/xfce4-power-manager/debian/rules	2011-02-20 13:52:34 UTC (rev 5009)
@@ -12,14 +12,5 @@
 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 $@