Since this didn't work e-mailing you directly...
Thanks,
Cody
---------- Forwarded message ----------
From: Cody A.W. Somerville <[EMAIL PROTECTED]>
Date: Nov 6, 2007 4:49 PM
Subject: debdiff xfce4-session_4.4.1-2ubuntu1 ->
xfce4-session_4.4.1-2ubuntu2
To: [EMAIL PROTECTED]
Attached debdiff:
debdiff xfce4-session_4.4.1-2ubuntu1 -> xfce4-session_4.4.1-2ubuntu2
--
Firefox (www.getfirefox.com) -- A browser you can trust
diff -u xfce4-session-4.4.1/debian/control xfce4-session-4.4.1/debian/control
--- xfce4-session-4.4.1/debian/control
+++ xfce4-session-4.4.1/debian/control
@@ -13,8 +13,8 @@
Depends: ${shlibs:Depends}, hal, fortune-mod
Recommends: xbase-clients, xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, procps
Replaces: xfce4-toys
-Conflicts: xfce4-toys
Provides: x-session-manager
+Conflicts: xfce4-toys
Description: Xfce4 Session Manager
xfce4-session is an X11-compliant "session manager" designed for use with
the Xfce4 Desktop Environment. On log out, the session manager saves the
diff -u xfce4-session-4.4.1/debian/postinst xfce4-session-4.4.1/debian/postinst
--- xfce4-session-4.4.1/debian/postinst
+++ xfce4-session-4.4.1/debian/postinst
@@ -6,9 +6,9 @@
--slave /usr/share/man/man1/x-session-manager.1.gz \
x-session-manager.1.gz /usr/share/man/man1/xfce4-session.1.gz
- # Get xfce-mcs-manager to reinit
+ # Get xfce-mcs-manager to reinit
kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
-
+
fi
#DEBHELPER#
diff -u xfce4-session-4.4.1/debian/changelog xfce4-session-4.4.1/debian/changelog
--- xfce4-session-4.4.1/debian/changelog
+++ xfce4-session-4.4.1/debian/changelog
@@ -1,3 +1,12 @@
+xfce4-session (4.4.1-2ubuntu2) hardy; urgency=low
+
+ * debian/watch: Added from 4.4.1-2
+ * debian/patches/01_correct_shadows.patch: Re-added
+ * debian/postinst: Removed debian delta
+ * debian/control: Reduced debian delta
+
+ -- Cody A.W. Somerville <[EMAIL PROTECTED]> Tue, 06 Nov 2007 15:38:06 -0400
+
xfce4-session (4.4.1-2ubuntu1) hardy; urgency=low
* Merge from debian unstable, remaining changes:
only in patch2:
unchanged:
--- xfce4-session-4.4.1.orig/debian/patches/01_correct_shadows.patch
+++ xfce4-session-4.4.1/debian/patches/01_correct_shadows.patch
@@ -0,0 +1,26 @@
+--- 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);
+
only in patch2:
unchanged:
--- xfce4-session-4.4.1.orig/debian/watch
+++ xfce4-session-4.4.1/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.xfce.org/archive/xfce-(.*)/src/ \
+ xfce4-session-(.*)\.tar\.bz2
--
xubuntu-devel mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/xubuntu-devel
