r19249 - in /desktop/experimental/gnome-keyring/debian: changelog patches/02_uidir_relocate.patch

[kov at users.alioth.debian.org]

Author: kov
Date: Sat Mar 28 20:21:57 2009
New Revision: 19249

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19249
Log:
Relocate ui files directory, for parallel installabity

Added:
    desktop/experimental/gnome-keyring/debian/patches/02_uidir_relocate.patch
Modified:
    desktop/experimental/gnome-keyring/debian/changelog

Modified: desktop/experimental/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/changelog?rev=19249&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog (original)
+++ desktop/experimental/gnome-keyring/debian/changelog Sat Mar 28 20:21:57 2009
@@ -5,6 +5,10 @@
   - bumped shlibs version to 2.26.0
   * debian/copyright:
   - complete rewrite
+  * debian/patches/02_uidir_relocate.patch:
+  - change the directory where .ui files are installed, so that it
+    contains the soversion, to allow for parallel installability of
+    binary-incompatible versions
 
   Changes imported from/based on the Ubuntu package (thanks!):
   * debian/control.in, debian/libgcr*:
@@ -16,7 +20,7 @@
   - also install the new .so files gnome-keyring puts in
     /usr/lib/gnome-keyring/{devel,standalone}, and the XDG autostart file
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 28 Mar 2009 17:05:23 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 28 Mar 2009 17:15:29 -0300
 
 gnome-keyring (2.24.1-3) UNRELEASED; urgency=low
 

Added: desktop/experimental/gnome-keyring/debian/patches/02_uidir_relocate.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/02_uidir_relocate.patch?rev=19249&op=file
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/02_uidir_relocate.patch (added)
+++ desktop/experimental/gnome-keyring/debian/patches/02_uidir_relocate.patch Sat Mar 28 20:21:57 2009
@@ -1,0 +1,22 @@
+--- a/gcr/Makefile.am~	2009-03-02 12:43:35.000000000 -0300
++++ b/gcr/Makefile.am	2009-03-28 17:11:45.000000000 -0300
+@@ -2,7 +2,7 @@
+ # UI BUILDER
+ # 
+ 
+-uidir = $(datadir)/gcr/ui/
++uidir = $(datadir)/gcr0/ui/
+ 
+ GLADE_FILES = \
+ 	gcr-certificate-basics-widget.glade \
+--- a/gcr/Makefile.in~	2009-03-14 15:57:48.000000000 -0300
++++ b/gcr/Makefile.in	2009-03-28 17:12:44.000000000 -0300
+@@ -302,7 +302,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-uidir = $(datadir)/gcr/ui/
++uidir = $(datadir)/gcr0/ui/
+ GLADE_FILES = \
+ 	gcr-certificate-basics-widget.glade \
+ 	gcr-import-dialog.glade