[Pkg-xfce-commits] r609 - in desktop/trunk/xfce4: . debian

[Simon Huggins]

Author: huggie
Date: 2006-05-03 17:06:02 +0000 (Wed, 03 May 2006)
New Revision: 609

Added:
   desktop/trunk/xfce4/debian/NEWS
Removed:
   desktop/trunk/xfce4/xfce4_setup
   desktop/trunk/xfce4/xfce4_setup.1
Modified:
   desktop/trunk/xfce4/debian/changelog
   desktop/trunk/xfce4/debian/rules
Log:
Remove old xfce4_setup.
Add a NEWS file for the upgrade.


Added: desktop/trunk/xfce4/debian/NEWS
===================================================================
--- desktop/trunk/xfce4/debian/NEWS	2006-05-03 16:52:22 UTC (rev 608)
+++ desktop/trunk/xfce4/debian/NEWS	2006-05-03 17:06:02 UTC (rev 609)
@@ -0,0 +1,14 @@
+xfce4 (4.3.90.1-1) UNRELEASED; urgency=low
+
+  This is the 4.4beta1 release of xfce.  If you are running xfce at the time
+  you do this upgrade please consider restarting very shortly afterwards.
+
+  This is a major upgrade and as such you will lose some of your config - there
+  is no sane way for us to avoid this.  Notably the panel config will need to
+  be changed.  Also as this is a beta please consider reporting any bugs to
+  upstream first or to both the BTS and upstream's bugzilla at
+  http://buzilla.xfce.org/
+
+  Also #xfce and #debian-xfce on irc.freenode.net can be useful resources.
+
+ -- Simon Huggins <huggie at earth.li>  Wed, 03 May 2006 17:37:50 +0100

Modified: desktop/trunk/xfce4/debian/changelog
===================================================================
--- desktop/trunk/xfce4/debian/changelog	2006-05-03 16:52:22 UTC (rev 608)
+++ desktop/trunk/xfce4/debian/changelog	2006-05-03 17:06:02 UTC (rev 609)
@@ -7,6 +7,8 @@
     * Updated standards version
   (Simon Huggins)
     * Update dependencies for the 4.4 beta 1
+    * Add a NEWS.Debian file to warn people of the upgrade.
+    * Remove the old deprecated xfce4_setup script.
 
  -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 18 Apr 2006 18:41:20 +0200
 

Modified: desktop/trunk/xfce4/debian/rules
===================================================================
--- desktop/trunk/xfce4/debian/rules	2006-05-03 16:52:22 UTC (rev 608)
+++ desktop/trunk/xfce4/debian/rules	2006-05-03 17:06:02 UTC (rev 609)
@@ -12,11 +12,6 @@
 	dh_testdir -i
 	dh_testroot -i
 
-	install -D xfce4_setup `pwd`/debian/xfce4/usr/bin/xfce4_setup
-	chmod +x `pwd`/debian/xfce4/usr/bin/xfce4_setup
-
-	install -D xfce4_setup.1 `pwd`/debian/xfce4/usr/share/man/man1/xfce4_setup.1
-
 	dh_installdocs -i
 	dh_installchangelogs -i
 	

Deleted: desktop/trunk/xfce4/xfce4_setup
===================================================================
--- desktop/trunk/xfce4/xfce4_setup	2006-05-03 16:52:22 UTC (rev 608)
+++ desktop/trunk/xfce4/xfce4_setup	2006-05-03 17:06:02 UTC (rev 609)
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-XSESSION="$HOME/.xsession"
-BAK="$XSESSION.bak.`date +%F | sed 's/-//g'`"
-
-print_copyright () {
-	echo "This script will set up Xfce4 for local use for user `whoami`"
-	echo "Version: xfce4_setup,v 0.2 2003/02/28 16:32:00 madkiss Exp $"
-	echo "Copyright (C) 2002, 2003 by Martin Loschwitz"
-	echo ""
-}
-
-save_old_xsession () {
-	if [ -f "$XSESSION" ]; then
-	  cp $XSESSION $BAK
-	  echo "Old .xsession saved to $BAK"
-	  echo ""
-	fi
-}
-
-write_new_xsession () {
-	
-	rm -rf $XSESSION
-	
-	echo "/usr/bin/xfce-mcs-manager" > $XSESSION
-	echo "/usr/bin/xfwm4 --daemon" >> $XSESSION
-	echo "/usr/bin/xftaskbar4 &" >> $XSESSION
-	echo "/usr/bin/xfdesktop &" >> $XSESSION
-	echo "exec /usr/bin/xfce4-panel" >> $XSESSION
-	echo "$XSESSION has been created and should be ready for use now."
-}
-
-print_copyright
-save_old_xsession
-write_new_xsession

Deleted: desktop/trunk/xfce4/xfce4_setup.1
===================================================================
--- desktop/trunk/xfce4/xfce4_setup.1	2006-05-03 16:52:22 UTC (rev 608)
+++ desktop/trunk/xfce4/xfce4_setup.1	2006-05-03 17:06:02 UTC (rev 609)
@@ -1,19 +0,0 @@
-.\" Copyright (C) 2002 by Martin Loschwitz
-.TH XFCE4_SETUP "1" "November 2002" "xfce4_setup 0.1" "User Commands"
-.SH NAME
-xfce4_setup \- creates local .xsession file for the user who calls the script
-.SH SYNOPSIS
-.B xfce4_setup
-.SH DESCRIPTION
-.PP
-Creates local .xsession file for the user who calls the script. This file 
-will make the user able to use Xfce4 by just typing "startx".
-.SH AUTHOR
-Written by Martin Loschwitz
-.SH "REPORTING BUGS"
-Report bugs to <madkiss at madkiss.org>.
-.SH COPYRIGHT
-Copyright \(co 2002 Martin Loschwitz
-.br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.