[Pkg-xfce-commits] r4786 - in goodies/branches/experimental/xfce4-power-manager/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Jan 4 09:25:29 UTC 2011
Author: corsac
Date: 2011-01-04 21:25:25 +0000 (Tue, 04 Jan 2011)
New Revision: 4786
Modified:
goodies/branches/experimental/xfce4-power-manager/debian/changelog
goodies/branches/experimental/xfce4-power-manager/debian/patches/01_fix-indirect-dso-linking.patch
Log:
new upstream release, patch refresh
Modified: goodies/branches/experimental/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/changelog 2011-01-04 08:03:18 UTC (rev 4785)
+++ goodies/branches/experimental/xfce4-power-manager/debian/changelog 2011-01-04 21:25:25 UTC (rev 4786)
@@ -1,4 +1,4 @@
-xfce4-power-manager (1.0.2-1) UNRELEASED; urgency=low
+xfce4-power-manager (1.0.3-1) UNRELEASED; urgency=low
[ Yves-Alexis Perez ]
* New upstream release.
@@ -24,7 +24,7 @@
xfce4-dev-tools.
* debian/patches/01_fix-indirect-dso-linking.patch: fix FTBFS with gold.
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 19 Dec 2010 20:54:20 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 04 Jan 2011 20:51:52 +0100
xfce4-power-manager (0.8.5-1) unstable; urgency=low
Modified: 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-01-04 08:03:18 UTC (rev 4785)
+++ goodies/branches/experimental/xfce4-power-manager/debian/patches/01_fix-indirect-dso-linking.patch 2011-01-04 21:25:25 UTC (rev 4786)
@@ -2,9 +2,11 @@
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
+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])
@@ -12,7 +14,7 @@
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
+@@ -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])
@@ -20,33 +22,25 @@
#=======================================================#
# 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 =
+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)
-+
- 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 = \
+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)
@@ -58,10 +52,3 @@
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)
More information about the Pkg-xfce-commits
mailing list