r40857 - in /desktop/unstable/gconf/debian: changelog gconf2.links gconf2.postinst gconf2.preinst gconf2.prerm

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Mar  9 21:19:13 2014
New Revision: 40857

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40857
Log:
Closes: #711597, #711339.
* Remove gconftool alternative, replace it by proper symlinks.
Closes: #718277.

Added:
    desktop/unstable/gconf/debian/gconf2.links
    desktop/unstable/gconf/debian/gconf2.preinst
Removed:
    desktop/unstable/gconf/debian/gconf2.prerm
Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/gconf2.postinst

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=40857&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog	[utf-8] Sun Mar  9 21:19:13 2014
@@ -1,9 +1,12 @@
-gconf (3.2.6-2) UNRELEASED; urgency=low
+gconf (3.2.6-2) unstable; urgency=low
 
   * gconf-schemas: hide error messages caused by DBus, they are 
     harmless.
-
- -- Josselin Mouette <joss at debian.org>  Wed, 06 Nov 2013 23:02:26 +0100
+    Closes: #711597, #711339.
+  * Remove gconftool alternative, replace it by proper symlinks.
+    Closes: #718277.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 09 Mar 2014 22:03:52 +0100
 
 gconf (3.2.6-1) unstable; urgency=low
 

Added: desktop/unstable/gconf/debian/gconf2.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf2.links?rev=40857&op=file
==============================================================================
--- desktop/unstable/gconf/debian/gconf2.links	(added)
+++ desktop/unstable/gconf/debian/gconf2.links	[utf-8] Sun Mar  9 21:19:13 2014
@@ -0,0 +1,2 @@
+/usr/bin/gconftool-2 /usr/bin/gconftool
+/usr/share/man/man1/gconftool-2.1.gz /usr/share/man/man1/gconftool.1.gz

Modified: desktop/unstable/gconf/debian/gconf2.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf2.postinst?rev=40857&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf2.postinst	[utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf2.postinst	[utf-8] Sun Mar  9 21:19:13 2014
@@ -26,13 +26,6 @@
     exit 0
 fi
 
-if [ "$1" = configure ] && dpkg --compare-versions "$2" lt 2.26.2-4; then
-    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
-fi
-
 #DEBHELPER#
 
 for GCONF_DIR in \

Added: desktop/unstable/gconf/debian/gconf2.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf2.preinst?rev=40857&op=file
==============================================================================
--- desktop/unstable/gconf/debian/gconf2.preinst	(added)
+++ desktop/unstable/gconf/debian/gconf2.preinst	[utf-8] Sun Mar  9 21:19:13 2014
@@ -0,0 +1,8 @@
+#! /bin/sh
+set -e
+
+if dpkg --compare-versions "$2" lt-nl 3.2.6-2; then
+  update-alternatives --remove gconftool /usr/bin/gconftool-2
+fi
+
+#DEBHELPER#