[Pkg-xfce-commits] r2526 - desktop/branches/svn-snapshots/xfdesktop4/debian
corsac at alioth.debian.org
corsac at alioth.debian.org
Fri Nov 14 13:51:10 UTC 2008
Author: corsac
Date: 2008-11-14 13:51:09 +0000 (Fri, 14 Nov 2008)
New Revision: 2526
Removed:
desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postrm
Modified:
desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
desktop/branches/svn-snapshots/xfdesktop4/debian/control
desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install
desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.install
desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postinst
Log:
- add conflict for previous xfdesktop4(-data) packages.
* new upstream beta release.
* debian/control:
- update build-deps for Hopper.
- use Replaces: to handle .desktop files move from -data to xfdesktop4.
* debian/xfdesktop4.postrm dropped, now useless.
* debian/xfdesktop4.postinst:
- use set -e to catch errors.
- use dpkg-query instead of /var/lib/dpkg/status in rm_conffile.
- rm_conffile of /etc/xdg/xfce4/desktop/menudefs.hook.
* debian/xfdesktop4.install, debian/xfdesktop4-data.install
- ship .desktop files along with the binaries.
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/changelog 2008-11-14 13:51:02 UTC (rev 2525)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/changelog 2008-11-14 13:51:09 UTC (rev 2526)
@@ -1,4 +1,4 @@
-xfdesktop4 (4.5.91-1) UNRELEASED; urgency=low
+xfdesktop4 (4.5.92-1) UNRELEASED; urgency=low
[ Xfce 4.6 Alpha “Pinkie”]
* new upstream alpha release.
@@ -40,13 +40,26 @@
* debian/control:
- update build-deps for Fuzzy.
- drop build-dep on quilt.
+ - add conflict for previous xfdesktop4(-data) packages.
* debian/patches:
- 02_use_eject_where_needed dropped, merged upstream.
- 06_fix-size-warning-amd64 as well.
* debian/rules:
- remove quilt stuff.
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Hopper.
+ - use Replaces: to handle .desktop files move from -data to xfdesktop4.
+ * debian/xfdesktop4.postrm dropped, now useless.
+ * debian/xfdesktop4.postinst:
+ - use set -e to catch errors.
+ - use dpkg-query instead of /var/lib/dpkg/status in rm_conffile.
+ - rm_conffile of /etc/xdg/xfce4/desktop/menudefs.hook.
+ * debian/xfdesktop4.install, debian/xfdesktop4-data.install
+ - ship .desktop files along with the binaries.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 14 Oct 2008 23:55:14 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 14 Nov 2008 14:33:46 +0100
xfdesktop4 (4.4.2-7) unstable; urgency=low
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/control 2008-11-14 13:51:02 UTC (rev 2525)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/control 2008-11-14 13:51:09 UTC (rev 2526)
@@ -20,6 +20,7 @@
Package: xfdesktop4
Architecture: any
Depends: ${shlibs:Depends}, xfce4-utils, xfdesktop4-data (= ${source:Version}), exo-utils
+Replaces: xfdesktop4-data (< 4.5.92)
Recommends: dbus-x11, librsvg2-common, xdg-user-dirs
Suggests: menu
Description: Provides desktop background and root menu
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install 2008-11-14 13:51:02 UTC (rev 2525)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4-data.install 2008-11-14 13:51:09 UTC (rev 2526)
@@ -4,4 +4,3 @@
usr/share/pixmaps
usr/share/xfce4
usr/share/desktop-directories
-usr/share/applications
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.install
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.install 2008-11-14 13:51:02 UTC (rev 2525)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.install 2008-11-14 13:51:09 UTC (rev 2526)
@@ -1,3 +1,4 @@
etc
usr/bin
usr/lib
+usr/share/applications
Modified: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postinst
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postinst 2008-11-14 13:51:02 UTC (rev 2525)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postinst 2008-11-14 13:51:09 UTC (rev 2526)
@@ -1,12 +1,15 @@
#!/bin/sh
+set -e
+
# 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`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
+
if [ "$md5sum" != "$old_md5sum" ]; then
echo "Obsolete conffile $CONFFILE has been modified by you."
echo "Saving as $CONFFILE.dpkg-bak ..."
@@ -22,6 +25,7 @@
install|upgrade)
if dpkg --compare-versions "$2" le "4.4.2"; then
rm_conffile "/etc/menu-methods/xfdesktop4"
+ rm_conffile "/etc/xdg/xfce4/desktop/menudefs.hook"
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"
Deleted: desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postrm
===================================================================
--- desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postrm 2008-11-14 13:51:02 UTC (rev 2525)
+++ desktop/branches/svn-snapshots/xfdesktop4/debian/xfdesktop4.postrm 2008-11-14 13:51:09 UTC (rev 2526)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "purge" ]; then
- rm -rf /etc/xdg/xfce4/desktop/menudefs.hook
- rm -rf /etc/xdg/xfce4/desktop/notforuse.xml
-fi
-
-#DEBHELPER#
More information about the Pkg-xfce-commits
mailing list