r17787 - in /desktop/experimental/gconf/debian: changelog gconf2.postinst
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Sat Nov 29 12:38:31 UTC 2008
Author: lool
Date: Sat Nov 29 12:38:30 2008
New Revision: 17787
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17787
Log:
Change the postinst to explicitely install the alternative on install and
upgrades from << 2.19.1-2.
Modified:
desktop/experimental/gconf/debian/changelog
desktop/experimental/gconf/debian/gconf2.postinst
Modified: desktop/experimental/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/changelog?rev=17787&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/changelog (original)
+++ desktop/experimental/gconf/debian/changelog Sat Nov 29 12:38:30 2008
@@ -1,7 +1,12 @@
gconf (2.24.0-5) UNRELEASED; urgency=low
+ [ Josselin Mouette ]
* Add a Breaks against older libbonobos because gconf using dbus makes
#331000 occur much more often.
+
+ [ Loic Minier ]
+ * Change the postinst to explicitely install the alternative on install and
+ upgrades from << 2.19.1-2.
-- Josselin Mouette <joss at debian.org> Sun, 16 Nov 2008 16:46:42 +0100
Modified: desktop/experimental/gconf/debian/gconf2.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/gconf2.postinst?rev=17787&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/gconf2.postinst (original)
+++ desktop/experimental/gconf/debian/gconf2.postinst Sat Nov 29 12:38:30 2008
@@ -1,18 +1,25 @@
#!/bin/sh
set -e
-if [ "$1" != "configure" ] || dpkg --compare-versions "$2" lt 2.19.1-2; then
+install_alternative() {
update-alternatives \
- --install /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25 \
- --slave /usr/share/man/man1/gconftool.1.gz gconftool.1.gz \
- /usr/share/man/man1/gconftool-2.1.gz
+ --install /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25 \
+ --slave /usr/share/man/man1/gconftool.1.gz gconftool.1.gz \
+ /usr/share/man/man1/gconftool-2.1.gz
+}
+
+if [ "$1" = install ]; then
+ install_alternative
+fi
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 2.19.1-2; then
+ install_alternative
fi
#DEBHELPER#
for GCONF_DIR in /var/lib/gconf/defaults \
- /etc/gconf/gconf.xml.mandatory \
- /etc/gconf/gconf.xml.defaults ; do
+ /etc/gconf/gconf.xml.mandatory \
+ /etc/gconf/gconf.xml.defaults ; do
GCONF_TREE=$GCONF_DIR/%gconf-tree.xml
if [ ! -f "$GCONF_TREE" ]; then
gconf-merge-tree "$GCONF_DIR"
More information about the pkg-gnome-commits
mailing list