Package: glib2.0
User: [email protected]
Usertags: origin-ubuntu maverick ubuntu-patch
Version: 2.25.10-1
Severity: wishlist
Tags: patch

Since glib-compile-schemas is used to register schemas it should be in
the bin and not the dev binary, those are the changes Robert Ancell did
in Ubuntu for that, he also added a trigger to register schemas

  * 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

this change is also in the libglib2.0-dev install

    - install the new gdb python macros since the gdb version is recent 
      enough now to use those
diff -u glib2.0-2.25.10/debian/libglib2.0-bin.triggers glib2.0-2.25.10/debian/libglib2.0-bin.triggers
--- glib2.0-2.25.10/debian/libglib2.0-bin.triggers
+++ glib2.0-2.25.10/debian/libglib2.0-bin.triggers
@@ -1,0 +2 @@
+interest /usr/share/glib-2.0/schemas
diff -u glib2.0-2.25.10/debian/libglib2.0-bin.install glib2.0-2.25.10/debian/libglib2.0-bin.install
--- glib2.0-2.25.10/debian/libglib2.0-bin.install
+++ glib2.0-2.25.10/debian/libglib2.0-bin.install
@@ -1,6 +1,8 @@
 debian/install/deb/usr/bin/gio-querymodules usr/bin
+debian/install/deb/usr/bin/glib-compile-schemas 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
diff -u glib2.0-2.25.10/debian/control.in glib2.0-2.25.10/debian/control.in
--- glib2.0-2.25.10/debian/control.in
+++ glib2.0-2.25.10/debian/control.in
@@ -64,7 +64,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
diff -u glib2.0-2.25.10/debian/libglib2.0-dev.install glib2.0-2.25.10/debian/libglib2.0-dev.install
--- glib2.0-2.25.10/debian/libglib2.0-dev.install
+++ glib2.0-2.25.10/debian/libglib2.0-dev.install
@@ -6,15 +6,14 @@
 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
diff -u glib2.0-2.25.10/debian/libglib2.0-bin.postinst glib2.0-2.25.10/debian/libglib2.0-bin.postinst
--- glib2.0-2.25.10/debian/libglib2.0-bin.postinst
+++ glib2.0-2.25.10/debian/libglib2.0-bin.postinst
@@ -3,10 +3,19 @@
 
 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
+	case "$2" in
+	/usr/share/glib-2.0/schemas)
+		# This is triggered everytime an application installs a GSettings schema
+		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
+		gio-querymodules /usr/lib/gio/modules
+		exit 0
+		;;
+	esac
 ;;
 esac
 
diff -u glib2.0-2.25.10/debian/control glib2.0-2.25.10/debian/control
--- glib2.0-2.25.10/debian/control
+++ glib2.0-2.25.10/debian/control
@@ -64,7 +64,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

Reply via email to