[Pkg-xfce-commits] r6603 - in desktop/branches/experimental/xfce4-session/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Apr 2 03:49:34 UTC 2012
Author: corsac
Date: 2012-04-02 15:49:33 +0000 (Mon, 02 Apr 2012)
New Revision: 6603
Removed:
desktop/branches/experimental/xfce4-session/debian/debian-tips
desktop/branches/experimental/xfce4-session/debian/patches/02_fix-fortune-path.patch
desktop/branches/experimental/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch
desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch
desktop/branches/experimental/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch
desktop/branches/experimental/xfce4-session/debian/patches/06_no-settings-helper-in-490.patch
desktop/branches/experimental/xfce4-session/debian/patches/series
Modified:
desktop/branches/experimental/xfce4-session/debian/changelog
desktop/branches/experimental/xfce4-session/debian/control
desktop/branches/experimental/xfce4-session/debian/rules
Log:
- drop fortunes-mod build-dep since xfce4-tip is gone.
* debian/patches:
- 02_fix-fortune-path, 03_respect-save-settings-logout-plugin,
04_fix-missing-lm, 05_force-xfsettingsd-start,
06_no-settings-helper-in-490 dropped, not needed anymore.
* debian/rules:
- drop chrpath call.
- drop strfile call.
* debian/debian-tips dropped, there's no tips anymore.
Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/changelog 2012-04-02 15:49:33 UTC (rev 6603)
@@ -13,6 +13,15 @@
* debian/control:
- bump build-deps for 4.9.
- update standards version to 3.9.3.
+ - drop fortunes-mod build-dep since xfce4-tip is gone.
+ * debian/patches:
+ - 02_fix-fortune-path, 03_respect-save-settings-logout-plugin,
+ 04_fix-missing-lm, 05_force-xfsettingsd-start,
+ 06_no-settings-helper-in-490 dropped, not needed anymore.
+ * debian/rules:
+ - drop chrpath call.
+ - drop strfile call.
+ * debian/debian-tips dropped, there's no tips anymore.
-- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 10 Sep 2011 15:00:26 +0200
Modified: desktop/branches/experimental/xfce4-session/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/control 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/control 2012-04-02 15:49:33 UTC (rev 6603)
@@ -4,7 +4,7 @@
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl,
- fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, xfce4-panel-dev (>= 4.8.0),
+ libdbus-1-dev, libdbus-glib-1-dev, xfce4-panel-dev (>= 4.8.0),
libxfce4util6-dev, libxfce4ui-1-dev (>= 4.9.0), libwnck-dev,
x11-xserver-utils, libxfconf-0-dev (>= 4.8.0), libglade2-dev,
intltool (>= 0.31), dpkg-dev (>= 1.16.1), xfce4-dev-tools, libtool
Deleted: desktop/branches/experimental/xfce4-session/debian/debian-tips
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/debian-tips 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/debian-tips 2012-04-02 15:49:33 UTC (rev 6603)
@@ -1,8 +0,0 @@
-The Debian Xfce packages you're using right now are brought to you by the
-Debian Xfce Group.
-
-See http://pkg-xfce.alioth.debian.org for more information.
-%
-On Debian systems you can get a selection of panel plugins installing the
-xfce4-goodies package.
-%
Deleted: desktop/branches/experimental/xfce4-session/debian/patches/02_fix-fortune-path.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/02_fix-fortune-path.patch 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/patches/02_fix-fortune-path.patch 2012-04-02 15:49:33 UTC (rev 6603)
@@ -1,13 +0,0 @@
-Index: xfce4-session-4.8.2/xfce4-tips/main.c
-===================================================================
---- xfce4-session-4.8.2.orig/xfce4-tips/main.c 2011-09-13 18:17:10.000000000 +0200
-+++ xfce4-session-4.8.2/xfce4-tips/main.c 2011-09-13 23:21:51.882831214 +0200
-@@ -274,7 +274,7 @@
- channel = xfconf_channel_get ("xfce4-tips");
-
- /* test for fortune */
-- fortune_cmd = g_find_program_in_path ("fortune");
-+ fortune_cmd = g_find_program_in_path ("/usr/games/fortune");
-
- read_tips_from_file ();
-
Deleted: desktop/branches/experimental/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch 2012-04-02 15:49:33 UTC (rev 6603)
@@ -1,72 +0,0 @@
-From d7311f2dcedd96f5833acceb27f9d17275893e1e Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel at lefolgoc.net>
-Date: Thu, 25 Aug 2011 14:22:24 +0200
-Subject: Do not always save session with xfce4-logout-plugin (Bug #7915)
-
-Respect the value of the "/general/SaveOnExit" option from xfce4-session in the
-logout panel plugin as well.
----
- panel-plugin/Makefile.am | 2 ++
- panel-plugin/xfsm-logout-plugin.c | 14 +++++++++++++-
- 2 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 0675e2e..fd0609b 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -18,6 +18,7 @@ libxfsm_logout_plugin_la_SOURCES = \
- libxfsm_logout_plugin_la_CFLAGS = \
- $(LIBX11_CFLAGS) \
- $(LIBXFCE4PANEL_CFLAGS) \
-+ $(XFCONF_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(LIBXFCE4UI_CFLAGS) \
- $(GTK_CFLAGS) \
-@@ -26,6 +27,7 @@ libxfsm_logout_plugin_la_CFLAGS = \
- libxfsm_logout_plugin_la_LIBADD = \
- $(LIBX11_LIBS) \
- $(LIBXFCE4PANEL_LIBS) \
-+ $(XFCONF_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(LIBXFCE4UI_LIBS) \
- $(GTK_LIBS) \
-diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
-index b8e25ab..12dec0f 100644
---- a/panel-plugin/xfsm-logout-plugin.c
-+++ b/panel-plugin/xfsm-logout-plugin.c
-@@ -43,6 +43,7 @@
-
- #include <libxfce4util/libxfce4util.h>
- #include <libxfce4ui/libxfce4ui.h>
-+#include <xfconf/xfconf.h>
- #include <libxfce4panel/libxfce4panel.h>
-
- #include "xfsm-logout-plugin-ui.h"
-@@ -207,12 +208,23 @@ static void
- xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
- XfsmShutdownType type)
- {
-+ GError *error = NULL;
-+ XfconfChannel *channel;
- gint resp = GTK_RESPONSE_ACCEPT;
-
- g_return_if_fail(logout_plugin != NULL);
- g_return_if_fail(type >= XFSM_SHUTDOWN_LOGOUT && type <= XFSM_SHUTDOWN_HIBERNATE);
-
-- logout_plugin->allow_save = TRUE;
-+ if (G_UNLIKELY (!xfconf_init (&error))) {
-+ g_warning ("Unable to contact settings server: %s", error->message);
-+ g_error_free (error);
-+ logout_plugin->allow_save = TRUE;
-+ }
-+ else {
-+ channel = xfconf_channel_get ("xfce4-session");
-+ logout_plugin->allow_save = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE);
-+ xfconf_shutdown ();
-+ }
-
- if(type != XFSM_SHUTDOWN_SUSPEND && type != XFSM_SHUTDOWN_HIBERNATE) {
- GtkWidget *dialog, *topvbox, *hbox, *image, *label;
---
-1.7.2.5
-
Deleted: desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch 2012-04-02 15:49:33 UTC (rev 6603)
@@ -1,42 +0,0 @@
-commit eeaea26d3b777afb98c21317ad83170e3f725fd0
-Author: Brian J. Tarricone <brian at tarricone.org>
-Date: Mon Sep 26 01:18:48 2011 -0700
-
- explicitly link to libm where needed (bug #7953)
-
- we use rint() but aren't linking to libm; probably getting picked up
- implicitly by a dependency like libpng, which recently dropped that flag
- from its .pc file.
-
- Patch slightly updated for Debian to apply cleanly: changes to configure.in.in
- are made to configure.in instead.
-
-diff --git a/configure.in b/configure.in
-index 141d427..8eff947 100644
---- a/configure.in
-+++ b/configure.in
-@@ -63,6 +63,10 @@ AC_CHECK_HEADERS([asm/unistd.h errno.h fcntl.h limits.h \
- AC_CHECK_FUNCS([getaddrinfo gethostbyname gethostname getpwuid setsid \
- sigaction strdup sync vfork])
-
-+dnl Check for required libraries
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- dnl Check for X11 installed
- XDT_CHECK_LIBX11_REQUIRE()
-
-diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
-index 96ae5c5..d049a35 100644
---- a/engines/balou/Makefile.am
-+++ b/engines/balou/Makefile.am
-@@ -31,7 +31,8 @@ libbalou_la_LDFLAGS = \
- libbalou_la_LIBADD = \
- $(top_builddir)/libxfsm/libxfsm-4.6.la \
- $(LIBXFCE4UI_LIBS) \
-- $(XFCONF_LIBS)
-+ $(XFCONF_LIBS) \
-+ $(LIBM)
-
-
- libbalou_la_DEPENDENCIES = \
Deleted: desktop/branches/experimental/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch 2012-04-02 15:49:33 UTC (rev 6603)
@@ -1,13 +0,0 @@
-Index: xfce4-session-4.8.2/xfce4-session/main.c
-===================================================================
---- xfce4-session-4.8.2.orig/xfce4-session/main.c 2011-09-13 23:21:54.690846909 +0200
-+++ xfce4-session-4.8.2/xfce4-session/main.c 2011-09-13 23:21:58.626868935 +0200
-@@ -144,7 +144,7 @@
- sm_init (channel, disable_tcp, manager);
-
- /* start xfsettingsd */
-- if ( !g_spawn_command_line_async ("xfsettingsd", NULL))
-+ if ( !g_spawn_command_line_async ("xfsettingsd --replace", NULL))
- {
- g_warning ("Could not start xfsettingsd");
- }
Deleted: desktop/branches/experimental/xfce4-session/debian/patches/06_no-settings-helper-in-490.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/06_no-settings-helper-in-490.patch 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/patches/06_no-settings-helper-in-490.patch 2012-04-02 15:49:33 UTC (rev 6603)
@@ -1,22 +0,0 @@
---- xfce4-session-4.8.1/settings/xfce4-session.xml 2010-09-08 18:37:19.000000000 +0200
-+++ xfce4-session-4.8.1/settings/xfce4-session.xml.new 2011-08-18 13:57:27.000000000 +0200
-@@ -7,7 +7,7 @@
- <property name="sessions" type="empty">
- <property name="Failsafe" type="empty">
- <property name="IsFailsafe" type="bool" value="true"/>
-- <property name="Count" type="int" value="5"/>
-+ <property name="Count" type="int" value="4"/>
- <property name="Client0_Command" type="array">
- <value type="string" value="xfwm4"/>
- </property>
-@@ -25,10 +25,6 @@
- <value type="string" value="xfdesktop"/>
- </property>
- <property name="Client3_PerScreen" type="bool" value="false"/>
-- <property name="Client4_Command" type="array">
-- <value type="string" value="xfce4-settings-helper"/>
-- </property>
-- <property name="Client4_PerScreen" type="bool" value="false"/>
- </property>
- </property>
- <property name="splash" type="empty">
Deleted: desktop/branches/experimental/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/series 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/patches/series 2012-04-02 15:49:33 UTC (rev 6603)
@@ -1,5 +0,0 @@
-02_fix-fortune-path.patch
-03_respect-save-settings-logout-plugin.patch
-04_fix-missing-lm.patch
-05_force-xfsettingsd-start.patch
-06_no-settings-helper-in-490.patch
Modified: desktop/branches/experimental/xfce4-session/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/rules 2012-04-02 12:57:39 UTC (rev 6602)
+++ desktop/branches/experimental/xfce4-session/debian/rules 2012-04-02 15:49:33 UTC (rev 6603)
@@ -17,14 +17,6 @@
rm -f debian/tmp/usr/lib/*/*.la
rm -f debian/tmp/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.*a
- chrpath -d -k debian/tmp/usr/bin/* \
- debian/tmp/usr/lib/*/xfce4/session/xfsm-shutdown-helper \
- debian/tmp/usr/lib/*/xfce4/session/splash-engines/*so \
- debian/tmp/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so
-
- cat debian/debian-tips >> debian/tmp/usr/share/xfce4/tips/tips
- strfile debian/tmp/usr/share/xfce4/tips/tips \
- debian/tmp/usr/share/xfce4/tips/tips.dat
rm -f debian/tmp/etc/xdg/autostart/xfce4-tips-autostart.desktop
dh_install --fail-missing
More information about the Pkg-xfce-commits
mailing list