[Pkg-xfce-commits] r2359 - desktop/branches/svn-snapshots/xfdesktop4/debian
corsac at alioth.debian.org
corsac at alioth.debian.org
Wed Oct 8 20:23:33 UTC 2008
Author: corsac
Date: 2008-10-08 20:23:32 +0000 (Wed, 08 Oct 2008)
New Revision: 2359
Removed:
desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.menu-method
Modified:
desktop/branches/svn-snapshots/xfdesktop4/debian/README.Debian
desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postinst
Log:
* debian/xfdesktop4.menu-method dropped, xfdesktop now supports XDG menus,
so we can use debian-menu.menu directly if present.
* debian/README.Debian:
- remove deprecated comments about user changes to menu files
- add a note about new menu systems and conffiles handling.
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/README.Debian
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/README.Debian 2008-10-08 06:36:33 UTC (rev 2358)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/README.Debian 2008-10-08 20:23:32 UTC (rev 2359)
@@ -1,3 +1,17 @@
+Menu
+====
+
+Xfdesktop now supports XDG (freedesktop) compliant menus.
+/etc/xdg/xfce4/desktop/*xml* conffiles are now useless and will be removed if
+they have not been modified. If they have been, you should take care of
+merging back the changes using freedesktop compliant menus.
+
+Xfdesktop4 doesn't yet support the <MergeFile> element so Debian menu can't be
+included directly. When the support will be there, user wanting a Debian menu
+inside the Xfce menu should install menu and menu-xdg packages.
+
+-- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Oct 2008 16:36:24 +0200
+
Trash applet panel plugin
=========================
@@ -6,15 +20,3 @@
about this.
-- Yves-Alexis Perez <corsac at corsac.net> Sun, 10 Dec 2006 15:04:18 +0100
-
-User changes
-============
-
-The menus in /etc/X11/xfce4/menu.xml* are all conffiles so you are allowed
-to modify them. However, this is discouraged and you are encouraged to check
-out the Debian Menu System to add things to that either as a local user or
-system wide.
-
-See http://www.debian.org/doc/packaging-manuals/menu.html/
-
--- Simon Huggins <huggie at earth.li> Sun, 25 Apr 2004 19:49:49 +0100
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/changelog 2008-10-08 06:36:33 UTC (rev 2358)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/changelog 2008-10-08 20:23:32 UTC (rev 2359)
@@ -27,8 +27,13 @@
- add /usr/share/applications files.
* debian/xfce4-menueditor.1 dropped, xfce4-menueditor is not part of
xfdesktop4 anymore.
+ * debian/xfdesktop4.menu-method dropped, xfdesktop now supports XDG menus,
+ so we can use debian-menu.menu directly if present.
+ * debian/README.Debian:
+ - remove deprecated comments about user changes to menu files
+ - add a note about new menu systems and conffiles handling.
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Oct 2008 15:33:18 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Oct 2008 16:36:40 +0200
xfdesktop4 (4.4.2-7) unstable; urgency=low
Deleted: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.menu-method
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.menu-method 2008-10-08 06:36:33 UTC (rev 2358)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.menu-method 2008-10-08 20:23:32 UTC (rev 2359)
@@ -1,39 +0,0 @@
-#!/usr/bin/install-menu
-#
-# Generates Xfce menus for all registered applications.
-#
-compat="menu-1"
-
-!include menu.h
-
-outputencoding="UTF-8"
-
-genmenu="menudefs.hook"
-rootprefix="/etc/xdg/xfce4/desktop"
-userprefix=".config/xfce4/desktop/"
-preoutput="<!-- Automatically generated file. Do not edit (see /usr/share/doc/menu/html/index.html) -->\n<xfdesktop-menu>"
-postoutput="</xfdesktop-menu>"
-treewalk="M)"
-postrun="if [ \"/etc/xdg/xfce4/desktop/menu.xml\" != \"" prefix() \
- "/menu.xml\" ]; then cp /etc/xdg/xfce4/desktop/menu.xml " prefix() \
- "/menu.xml; fi"
-
-function charreplace($str,$toreplace,$with,$lastchar)=replacewith(escwith($str,$toreplace,$with),$toreplace,$lastchar)
-
-function xmlesc($str)= replace(replace(replace(replace($str, \
- "&","&"), \
- "\"","""), \
- "<","<"), \
- ">",">")
-
-function xmltitle()= replace(xmlesc(title()), "/", "-")
-
-supported
- x11= nstring(level(), " ") "<app name=\"" xmltitle() "\" cmd=\"" xmlesc($command) "\" icon=\"" icon() "\"/>\n"
- text= nstring(level(), " ") "<app name=\"" xmltitle() "\" cmd=\""xmlesc($command) "\" term=\"yes\" icon=\"" icon() "\" />\n"
- xfce4= nstring(level(), " ") "<builtin name=\"" xmltitle() "\" cmd=\"" xmlesc($command) "\"/>\n"
-endsupported
-
-startmenu= ""
-submenutitle= nstring(level(), " ") "<menu name=\"" xmltitle() "\" visible=\"yes\">\n"
-endmenu= ifneq( level(), "0", nstring(level(), " ") "</menu>\n" )
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postinst
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postinst 2008-10-08 06:36:33 UTC (rev 2358)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postinst 2008-10-08 20:23:32 UTC (rev 2359)
@@ -1,14 +1,83 @@
#!/bin/sh
-if [ "$1" = "configure" ]; then
- if [ ! -f /etc/xdg/xfce4/desktop/menudefs.hook ]; then
- cat >/etc/xdg/xfce4/desktop/menudefs.hook <<EOF
-<!--
- This file is deliberately empty. Run update-menus to populate it
- with the debian menu
--->
-EOF
- fi
-fi
+# Remove a no-longer used conffile
+rm_conffile() {
+ CONFFILE="$1"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" le "4.4.2"; then
+ rm_conffile "/etc/menu-methods/xfdesktop4"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.be"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ca"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.cs"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.da"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.de"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.el"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.es"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.et"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.eu"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.fi"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.fr"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.he"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.hu"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.it"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ja"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ko"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.nb_NO"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.nl"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.pa"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.pl"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.pt_BR"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ro"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.ru"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.sk"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.sv"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.tr"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.uk"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.vi"
+ rm_conffile "/etc/xdg/xfce4/desktop/menu.xml.zh_TW"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ca"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.cs"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.de"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.el"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.es"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.eu"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fi"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fr"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.he"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.hu"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.it"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ja"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nb_NO"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pl"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ro"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ru"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.sk"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.sv"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.tr"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_CN"
+ rm_conffile "/etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW"
+ fi
+esac
+
+
#DEBHELPER#
More information about the Pkg-xfce-commits
mailing list