[Pkg-xfce-commits] r2593 - in desktop/branches/svn-snapshots/xfce4-session/debian: . patches

Wed Jan 14 09:04:13 UTC 2009

Author: corsac
Date: 2009-01-14 09:04:13 +0000 (Wed, 14 Jan 2009)
New Revision: 2593

Removed:
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_xfce4-session-logout-manpage-typo.patch
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_fix-suspend-errors-at-resume.patch
Modified:
   desktop/branches/svn-snapshots/xfce4-session/debian/changelog
   desktop/branches/svn-snapshots/xfce4-session/debian/control
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
Log:
  - xfce4-session now has a way to edit autostarted apps.     closes: #507948
* new upstream beta release.
* debian/control:
  - update build-deps for “Tuco-Tuco”.
* debian/patches:
  - 02_xfce4-session-logout-manpage-typo dropped.
  - 03_fix-suspend-errors-at-resume as well.

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/changelog
===================================================================

--- desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2009-01-14 09:04:00 UTC (rev 2592)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2009-01-14 09:04:13 UTC (rev 2593)
@@ -1,7 +1,8 @@
-xfce4-session (4.5.92-1) UNRELEASED; urgency=low
+xfce4-session (4.5.93-1) UNRELEASED; urgency=low
 
   [ Xfce 4.6 Alpha “Pinkie”]
   * new upstream alpha release.
+    - xfce4-session now has a way to edit autostarted apps.     closes: #507948
   * debian/control:
     - update build deps for Xfce 4.6 alpha.
     - update standards version to 3.8.0.
@@ -13,6 +14,7 @@
   * debian/patches:
     - 06_rephrase-tips removed.
     - 07_parallel-startup added, taken from upstream r28005.
+
   [ Xfce 4.6 Beta 1 “Fuzzy”]
   * new upstream beta release
   * debian/control:
@@ -31,6 +33,7 @@
   * debian/lintian:
     - renamed to debian/xfce4-session.lintian-overrides.
     - updated to match Fuzzy.
+
   [ Xfce 4.6 Beta 2 “Hopper”]
   * new upstream beta release
   * debian/control:
@@ -43,8 +46,16 @@
   * debian/xfce4-session.lintian-overrides:
     - update link for beta2.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 28 Nov 2008 07:50:13 +0100
+  [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+  * new upstream beta release.
+  * debian/control:
+    - update build-deps for “Tuco-Tuco”.
+  * debian/patches:
+    - 02_xfce4-session-logout-manpage-typo dropped.
+    - 03_fix-suspend-errors-at-resume as well.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 13 Jan 2009 00:04:20 +0100
+
 xfce4-session (4.4.2-6) unstable; urgency=low
 
   * debian/{postinst,prerm}: have them back, they manage the x-session-manager

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/control	2009-01-14 09:04:00 UTC (rev 2592)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/control	2009-01-14 09:04:13 UTC (rev 2593)
@@ -5,8 +5,9 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 6.0.7), libx11-dev, libxml-parser-perl, chrpath,
  quilt, fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, 
- libxfce4util-dev (>= 4.5.92), libxfcegui4-dev (>= 4.5.92), libwnck-dev, 
- x11-xserver-utils, libxfconf-0-dev (>= 4.5.92), libglade2-dev
+ libxfce4util-dev (>= 4.5.93), libxfcegui4-dev (>= 4.5.93), libwnck-dev, 
+ x11-xserver-utils, libxfconf-0-dev (>= 4.5.93), libglade2-dev, 
+ intltool (>= 0.31)
 Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/

Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_xfce4-session-logout-manpage-typo.patch
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_xfce4-session-logout-manpage-typo.patch	2009-01-14 09:04:00 UTC (rev 2592)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_xfce4-session-logout-manpage-typo.patch	2009-01-14 09:04:13 UTC (rev 2593)
@@ -1,16 +0,0 @@
---- a/xfce4-session-logout/xfce4-session-logout.1.orig	2006-05-30 15:02:15.000000000 -0400
-+++ b/xfce4-session-logout/xfce4-session-logout.1	2006-08-04 00:09:45.000000000 -0400
-@@ -5,11 +5,7 @@
- .B xfce4-session-logout
- .br
- .SH DESCRIPTION
--This manual page documents briefly the
--.B xfce4-session-logout
--command.
--.PP
--The \fBxfce4-session-logout\fP command allows you to programmatically
-+The \fBxfce4-session-logout\fP command allows you to
- logout from your Xfce session. It requests the session manager to display
- the logout confirmation screen.
- 
-

Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_fix-suspend-errors-at-resume.patch
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_fix-suspend-errors-at-resume.patch	2009-01-14 09:04:00 UTC (rev 2592)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_fix-suspend-errors-at-resume.patch	2009-01-14 09:04:13 UTC (rev 2593)
@@ -1,22 +0,0 @@
-commit 22cbdfe0b421fba849fa6bb9661e585fda0f5c58
-Author: kelnos <kelnos at a0aa69c2-05f4-0310-b83c-d5d913b14636>
-Date:   Fri Nov 28 06:14:37 2008 +0000
-
-    	* xfce4-session/xfsm-manager.c: On suspend/hibernate, ignore errors
-    	  of type DBUS_GERROR_NO_REPLY, not type _TIMEOUT (bug 4628).
-    
-    git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-session/trunk@28938 a0aa69c2-05f4-0310-b83c-d5d913b14636
-
-diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
-index e2f05d9..7bc81f2 100644
---- a/xfce4-session/xfsm-manager.c
-+++ b/xfce4-session/xfsm-manager.c
-@@ -1104,7 +1104,7 @@ xfsm_manager_save_yourself_global (XfsmManager     *manager,
-                                                     manager->shutdown_type,
-                                                     &error)
-                   && (error->domain != DBUS_GERROR
--                      || error->code != DBUS_GERROR_TIMED_OUT)))
-+                      || error->code != DBUS_GERROR_NO_REPLY)))
-             {
-               xfce_message_dialog (NULL, _("Shutdown Failed"),
-                                    GTK_STOCK_DIALOG_ERROR,

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2009-01-14 09:04:00 UTC (rev 2592)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2009-01-14 09:04:13 UTC (rev 2593)
@@ -1,3 +1 @@
 01_correct_shadows.patch
-02_xfce4-session-logout-manpage-typo.patch
-03_fix-suspend-errors-at-resume.patch


