[Pkg-xfce-commits] r6023 - in desktop/trunk/xfce4-session/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Sep 13 09:28:55 UTC 2011
Author: corsac
Date: 2011-09-13 21:28:55 +0000 (Tue, 13 Sep 2011)
New Revision: 6023
Removed:
desktop/trunk/xfce4-session/debian/patches/01_correct_shadows.patch
desktop/trunk/xfce4-session/debian/patches/03_dont-die-on-dbus-disconnect.patch
Modified:
desktop/trunk/xfce4-session/debian/changelog
desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch
desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch
desktop/trunk/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch
desktop/trunk/xfce4-session/debian/patches/series
Log:
* debian/patches:
- 01_correct_shadows, dropped, we don't show splash screen by default
anymore anyway.s
- 03_dont-die-on-dbus-disconnect dropped, included upstream.
- 02_fix-fortune-path, 04_fix-missing-lm and
05_force-xfsettingsd-start refreshed.
Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog 2011-09-13 21:21:43 UTC (rev 6022)
+++ desktop/trunk/xfce4-session/debian/changelog 2011-09-13 21:28:55 UTC (rev 6023)
@@ -1,6 +1,12 @@
xfce4-session (4.8.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/patches:
+ - 01_correct_shadows, dropped, we don't show splash screen by default
+ anymore anyway.s
+ - 03_dont-die-on-dbus-disconnect dropped, included upstream.
+ - 02_fix-fortune-path, 04_fix-missing-lm and
+ 05_force-xfsettingsd-start refreshed.
-- Yves-Alexis Perez <corsac at debian.org> Tue, 13 Sep 2011 23:21:31 +0200
Deleted: desktop/trunk/xfce4-session/debian/patches/01_correct_shadows.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/01_correct_shadows.patch 2011-09-13 21:21:43 UTC (rev 6022)
+++ desktop/trunk/xfce4-session/debian/patches/01_correct_shadows.patch 2011-09-13 21:28:55 UTC (rev 6023)
@@ -1,26 +0,0 @@
---- xfce4-session/engines/simple/simple.c.orig 2006-09-02 19:27:37.000000000 +0200
-+++ xfce4-session/engines/simple/simple.c 2006-10-06 15:19:59.000000000 +0200
-@@ -202,7 +202,6 @@
- simple_next (XfsmSplashEngine *engine, const gchar *text)
- {
- Simple *simple = (Simple *) engine->user_data;
-- GdkColor shcolor;
- gint tw, th, tx, ty;
-
- pango_layout_set_text (simple->layout, text, -1);
-@@ -220,15 +219,6 @@
-
- gdk_gc_set_clip_rectangle (simple->gc, &simple->textbox);
-
-- /* draw shadow */
-- shcolor.red = (simple->fgcolor.red + simple->bgcolor.red) / 2;
-- shcolor.green = (simple->fgcolor.green + simple->bgcolor.green) / 2;
-- shcolor.blue = (simple->fgcolor.blue + simple->bgcolor.blue) / 2;
-- shcolor.red = (shcolor.red + shcolor.green + shcolor.blue) / 3;
-- shcolor.green = shcolor.red;
-- shcolor.blue = shcolor.red;
--
-- gdk_gc_set_rgb_fg_color (simple->gc, &shcolor);
- gdk_draw_layout (simple->pixmap, simple->gc,
- tx + 2, ty + 2, simple->layout);
-
Modified: desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch 2011-09-13 21:21:43 UTC (rev 6022)
+++ desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch 2011-09-13 21:28:55 UTC (rev 6023)
@@ -1,8 +1,8 @@
-diff --git a/xfce4-tips/main.c b/xfce4-tips/main.c
-index 355d6bd..c22fbd7 100644
---- a/xfce4-tips/main.c
-+++ b/xfce4-tips/main.c
-@@ -274,7 +274,7 @@ main (int argc, char **argv)
+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 */
Deleted: desktop/trunk/xfce4-session/debian/patches/03_dont-die-on-dbus-disconnect.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/03_dont-die-on-dbus-disconnect.patch 2011-09-13 21:21:43 UTC (rev 6022)
+++ desktop/trunk/xfce4-session/debian/patches/03_dont-die-on-dbus-disconnect.patch 2011-09-13 21:28:55 UTC (rev 6023)
@@ -1,13 +0,0 @@
-diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
-index 0c9ba05..9b7c495 100644
---- a/xfce4-session/xfsm-manager.c
-+++ b/xfce4-session/xfsm-manager.c
-@@ -1837,6 +1837,8 @@ xfsm_manager_dbus_init (XfsmManager *manager)
- dbus_connection_add_filter (dbus_g_connection_get_connection (manager->session_bus),
- xfsm_manager_watch_dbus_disconnect,
- manager, NULL);
-+
-+ dbus_connection_set_exit_on_disconnect (manager->session_bus, FALSE);
- }
-
-
Modified: desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch 2011-09-13 21:21:43 UTC (rev 6022)
+++ desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch 2011-09-13 21:28:55 UTC (rev 6023)
@@ -1,8 +1,8 @@
-diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
-index 96ae5c5..0e75249 100644
---- a/engines/balou/Makefile.am
-+++ b/engines/balou/Makefile.am
-@@ -29,6 +29,7 @@ libbalou_la_LDFLAGS = \
+Index: xfce4-session-4.8.2/engines/balou/Makefile.am
+===================================================================
+--- xfce4-session-4.8.2.orig/engines/balou/Makefile.am 2011-09-13 18:17:10.000000000 +0200
++++ xfce4-session-4.8.2/engines/balou/Makefile.am 2011-09-13 23:21:51.910831369 +0200
+@@ -29,6 +29,7 @@
-module
libbalou_la_LIBADD = \
Modified: desktop/trunk/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch 2011-09-13 21:21:43 UTC (rev 6022)
+++ desktop/trunk/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch 2011-09-13 21:28:55 UTC (rev 6023)
@@ -1,8 +1,8 @@
-diff --git a/xfce4-session/main.c b/xfce4-session/main.c
-index ff6e324..82632eb 100644
---- a/xfce4-session/main.c
-+++ b/xfce4-session/main.c
-@@ -144,7 +144,7 @@ init_display (XfsmManager *manager,
+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 */
Modified: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series 2011-09-13 21:21:43 UTC (rev 6022)
+++ desktop/trunk/xfce4-session/debian/patches/series 2011-09-13 21:28:55 UTC (rev 6023)
@@ -1,5 +1,3 @@
-01_correct_shadows.patch
02_fix-fortune-path.patch
-03_dont-die-on-dbus-disconnect.patch
04_fix-missing-lm.patch
05_force-xfsettingsd-start.patch
More information about the Pkg-xfce-commits
mailing list