r32711 - in /desktop/experimental/glib2.0/debian: changelog patches/61_glib-compile-binaries-path.patch patches/61_glib-compile-schemas-path.patch patches/series

[kov at users.alioth.debian.org]

Author: kov
Date: Fri Mar  2 22:42:17 2012
New Revision: 32711

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32711
Log:
  * debian/patches/61_glib-compile-schemas-path.patch,
    debian/patches/61_glib-compile-binaries-path.patch:
  - renamed, and updated to also cover glib-compile-resources

Added:
    desktop/experimental/glib2.0/debian/patches/61_glib-compile-binaries-path.patch
      - copied, changed from r32701, desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
Removed:
    desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    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=32711&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Mar  2 22:42:17 2012
@@ -4,6 +4,9 @@
   - Yeah, 2.31.8 was a mistake =/
   * debian/libglib2.0-0.symbols:
   - fix version declared for 2.31.8 symbols to not have -1
+  * debian/patches/61_glib-compile-schemas-path.patch,
+    debian/patches/61_glib-compile-binaries-path.patch:
+  - renamed, and updated to also cover glib-compile-resources
 
  -- Gustavo Noronha Silva <kov at debian.org>  Fri, 02 Mar 2012 19:27:52 -0300
 

Copied: desktop/experimental/glib2.0/debian/patches/61_glib-compile-binaries-path.patch (from r32701, 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-binaries-path.patch?rev=32711&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/61_glib-compile-binaries-path.patch [utf-8] Fri Mar  2 22:42:17 2012
@@ -4,14 +4,18 @@
 Author: Sebastian Dröge <slomo at debian.org>
 Origin: vendor
 
---- a/gio-2.0.pc.in
-+++ b/gio-2.0.pc.in
-@@ -4,7 +4,7 @@
+Index: glib2.0/gio-2.0.pc.in
+===================================================================
+--- glib2.0.orig/gio-2.0.pc.in	2012-02-20 18:23:17.000000000 -0200
++++ glib2.0/gio-2.0.pc.in	2012-03-02 19:35:20.825052715 -0300
+@@ -4,8 +4,8 @@
  includedir=@includedir@
  
  giomoduledir=@GIO_MODULE_DIR@
 -glib_compile_schemas=@bindir@/glib-compile-schemas at EXEEXT@
+-glib_compile_resources=@bindir@/glib-compile-resources at EXEEXT@
 +glib_compile_schemas=@libdir@/glib-2.0/glib-compile-schemas at EXEEXT@
++glib_compile_resources=@libdir@/glib-2.0/glib-compile-resources at EXEEXT@
  
  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=32711&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Fri Mar  2 22:42:17 2012
@@ -2,5 +2,5 @@
 01_gettext-desktopfiles.patch
 02_gettext-desktopfiles-ubuntu.patch
 04_homedir_env.patch
-61_glib-compile-schemas-path.patch
+61_glib-compile-binaries-path.patch
 90-gio-modules-multiarch-compat.patch