Package: gthumb
Version: 3:2.6.9-3.1
Severity: normal
Tags: patch
Hi,
Please merge the attached diffs of my NMUs with versions 3:2.6.9-3.1
and 3:2.7.5.1-1.1.
Bye,
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-2-686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
Versions of packages gthumb depends on:
ii gconf2 2.14.0-1 GNOME configuration database syste
ii libart-2.0-2 2.3.17-1 Library of functions for 2D graphi
ii libatk1.0-0 1.11.4-2 The ATK accessibility toolkit
ii libbonobo2-0 2.14.0-1 Bonobo CORBA interfaces library
ii libbonoboui2-0 2.14.0-2 The Bonobo UI library
ii libc6 2.3.6-15 GNU C Library: Shared libraries
ii libcairo2 1.0.4-2 The Cairo 2D vector graphics libra
ii libexif12 0.6.13-4 library to parse EXIF files
ii libfontconfig1 2.3.2-7 generic font configuration library
ii libgconf2-4 2.14.0-1 GNOME configuration database syste
ii libglade2-0 1:2.5.1-2 library to load .glade files at ru
ii libglib2.0-0 2.10.3-1 The GLib library of C routines
ii libgnome-keyring0 0.4.9-1 GNOME keyring services library
ii libgnome2-0 2.14.1-2 The GNOME 2 library - runtime file
ii libgnomecanvas2-0 2.14.0-2 A powerful object-oriented display
ii libgnomeprint2.2-0 2.12.1-4 The GNOME 2.2 print architecture -
ii libgnomeprintui2.2-0 2.12.1-3 GNOME 2.2 print architecture User
ii libgnomeui-0 2.14.1-1 The GNOME 2 libraries (User Interf
ii libgnomevfs2-0 2.14.2-1 GNOME virtual file-system (runtime
ii libgphoto2-2 2.1.6-13 gphoto2 digital camera library
ii libgphoto2-port0 2.1.6-13 gphoto2 digital camera port librar
ii libgtk2.0-0 2.8.18-1 The GTK+ graphical user interface
ii libice6 1:1.0.0-3 X11 Inter-Client Exchange library
ii libjpeg62 6b-13 The Independent JPEG Group's JPEG
ii liborbit2 1:2.14.0-1.1 libraries for ORBit2 - a CORBA ORB
ii libpango1.0-0 1.12.3-1 Layout and rendering of internatio
ii libpng12-0 1.2.8rel-5.1 PNG library - runtime
ii libpopt0 1.10-2 lib for parsing cmdline parameters
ii libsm6 1:1.0.0-4 X11 Session Management library
ii libtiff4 3.8.2-4 Tag Image File Format (TIFF) libra
ii libx11-6 2:1.0.0-6 X11 client-side library
ii libxcursor1 1.1.5.2-5 X cursor management library
ii libxext6 1:1.0.0-4 X11 miscellaneous extension librar
ii libxfixes3 1:3.0.1.2-4 X11 miscellaneous 'fixes' extensio
ii libxi6 1:1.0.0-5 X11 Input extension library
ii libxinerama1 1:1.0.1-4 X11 Xinerama extension library
ii libxml2 2.6.26.dfsg-1 GNOME XML library
ii libxrandr2 2:1.1.0.2-4 X11 RandR extension library
ii libxrender1 1:0.9.0.2-4 X Rendering Extension client libra
ii scrollkeeper 0.3.14-11 A free electronic cataloging syste
ii shared-mime-info 0.17-2 FreeDesktop.org shared MIME databa
ii zlib1g 1:1.2.3-11 compression library - runtime
gthumb recommends no packages.
-- no debconf information
--
Loïc Minier <[EMAIL PROTECTED]>
--- gthumb-2.6.9/debian/changelog
+++ gthumb-2.6.9/debian/changelog
@@ -1,3 +1,14 @@
+gthumb (3:2.6.9-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop the makefile-install-rule gconf snippet from the postinst completely
+ as it was never triggerred (since dh_gconf moved the schema out of /etc).
+ [debian/postinst]
+ * Add a makefile-uninstall-rule gconf snippet in postinst to remove cruft
+ left over from versions prior to this version. (Closes: #369866)
+
+ -- Loic Minier <[EMAIL PROTECTED]> Sat, 10 Jun 2006 13:12:46 +0200
+
gthumb (3:2.6.9-3) unstable; urgency=low
* Fix gthumb module dir location (closes: #360122)
--- gthumb-2.6.9/debian/postinst
+++ gthumb-2.6.9/debian/postinst
@@ -1,12 +1,13 @@
#!/bin/sh
set -e
-if [ "$1" = "configure" ]; then
- if [ -e /etc/gconf/schemas/gthumb.schemas ]; then
- HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2
--get-default-source` \
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "3:2.6.9-3.1";
then
+ HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
gconftool-2 \
- --makefile-install-rule /etc/gconf/schemas/gthumb.schemas >
/dev/null
- fi
+ --makefile-uninstall-rule
/usr/share/gconf/schemas/gthumb.schemas > /dev/null || true
+fi
+
+if [ "$1" = "configure" ]; then
ldconfig
fi
--- gthumb-2.7.5.1/debian/changelog
+++ gthumb-2.7.5.1/debian/changelog
@@ -1,3 +1,14 @@
+gthumb (3:2.7.5.1-1.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Drop the makefile-install-rule gconf snippet from the postinst completely
+ as it was never triggerred (since dh_gconf moved the schema out of /etc).
+ [debian/postinst]
+ * Add a makefile-uninstall-rule gconf snippet in postinst to remove cruft
+ left over from versions prior to this version. (Closes: #369866)
+
+ -- Loic Minier <[EMAIL PROTECTED]> Sat, 10 Jun 2006 13:32:59 +0200
+
gthumb (3:2.7.5.1-1) experimental; urgency=low
* New upstream release (unstable development release)
--- gthumb-2.7.5.1/debian/postinst
+++ gthumb-2.7.5.1/debian/postinst
@@ -1,12 +1,13 @@
#!/bin/sh
set -e
-if [ "$1" = "configure" ]; then
- if [ -e /etc/gconf/schemas/gthumb.schemas ]; then
- HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2
--get-default-source` \
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "3:2.7.5.1-1.1";
then
+ HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
gconftool-2 \
- --makefile-install-rule /etc/gconf/schemas/gthumb.schemas >
/dev/null
- fi
+ --makefile-uninstall-rule
/usr/share/gconf/schemas/gthumb.schemas > /dev/null || true
+fi
+
+if [ "$1" = "configure" ]; then
ldconfig
fi
