r24649 - /desktop/experimental/glib2.0/debian/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Jul 2 18:57:53 UTC 2010 

Author: joss
Date: Fri Jul  2 18:57:49 2010
New Revision: 24649

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24649
Log:
* Patch from Ubuntu, thanks Sébastien Bacher. Closes: #587661.
  * debian/libglib2.0-bin.install:
    - Install glib-compile-schemas
  * debian/libglib2.0-bin.postinst:
    - Run glib-compile-schemas when schemas modified
  * debian/libglib2.0-bin.triggers:
    - Watch for schema changes
  * debian/libglib2.0-dev.install:
    - glib-compile-schemas moved to libglib2.0-bin
  * debian/libglib2.0-dev.install:
  - install the new gdb python macros since the gdb version is recent 
    enough now to use those
* Put gio-querymodules and glib-compile-schemas in a private, 
  versioned directory in libglib2.0-0 to avoid a dependency loop.
* Move back the triggers to libglib2.0-0.
* Add a purge of the necessary files in the postinst.
* Stop recommending libglib2.0-bin since the necessary stuff is in 
  libglib2.0-0 now.
* Add symlinks to keep the binaries at their place in libglib2.0-bin.

Added:
    desktop/experimental/glib2.0/debian/libglib2.0-0.postinst
      - copied, changed from r24636, desktop/experimental/glib2.0/debian/libglib2.0-bin.postinst
    desktop/experimental/glib2.0/debian/libglib2.0-0.postrm
      - copied, changed from r24646, desktop/unstable/glib2.0/debian/libglib2.0-0.postrm
    desktop/experimental/glib2.0/debian/libglib2.0-0.triggers
      - copied, changed from r24636, desktop/experimental/glib2.0/debian/libglib2.0-bin.triggers
    desktop/experimental/glib2.0/debian/libglib2.0-bin.links
Removed:
    desktop/experimental/glib2.0/debian/libglib2.0-bin.postinst
    desktop/experimental/glib2.0/debian/libglib2.0-bin.triggers
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/control.in
    desktop/experimental/glib2.0/debian/libglib2.0-0.install
    desktop/experimental/glib2.0/debian/libglib2.0-bin.install
    desktop/experimental/glib2.0/debian/libglib2.0-dev.install

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=24649&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Jul  2 18:57:49 2010
@@ -2,6 +2,25 @@
 
   * Drop type-handling usage. Closes: #587863.
   * Bump standards version accordingly.
+  * Patch from Ubuntu, thanks Sébastien Bacher. Closes: #587661.
+    * debian/libglib2.0-bin.install:
+      - Install glib-compile-schemas
+    * debian/libglib2.0-bin.postinst:
+      - Run glib-compile-schemas when schemas modified
+    * debian/libglib2.0-bin.triggers:
+      - Watch for schema changes
+    * debian/libglib2.0-dev.install:
+      - glib-compile-schemas moved to libglib2.0-bin
+    * debian/libglib2.0-dev.install:
+    - install the new gdb python macros since the gdb version is recent 
+      enough now to use those
+  * Put gio-querymodules and glib-compile-schemas in a private, 
+    versioned directory in libglib2.0-0 to avoid a dependency loop.
+  * Move back the triggers to libglib2.0-0.
+  * Add a purge of the necessary files in the postinst.
+  * Stop recommending libglib2.0-bin since the necessary stuff is in 
+    libglib2.0-0 now.
+  * Add symlinks to keep the binaries at their place in libglib2.0-bin.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 02 Jul 2010 18:51:29 +0200
 

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=24649&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Fri Jul  2 18:57:49 2010
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>> 5.0.22),
                pkg-config (>= 0.14.0),
                gettext,
@@ -28,7 +28,6 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libglib2.0-data,
-            libglib2.0-bin,
             shared-mime-info
 Conflicts: libpango1.0-0 (<< 1.11)
 Replaces: libglib2.0-dev (<< 2.23.2-2)
@@ -63,7 +62,8 @@
          ${misc:Depends},
          libglib2.0-0 (>= ${source:Version}),
          libglib2.0-data
-Replaces: libglib2.0-0 (<< 2.25.2)
+Replaces: libglib2.0-0 (<< 2.25.2),
+          libglib2.0-dev (<< 2.25.10-2)
 Description: The programs for the GLib library
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose

Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=24649&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Fri Jul  2 18:57:49 2010
@@ -28,7 +28,6 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Recommends: @DATA_PKG@,
-            @BIN_PKG@,
             shared-mime-info
 Conflicts: libpango1.0-0 (<< 1.11)
 Replaces: @DEV_PKG@ (<< 2.23.2-2)
@@ -63,7 +62,8 @@
          ${misc:Depends},
          @SHARED_PKG@ (>= ${source:Version}),
          @DATA_PKG@
-Replaces: @SHARED_PKG@ (<< 2.25.2)
+Replaces: @SHARED_PKG@ (<< 2.25.2),
+          @DEV_PKG@ (<< 2.25.10-2)
 Description: The programs for the GLib library
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose

Modified: desktop/experimental/glib2.0/debian/libglib2.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.install?rev=24649&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.install [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.install [utf-8] Fri Jul  2 18:57:49 2010
@@ -1,2 +1,4 @@
 debian/install/deb/usr/lib/libglib-*.so.* lib
 debian/install/deb/usr/lib/libg{object,module,thread,io}-*.so.* usr/lib
+debian/install/deb/usr/bin/gio-querymodules usr/lib/glib-2.0
+debian/install/deb/usr/bin/glib-compile-schemas usr/lib/glib-2.0

Copied: desktop/experimental/glib2.0/debian/libglib2.0-0.postinst (from r24636, desktop/experimental/glib2.0/debian/libglib2.0-bin.postinst)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.postinst?rev=24649&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-bin.postinst [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.postinst [utf-8] Fri Jul  2 18:57:49 2010
@@ -1,14 +1,31 @@
 #!/bin/sh
 set -e
 
-case "$1" in
-triggered)
-	# This is triggered everytime an application installs a GIO
-	# module into /usr/lib/gio/modules
-	gio-querymodules /usr/lib/gio/modules
-        exit 0
-;;
-esac
+if [ "$1" = triggered ]; then
+    for trigger in $2; do
+        case $trigger in
+          /usr/share/glib-2.0/schemas)
+            # This is triggered everytime an application installs a
+            # GSettings schema
+            /usr/lib/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
+            ;;
 
+          /usr/lib/gio/modules)
+            # This is triggered everytime an application installs a GIO
+            # module into /usr/lib/gio/modules
+            /usr/lib/glib-2.0/gio-querymodules /usr/lib/gio/modules
+            ;;
+        esac
+    done
+    exit 0
+fi
 
 #DEBHELPER#
+
+# Also handle the initial installation
+if [ -d /usr/share/glib-2.0/schemas ]; then
+    /usr/lib/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
+fi
+if [ -d /usr/lib/gio/modules ]; then
+    /usr/lib/glib-2.0/gio-querymodules /usr/lib/gio/modules
+fi

Copied: desktop/experimental/glib2.0/debian/libglib2.0-0.postrm (from r24646, desktop/unstable/glib2.0/debian/libglib2.0-0.postrm)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.postrm?rev=24649&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.postrm [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.postrm [utf-8] Fri Jul  2 18:57:49 2010
@@ -8,3 +8,9 @@
     rm -f /usr/lib/gio/modules/giomodule.cache
     rmdir -p --ignore-fail-on-non-empty /usr/lib/gio/modules
 fi
+
+if [ -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
+fi

Copied: desktop/experimental/glib2.0/debian/libglib2.0-0.triggers (from r24636, desktop/experimental/glib2.0/debian/libglib2.0-bin.triggers)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.triggers?rev=24649&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-bin.triggers [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.triggers [utf-8] Fri Jul  2 18:57:49 2010
@@ -1,1 +1,2 @@
 interest /usr/lib/gio/modules
+interest /usr/share/glib-2.0/schemas

Modified: desktop/experimental/glib2.0/debian/libglib2.0-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-bin.install?rev=24649&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-bin.install [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-bin.install [utf-8] Fri Jul  2 18:57:49 2010
@@ -1,6 +1,6 @@
-debian/install/deb/usr/bin/gio-querymodules usr/bin
 debian/install/deb/usr/bin/gsettings usr/bin
 debian/install/deb/usr/bin/gdbus usr/bin
 debian/install/deb/usr/share/man/man1/gio-querymodules.1* usr/share/man/man1
+debian/install/deb/usr/share/man/man1/glib-compile-schemas.1* usr/share/man/man1
 debian/install/deb/usr/share/man/man1/gsettings.1* usr/share/man/man1
 debian/install/deb/usr/share/man/man1/gdbus.1* usr/share/man/man1

Added: desktop/experimental/glib2.0/debian/libglib2.0-bin.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-bin.links?rev=24649&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-bin.links (added)
+++ desktop/experimental/glib2.0/debian/libglib2.0-bin.links [utf-8] Fri Jul  2 18:57:49 2010
@@ -1,0 +1,2 @@
+/usr/lib/glib-2.0/gio-querymodules /usr/bin/gio-querymodules
+/usr/lib/glib-2.0/glib-compile-schemas /usr/bin/glib-compile-schemas

Modified: desktop/experimental/glib2.0/debian/libglib2.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-dev.install?rev=24649&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-dev.install [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-dev.install [utf-8] Fri Jul  2 18:57:49 2010
@@ -4,17 +4,16 @@
 debian/install/deb/usr/lib/glib-2.0 usr/lib
 debian/install/deb/usr/lib/pkgconfig usr/lib
 debian/install/deb/usr/share/aclocal usr/share
+debian/install/deb/usr/share/glib-2.0/gdb usr/share/glib-2.0
 debian/install/deb/usr/share/glib-2.0/gettext usr/share/glib-2.0
 debian/install/deb/usr/share/glib-2.0/schemas usr/share/glib-2.0
 debian/install/deb/usr/share/man/man1/glib-genmarshal.1* usr/share/man/man1
 debian/install/deb/usr/share/man/man1/glib-mkenums.1* usr/share/man/man1
 debian/install/deb/usr/share/man/man1/gobject-query.1* usr/share/man/man1
 debian/install/deb/usr/share/man/man1/glib-gettextize.1* usr/share/man/man1
-debian/install/deb/usr/share/man/man1/glib-compile-schemas.1* usr/share/man/man1
 debian/install/deb/usr/bin/glib-genmarshal usr/bin
 debian/install/deb/usr/bin/gobject-query usr/bin
 debian/install/deb/usr/bin/glib-mkenums usr/bin
 debian/install/deb/usr/bin/gtester-report usr/bin
 debian/install/deb/usr/bin/glib-gettextize usr/bin
-debian/install/deb/usr/bin/glib-compile-schemas usr/bin
 debian/install/deb/usr/bin/gtester usr/bin

More information about the pkg-gnome-commits mailing list