r24735 - in /desktop/experimental/glib2.0/debian: changelog control control.in libglib2.0-0.links libglib2.0-bin.links patches/61_glib-compile-schemas-path.patch patches/series

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Tue Jul 13 12:07:38 UTC 2010 

Author: slomo
Date: Tue Jul 13 12:07:32 2010
New Revision: 24735

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24735
Log:
* debian/control.in,
  debian/libglib2.0-bin.links,
  debian/libglib2.0-0.links:
  + Move links to the -bin package again but let the -dev package
    depend on the -bin package. Having the links in the shared library
    package will cause conflicts when the soname changes but the
    links in /usr/bin must be there at least if the -dev package is
    installed because build systems might assume that the applications
    are in $PATH.
* debian/patches/61_glib-compile-schemas-path.patch:
  + Adjust path to glib-compile-schemas in the pkg-config file.

Added:
    desktop/experimental/glib2.0/debian/libglib2.0-bin.links
      - copied unchanged from r24732, desktop/experimental/glib2.0/debian/libglib2.0-0.links
    desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
Removed:
    desktop/experimental/glib2.0/debian/libglib2.0-0.links
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/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=24735&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Jul 13 12:07:32 2010
@@ -1,3 +1,19 @@
+glib2.0 (2.25.11-2) experimental; urgency=low
+
+  * debian/control.in,
+    debian/libglib2.0-bin.links,
+    debian/libglib2.0-0.links:
+    + Move links to the -bin package again but let the -dev package
+      depend on the -bin package. Having the links in the shared library
+      package will cause conflicts when the soname changes but the
+      links in /usr/bin must be there at least if the -dev package is
+      installed because build systems might assume that the applications
+      are in $PATH.
+  * debian/patches/61_glib-compile-schemas-path.patch:
+    + Adjust path to glib-compile-schemas in the pkg-config file.
+
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 13 Jul 2010 14:06:28 +0200
+
 glib2.0 (2.25.11-1) experimental; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=24735&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Tue Jul 13 12:07:32 2010
@@ -29,8 +29,7 @@
          ${shlibs:Depends}
 Recommends: libglib2.0-data,
             shared-mime-info
-Conflicts: libpango1.0-0 (<< 1.11),
-           libglib2.0-bin (<< 2.25.11)
+Conflicts: libpango1.0-0 (<< 1.11)
 Replaces: libglib2.0-dev (<< 2.23.2-2)
 Description: The GLib library of C routines
  GLib is a library containing many useful C routines for things such
@@ -63,8 +62,9 @@
          ${misc:Depends},
          libglib2.0-0 (= ${binary:Version}),
          libglib2.0-data
-Replaces: libglib2.0-0 (<< 2.25.2),
-          libglib2.0-dev (<< 2.25.10-2)
+Conflicts: libglib2.0-0 (<< 2.25.11-2),
+Replaces: libglib2.0-0 (<< 2.25.11-2),
+          libglib2.0-dev (<< 2.25.11-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
@@ -79,6 +79,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libglib2.0-0 (= ${binary:Version}),
+         libglib2.0-bin (= ${binary:Version}),
          pkg-config (>= 0.14.0),
          zlib1g-dev
 Recommends: python

Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=24735&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Tue Jul 13 12:07:32 2010
@@ -29,8 +29,7 @@
          ${shlibs:Depends}
 Recommends: @DATA_PKG@,
             shared-mime-info
-Conflicts: libpango1.0-0 (<< 1.11),
-           @BIN_PKG@ (<< 2.25.11)
+Conflicts: libpango1.0-0 (<< 1.11)
 Replaces: @DEV_PKG@ (<< 2.23.2-2)
 Description: The GLib library of C routines
  GLib is a library containing many useful C routines for things such
@@ -63,8 +62,9 @@
          ${misc:Depends},
          @SHARED_PKG@ (= ${binary:Version}),
          @DATA_PKG@
-Replaces: @SHARED_PKG@ (<< 2.25.2),
-          @DEV_PKG@ (<< 2.25.10-2)
+Conflicts: @SHARED_PKG@ (<< 2.25.11-2),
+Replaces: @SHARED_PKG@ (<< 2.25.11-2),
+          @DEV_PKG@ (<< 2.25.11-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
@@ -79,6 +79,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          @SHARED_PKG@ (= ${binary:Version}),
+         @BIN_PKG@ (= ${binary:Version}),
          pkg-config (>= 0.14.0),
          zlib1g-dev
 Recommends: python

Added: desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch?rev=24735&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch [utf-8] Tue Jul 13 12:07:32 2010
@@ -1,0 +1,11 @@
+--- glib2.0-2.25.11/gio-2.0.pc.in.old	2010-07-13 14:03:37.614340022 +0200
++++ glib2.0-2.25.11/gio-2.0.pc.in	2010-07-13 14:04:49.323833657 +0200
+@@ -4,7 +4,7 @@
+ includedir=@includedir@
+ 
+ giomoduledir=@GIO_MODULE_DIR@
+-glib_compile_schemas=@bindir@/glib-compile-schemas
++glib_compile_schemas=@libdir@/glib-2.0/glib-compile-schemas
+ 
+ Name: GIO
+ Description: glib I/O library

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=24735&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Tue Jul 13 12:07:32 2010
@@ -3,3 +3,4 @@
 03_blacklist-directories.patch
 04_homedir_env.patch
 60_wait-longer-for-threads-to-die.patch
+61_glib-compile-schemas-path.patch

More information about the pkg-gnome-commits mailing list