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

corsac at alioth.debian.org corsac at alioth.debian.org
Sat Aug 23 22:42:16 UTC 2008


Author: corsac
Date: 2008-08-23 22:42:15 +0000 (Sat, 23 Aug 2008)
New Revision: 2234

Added:
   desktop/branches/svn-snapshots/xfce4-session/
Removed:
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/05_fix-resize-simple-splash-engine.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
   desktop/branches/svn-snapshots/xfce4-session/debian/rules
Log:
new 4.6 alpha release

Copied: desktop/branches/svn-snapshots/xfce4-session (from rev 2217, desktop/trunk/xfce4-session)


Property changes on: desktop/branches/svn-snapshots/xfce4-session
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-08-23 22:42:15 UTC (rev 2234)
@@ -1,3 +1,12 @@
+xfce4-session (4.5.80-1) UNRELEASED; urgency=low
+
+  * new upstream alpha release.
+  * debian/control:
+    - update build deps for Xfce 4.6 alpha.
+    - update standards version to 3.8.0.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 23 Aug 2008 22:23:51 +0200
+
 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/trunk/xfce4-session/debian/control	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/control	2008-08-23 22:42:15 UTC (rev 2234)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.0.0), xfce4-mcs-manager-dev (>= 4.4.2), xbase-clients, libxml-parser-perl, chrpath, quilt, fortune-mod, libdbus-1-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxml-parser-perl, chrpath, quilt, fortune-mod, libdbus-1-dev, libxfce4util-dev, libxfcegui4-dev, libwnck-dev, x11-xserver-utils
+Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/
@@ -15,7 +15,6 @@
 Recommends: xbase-clients, xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal, dbus-x11
 Suggests: sudo
 Provides: x-session-manager
-Conflicts: xfce-mcs-manager (<< 4.4.2-3)
 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

Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_xfce4-session-manpage-typo.patch	2008-08-23 22:42:15 UTC (rev 2234)
@@ -1,28 +0,0 @@
---- a/xfce4-session/xfce4-session.1.orig	2005-11-27 05:53:02.000000000 -0500
-+++ b/xfce4-session/xfce4-session.1	2006-02-04 15:02:36.000000000 -0500
-@@ -10,14 +10,14 @@
- command.
- .PP
- The \fBxfce4-session\fP program starts up the Xfce Desktop Environment and
--is typicaly executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
-+is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
- your X startup scripts). It will load your last session or a default session
- that includes the standard Xfce programs if no saved session is available.
- 
- \fBxfce4-session\fP is an standard X11R6 session manager that can manage
- any X11R6 SM compliant program, including GNOME and KDE programs.
- 
--\fBxfce4-session\fP uses the contens of the ~/.cache/sessions/ directory
-+\fBxfce4-session\fP uses the contents of the ~/.cache/sessions/ directory
- for starting previously saved sessions.
- 
- 
-@@ -26,7 +26,7 @@
- .TP
- .B \-\-disable\-tcp
- Disable binding to TCP ports in the ICE layer. This is not possible on every
--plattform. If you use this option on a plattform that does not support it,
-+platform. If you use this option on a platform that does not support it,
- \fBxfce4-session\fP will print a warning message and ignore the setting.
- .TP
- .B \-\-help

Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/patches/05_fix-resize-simple-splash-engine.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/05_fix-resize-simple-splash-engine.patch	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/05_fix-resize-simple-splash-engine.patch	2008-08-23 22:42:15 UTC (rev 2234)
@@ -1,22 +0,0 @@
-Index: xfce4-session/engines/simple/simple.c
-===================================================================
---- xfce4-session/engines/simple/simple.c	(revision 26398)
-+++ xfce4-session/engines/simple/simple.c	(revision 26399)
-@@ -429,7 +429,7 @@
- 
-   entry = gtk_entry_new ();
-   gtk_table_attach (GTK_TABLE (table), entry, 0, 1, 1, 2,
--                    GTK_FILL, GTK_FILL, 0, 0);
-+                    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-   gtk_widget_show (entry);
- 
-   image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
-@@ -437,7 +437,7 @@
-   button = gtk_button_new ();
-   gtk_container_add (GTK_CONTAINER (button), image);
-   gtk_table_attach (GTK_TABLE (table), button, 1, 2, 1, 2,
--                    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-+                    GTK_FILL, GTK_FILL, 0, 0);
-   gtk_widget_show (button);
- 
-   path = xfsm_splash_rc_read_entry (config->rc, "Image", NULL);

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2008-08-23 22:42:15 UTC (rev 2234)
@@ -1,5 +1,3 @@
 01_correct_shadows.patch
 02_use-mice-as-default-engine.patch
-03_xfce4-session-manpage-typo.patch
 04_xfce4-session-logout-manpage-typo.patch
-05_fix-resize-simple-splash-engine.patch

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules	2008-08-13 21:30:11 UTC (rev 2217)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/rules	2008-08-23 22:42:15 UTC (rev 2234)
@@ -77,8 +77,6 @@
 	# Add here commands to install the package into debian/xfce4-session.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-session
 	install -p -o root -g root -m 644 debian/lintian $(CURDIR)/debian/xfce4-session/usr/share/lintian/overrides/xfce4-session
-	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/mcs-plugins/*.la
-	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/mcs-plugins/*.a
 	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/splash/engines/*.la
 	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/*.la
 
@@ -88,7 +86,6 @@
 
 	chrpath -d -k `pwd`/debian/xfce4-session/usr/bin/* \
 		`pwd`/debian/xfce4-session/usr/sbin/xfsm-shutdown-helper \
-		`pwd`/debian/xfce4-session/usr/lib/xfce4/*/*so \
 		`pwd`/debian/xfce4-session/usr/lib/xfce4/splash/engines/*so
 	
 	cat debian/debian-tips >> `pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips




More information about the Pkg-xfce-commits mailing list