[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#697764: unblock: glib2.0/2.33.12+really2.32.4-5



retitle 697764 unblock: glib2.0/2.33.12+really2.32.4-5
thanks

On 09.01.2013 14:51, Michael Biebl wrote:

> unblock glib2.0/2.33.12+really2.32.4-4

A stupid typo slipped into -4, so I had to do a brown paper bag release.

Full debdiff is attached.


Michael

-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -Nru glib2.0-2.33.12+really2.32.4/debian/changelog glib2.0-2.33.12+really2.32.4/debian/changelog
--- glib2.0-2.33.12+really2.32.4/debian/changelog	2012-10-24 11:51:16.000000000 +0200
+++ glib2.0-2.33.12+really2.32.4/debian/changelog	2013-01-09 16:14:52.000000000 +0100
@@ -1,3 +1,22 @@
+glib2.0 (2.33.12+really2.32.4-5) unstable; urgency=low
+
+  * Fix the closing fi in the if statement in postrm.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 09 Jan 2013 16:14:49 +0100
+
+glib2.0 (2.33.12+really2.32.4-4) unstable; urgency=low
+
+  * Take into account multiarch when removing the cache files in postrm:
+    Remove /usr/lib/gio/modules/giomodule.cache only for the native
+    architecture for which this cache file was created.
+    After removing /usr/share/glib-2.0/schemas/gschemas.compiled on purge,
+    run dpkg-trigger explicitly, so in case libglib2.0-0 is installed for
+    other architectures, the cache file is re-created. (Closes: #696389)
+  * Drop the various Breaks from libglib2.0-0. Those are causing APT to fail
+    on a dist-upgrade from squeeze to wheezy. (Closes: #676485)
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 08 Jan 2013 23:30:04 +0100
+
 glib2.0 (2.33.12+really2.32.4-3) unstable; urgency=low
 
   * Team upload
diff -Nru glib2.0-2.33.12+really2.32.4/debian/control glib2.0-2.33.12+really2.32.4/debian/control
--- glib2.0-2.33.12+really2.32.4/debian/control	2012-10-24 12:33:11.000000000 +0200
+++ glib2.0-2.33.12+really2.32.4/debian/control	2013-01-09 16:16:18.000000000 +0100
@@ -38,14 +38,7 @@
          ${shlibs:Depends}
 Recommends: libglib2.0-data,
             shared-mime-info
-Breaks: gvfs (<< 1.8),
-        gnome-control-center (<< 1:3),
-        gnome-session (<< 3.0.0-3),
-        gdm3 (<< 3.0.3),
-        libgtk-3-0 (<< 3.0.12),
-        emacs23 (<< 23.4+1-3),
-        eog (<< 3.2.2-3),
-        gwaei (<< 3.2.0b1-2)
+Breaks: gvfs (<< 1.8)
 Replaces: libglib2.0-dev (<< 2.23.2-2)
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
diff -Nru glib2.0-2.33.12+really2.32.4/debian/control.in glib2.0-2.33.12+really2.32.4/debian/control.in
--- glib2.0-2.33.12+really2.32.4/debian/control.in	2012-09-23 09:31:12.000000000 +0200
+++ glib2.0-2.33.12+really2.32.4/debian/control.in	2013-01-08 08:00:23.000000000 +0100
@@ -38,14 +38,7 @@
          ${shlibs:Depends}
 Recommends: @DATA_PKG@,
             shared-mime-info
-Breaks: gvfs (<< 1.8),
-        gnome-control-center (<< 1:3),
-        gnome-session (<< 3.0.0-3),
-        gdm3 (<< 3.0.3),
-        libgtk-3-0 (<< 3.0.12),
-        emacs23 (<< 23.4+1-3),
-        eog (<< 3.2.2-3),
-        gwaei (<< 3.2.0b1-2)
+Breaks: gvfs (<< 1.8)
 Replaces: @DEV_PKG@ (<< 2.23.2-2)
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
diff -Nru glib2.0-2.33.12+really2.32.4/debian/libglib2.0-0.postrm.in glib2.0-2.33.12+really2.32.4/debian/libglib2.0-0.postrm.in
--- glib2.0-2.33.12+really2.32.4/debian/libglib2.0-0.postrm.in	2012-03-30 15:37:03.000000000 +0200
+++ glib2.0-2.33.12+really2.32.4/debian/libglib2.0-0.postrm.in	2013-01-09 16:07:40.000000000 +0100
@@ -10,12 +10,22 @@
 fi
 if [ -d /usr/lib/gio/modules ]; then
     # Purge the cache
-    rm -f /usr/lib/gio/modules/giomodule.cache
-    rmdir -p --ignore-fail-on-non-empty /usr/lib/gio/modules
+    if [ $(dpkg --print-architecture) = #ARCH# ]; then
+        rm -f /usr/lib/gio/modules/giomodule.cache
+        rmdir -p --ignore-fail-on-non-empty /usr/lib/gio/modules
+    fi
 fi
 
 if [ "$1" = purge ] && [ -d /usr/share/glib-2.0/schemas ]; then
     # Purge the compiled schemas
     rm -f /usr/share/glib-2.0/schemas/gschemas.compiled
     rmdir -p --ignore-fail-on-non-empty /usr/share/glib-2.0/schemas
+
+    # With multiarch enabled we can't be certain that the cache file
+    # isn't needed for other architectures since it is not reference
+    # counted. The best we can do is to fire a file trigger which will
+    # regenerate the cache file if required.
+    if [ -d /usr/share/glib-2.0/schemas ]; then
+        dpkg-trigger /usr/share/glib-2.0/schemas
+    fi
 fi

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: