Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19901

Modified Files:
        gtk+2.info gtk+2.patch 
Log Message:
new version; loaders database is now built when %N-shlibs is installed
rather than %N, which should solve runtime problems of %N-shlibs
needing the database


Index: gtk+2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtk+2.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gtk+2.patch 26 Nov 2008 23:19:51 -0000      1.10
+++ gtk+2.patch 20 Jan 2009 06:17:33 -0000      1.11
@@ -1,7 +1,7 @@
-diff -Nurd -x'*~' gtk+-2.14.5.orig/Makefile.in gtk+-2.14.5/Makefile.in
---- gtk+-2.14.5.orig/Makefile.in       2008-11-24 11:08:14.000000000 -0500
-+++ gtk+-2.14.5/Makefile.in    2008-11-26 16:15:40.000000000 -0500
-@@ -520,7 +520,7 @@
+diff -Nurd -x'*~' gtk+-2.14.7.orig/Makefile.in gtk+-2.14.7/Makefile.in
+--- gtk+-2.14.7.orig/Makefile.in       2009-01-07 16:52:00.000000000 -0500
++++ gtk+-2.14.7/Makefile.in    2009-01-09 01:45:25.000000000 -0500
+@@ -516,7 +516,7 @@
        && DISPLAY=:$$XID && export DISPLAY
  
  
@@ -10,10 +10,10 @@
  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
  
  # require automake 1.4
-diff -Nurd -x'*~' gtk+-2.14.5.orig/configure gtk+-2.14.5/configure
---- gtk+-2.14.5.orig/configure 2008-11-24 01:41:48.000000000 -0500
-+++ gtk+-2.14.5/configure      2008-11-26 16:15:40.000000000 -0500
-@@ -30554,16 +30554,6 @@
+diff -Nurd -x'*~' gtk+-2.14.7.orig/configure gtk+-2.14.7/configure
+--- gtk+-2.14.7.orig/configure 2009-01-07 16:52:17.000000000 -0500
++++ gtk+-2.14.7/configure      2009-01-09 01:45:25.000000000 -0500
+@@ -33739,16 +33739,6 @@
  fi
  
  
@@ -30,9 +30,9 @@
  
    # Checks for Xcursor library
  
-diff -Nurd -x'*~' gtk+-2.14.5.orig/docs/tools/shooter.c 
gtk+-2.14.5/docs/tools/shooter.c
---- gtk+-2.14.5.orig/docs/tools/shooter.c      2008-11-24 01:35:42.000000000 
-0500
-+++ gtk+-2.14.5/docs/tools/shooter.c   2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/docs/tools/shooter.c 
gtk+-2.14.7/docs/tools/shooter.c
+--- gtk+-2.14.7.orig/docs/tools/shooter.c      2009-01-07 11:33:00.000000000 
-0500
++++ gtk+-2.14.7/docs/tools/shooter.c   2009-01-09 01:45:25.000000000 -0500
 @@ -16,7 +16,11 @@
  #include <stdlib.h>
  #include <fcntl.h>
@@ -45,10 +45,10 @@
  #include "widgets.h"
  #include "shadow.h"
  
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/Makefile.in gtk+-2.14.5/gdk/Makefile.in
---- gtk+-2.14.5.orig/gdk/Makefile.in   2008-11-24 01:41:41.000000000 -0500
-+++ gtk+-2.14.5/gdk/Makefile.in        2008-11-26 16:15:40.000000000 -0500
-@@ -581,7 +581,7 @@
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gdk/Makefile.in gtk+-2.14.7/gdk/Makefile.in
+--- gtk+-2.14.7.orig/gdk/Makefile.in   2009-01-07 16:52:06.000000000 -0500
++++ gtk+-2.14.7/gdk/Makefile.in        2009-01-09 01:45:25.000000000 -0500
+@@ -577,7 +577,7 @@
  libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
    $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
  
@@ -57,9 +57,9 @@
  
  libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
  libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/directfb/gdkim-directfb.c 
gtk+-2.14.5/gdk/directfb/gdkim-directfb.c
---- gtk+-2.14.5.orig/gdk/directfb/gdkim-directfb.c     2008-11-24 
01:36:03.000000000 -0500
-+++ gtk+-2.14.5/gdk/directfb/gdkim-directfb.c  2008-11-26 16:15:40.000000000 
-0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gdk/directfb/gdkim-directfb.c 
gtk+-2.14.7/gdk/directfb/gdkim-directfb.c
+--- gtk+-2.14.7.orig/gdk/directfb/gdkim-directfb.c     2009-01-07 
11:33:47.000000000 -0500
++++ gtk+-2.14.7/gdk/directfb/gdkim-directfb.c  2009-01-09 01:45:25.000000000 
-0500
 @@ -33,7 +33,11 @@
  #include "config.h"
  
@@ -72,9 +72,9 @@
  
  #include "gdkdirectfb.h"
  
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/x11/gdkdrawable-x11.c 
gtk+-2.14.5/gdk/x11/gdkdrawable-x11.c
---- gtk+-2.14.5.orig/gdk/x11/gdkdrawable-x11.c 2008-11-24 01:36:03.000000000 
-0500
-+++ gtk+-2.14.5/gdk/x11/gdkdrawable-x11.c      2008-11-26 16:15:40.000000000 
-0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gdk/x11/gdkdrawable-x11.c 
gtk+-2.14.7/gdk/x11/gdkdrawable-x11.c
+--- gtk+-2.14.7.orig/gdk/x11/gdkdrawable-x11.c 2009-01-07 11:33:56.000000000 
-0500
++++ gtk+-2.14.7/gdk/x11/gdkdrawable-x11.c      2009-01-09 01:45:25.000000000 
-0500
 @@ -959,11 +959,19 @@
     * RENDER's preferred order
     */
@@ -140,9 +140,9 @@
  
    *format = XRenderFindFormat (xdisplay,
                               (PictFormatType | PictFormatDepth |
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/x11/gdkfont-x11.c 
gtk+-2.14.5/gdk/x11/gdkfont-x11.c
---- gtk+-2.14.5.orig/gdk/x11/gdkfont-x11.c     2008-11-24 01:36:03.000000000 
-0500
-+++ gtk+-2.14.5/gdk/x11/gdkfont-x11.c  2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gdk/x11/gdkfont-x11.c 
gtk+-2.14.7/gdk/x11/gdkfont-x11.c
+--- gtk+-2.14.7.orig/gdk/x11/gdkfont-x11.c     2009-01-07 11:33:56.000000000 
-0500
++++ gtk+-2.14.7/gdk/x11/gdkfont-x11.c  2009-01-09 01:45:25.000000000 -0500
 @@ -29,7 +29,11 @@
  #include "config.h"
  #include <X11/Xlib.h>
@@ -155,9 +155,9 @@
  
  #include "gdkx.h"
  #include "gdkfont.h"
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gdk/x11/gdkim-x11.c 
gtk+-2.14.5/gdk/x11/gdkim-x11.c
---- gtk+-2.14.5.orig/gdk/x11/gdkim-x11.c       2008-11-24 01:36:03.000000000 
-0500
-+++ gtk+-2.14.5/gdk/x11/gdkim-x11.c    2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gdk/x11/gdkim-x11.c 
gtk+-2.14.7/gdk/x11/gdkim-x11.c
+--- gtk+-2.14.7.orig/gdk/x11/gdkim-x11.c       2009-01-07 11:33:56.000000000 
-0500
++++ gtk+-2.14.7/gdk/x11/gdkim-x11.c    2009-01-09 01:45:25.000000000 -0500
 @@ -26,7 +26,11 @@
  
  #include "config.h"
@@ -170,9 +170,9 @@
  #include <stdlib.h>
  #include <string.h>
  
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtk-builder-convert 
gtk+-2.14.5/gtk/gtk-builder-convert
---- gtk+-2.14.5.orig/gtk/gtk-builder-convert   2008-11-24 01:35:35.000000000 
-0500
-+++ gtk+-2.14.5/gtk/gtk-builder-convert        2008-11-26 16:15:40.000000000 
-0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gtk/gtk-builder-convert 
gtk+-2.14.7/gtk/gtk-builder-convert
+--- gtk+-2.14.7.orig/gtk/gtk-builder-convert   2009-01-07 11:32:57.000000000 
-0500
++++ gtk+-2.14.7/gtk/gtk-builder-convert        2009-01-13 01:09:10.000000000 
-0500
 @@ -269,9 +269,14 @@
  
          # Output the newly created root objects and sort them
@@ -191,9 +191,28 @@
              self._interface.childNodes.insert(0, obj)
  
      def _convert(self, klass, node):
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkimmulticontext.c 
gtk+-2.14.5/gtk/gtkimmulticontext.c
---- gtk+-2.14.5.orig/gtk/gtkimmulticontext.c   2008-11-24 01:35:35.000000000 
-0500
-+++ gtk+-2.14.5/gtk/gtkimmulticontext.c        2008-11-26 16:15:40.000000000 
-0500
+@@ -520,12 +525,12 @@
+         if prop.childNodes:
+             data = prop.childNodes[0].data
+             value, lower, upper, step, page, page_size = data.split(' ')
+-            properties.update(value=value,
+-                              lower=lower,
+-                              upper=upper,
+-                              step_increment=step,
+-                              page_increment=page,
+-                              page_size=page_size)
++            properties.update({"value":value,
++                               "lower":lower,
++                               "upper":upper,
++                               "step_increment":step,
++                               "page_increment":page,
++                               "page_size":page_size})
+         else:
+             prop.appendChild(self._dom.createTextNode(""))
+ 
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gtk/gtkimmulticontext.c 
gtk+-2.14.7/gtk/gtkimmulticontext.c
+--- gtk+-2.14.7.orig/gtk/gtkimmulticontext.c   2009-01-07 11:32:57.000000000 
-0500
++++ gtk+-2.14.7/gtk/gtkimmulticontext.c        2009-01-09 01:45:25.000000000 
-0500
 @@ -20,7 +20,11 @@
  #include "config.h"
  
@@ -206,9 +225,9 @@
  
  #include "gtkimmulticontext.h"
  #include "gtkimmodule.h"
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkmain.c gtk+-2.14.5/gtk/gtkmain.c
---- gtk+-2.14.5.orig/gtk/gtkmain.c     2008-11-24 01:35:35.000000000 -0500
-+++ gtk+-2.14.5/gtk/gtkmain.c  2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gtk/gtkmain.c gtk+-2.14.7/gtk/gtkmain.c
+--- gtk+-2.14.7.orig/gtk/gtkmain.c     2009-01-07 11:32:57.000000000 -0500
++++ gtk+-2.14.7/gtk/gtkmain.c  2009-01-09 01:45:25.000000000 -0500
 @@ -29,7 +29,11 @@
  #include <glib.h>
  #include "gdkconfig.h"
@@ -221,9 +240,9 @@
  
  #include <stdio.h>
  #include <stdlib.h>
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkpagesetupunixdialog.c 
gtk+-2.14.5/gtk/gtkpagesetupunixdialog.c
---- gtk+-2.14.5.orig/gtk/gtkpagesetupunixdialog.c      2008-11-24 
01:35:35.000000000 -0500
-+++ gtk+-2.14.5/gtk/gtkpagesetupunixdialog.c   2008-11-26 16:15:40.000000000 
-0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gtk/gtkpagesetupunixdialog.c 
gtk+-2.14.7/gtk/gtkpagesetupunixdialog.c
+--- gtk+-2.14.7.orig/gtk/gtkpagesetupunixdialog.c      2009-01-07 
11:32:57.000000000 -0500
++++ gtk+-2.14.7/gtk/gtkpagesetupunixdialog.c   2009-01-09 01:45:25.000000000 
-0500
 @@ -21,7 +21,11 @@
  
  #include "config.h"
@@ -236,9 +255,9 @@
  
  #ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
  #include <langinfo.h>
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkpapersize.c 
gtk+-2.14.5/gtk/gtkpapersize.c
---- gtk+-2.14.5.orig/gtk/gtkpapersize.c        2008-11-24 01:35:36.000000000 
-0500
-+++ gtk+-2.14.5/gtk/gtkpapersize.c     2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gtk/gtkpapersize.c 
gtk+-2.14.7/gtk/gtkpapersize.c
+--- gtk+-2.14.7.orig/gtk/gtkpapersize.c        2009-01-07 11:32:57.000000000 
-0500
++++ gtk+-2.14.7/gtk/gtkpapersize.c     2009-01-09 01:45:25.000000000 -0500
 @@ -22,7 +22,11 @@
  #include "config.h"
  #include <string.h>
@@ -251,9 +270,9 @@
  #if defined(HAVE__NL_PAPER_HEIGHT) && defined(HAVE__NL_PAPER_WIDTH)
  #include <langinfo.h>
  #endif
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkrc.c gtk+-2.14.5/gtk/gtkrc.c
---- gtk+-2.14.5.orig/gtk/gtkrc.c       2008-11-24 01:35:36.000000000 -0500
-+++ gtk+-2.14.5/gtk/gtkrc.c    2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gtk/gtkrc.c gtk+-2.14.7/gtk/gtkrc.c
+--- gtk+-2.14.7.orig/gtk/gtkrc.c       2009-01-07 11:32:57.000000000 -0500
++++ gtk+-2.14.7/gtk/gtkrc.c    2009-01-09 01:45:25.000000000 -0500
 @@ -26,7 +26,11 @@
  
  #include "config.h"
@@ -266,9 +285,9 @@
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkspinbutton.c 
gtk+-2.14.5/gtk/gtkspinbutton.c
---- gtk+-2.14.5.orig/gtk/gtkspinbutton.c       2008-11-24 01:35:35.000000000 
-0500
-+++ gtk+-2.14.5/gtk/gtkspinbutton.c    2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gtk/gtkspinbutton.c 
gtk+-2.14.7/gtk/gtkspinbutton.c
+--- gtk+-2.14.7.orig/gtk/gtkspinbutton.c       2009-01-07 11:32:57.000000000 
-0500
++++ gtk+-2.14.7/gtk/gtkspinbutton.c    2009-01-09 01:45:25.000000000 -0500
 @@ -32,7 +32,11 @@
  #include <stdlib.h>
  #include <math.h>
@@ -281,9 +300,9 @@
  #include "gdk/gdkkeysyms.h"
  #include "gtkbindings.h"
  #include "gtkspinbutton.h"
-diff -Nurd -x'*~' gtk+-2.14.5.orig/gtk/gtkwidget.c gtk+-2.14.5/gtk/gtkwidget.c
---- gtk+-2.14.5.orig/gtk/gtkwidget.c   2008-11-24 01:35:35.000000000 -0500
-+++ gtk+-2.14.5/gtk/gtkwidget.c        2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/gtk/gtkwidget.c gtk+-2.14.7/gtk/gtkwidget.c
+--- gtk+-2.14.7.orig/gtk/gtkwidget.c   2009-01-07 11:32:57.000000000 -0500
++++ gtk+-2.14.7/gtk/gtkwidget.c        2009-01-09 01:45:25.000000000 -0500
 @@ -27,7 +27,11 @@
  #include "config.h"
  #include <stdarg.h>
@@ -296,9 +315,9 @@
  #include "gtkcontainer.h"
  #include "gtkaccelmap.h"
  #include "gtkclipboard.h"
-diff -Nurd -x'*~' gtk+-2.14.5.orig/modules/input/gtkimcontextxim.c 
gtk+-2.14.5/modules/input/gtkimcontextxim.c
---- gtk+-2.14.5.orig/modules/input/gtkimcontextxim.c   2008-11-24 
01:35:53.000000000 -0500
-+++ gtk+-2.14.5/modules/input/gtkimcontextxim.c        2008-11-26 
16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/modules/input/gtkimcontextxim.c 
gtk+-2.14.7/modules/input/gtkimcontextxim.c
+--- gtk+-2.14.7.orig/modules/input/gtkimcontextxim.c   2009-01-07 
11:33:31.000000000 -0500
++++ gtk+-2.14.7/modules/input/gtkimcontextxim.c        2009-01-09 
01:45:25.000000000 -0500
 @@ -18,7 +18,11 @@
   */
  
@@ -312,9 +331,9 @@
  #include <string.h>
  #include <stdlib.h>
  
-diff -Nurd -x'*~' gtk+-2.14.5.orig/tests/testicontheme.c 
gtk+-2.14.5/tests/testicontheme.c
---- gtk+-2.14.5.orig/tests/testicontheme.c     2008-11-24 01:35:46.000000000 
-0500
-+++ gtk+-2.14.5/tests/testicontheme.c  2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/tests/testicontheme.c 
gtk+-2.14.7/tests/testicontheme.c
+--- gtk+-2.14.7.orig/tests/testicontheme.c     2009-01-07 11:33:12.000000000 
-0500
++++ gtk+-2.14.7/tests/testicontheme.c  2009-01-09 01:45:25.000000000 -0500
 @@ -21,7 +21,11 @@
  #include <gtk/gtk.h>
  #include <stdlib.h>
@@ -327,9 +346,9 @@
  
  static void
  usage (void)
-diff -Nurd -x'*~' gtk+-2.14.5.orig/update-gdk-pixbuf-loaders 
gtk+-2.14.5/update-gdk-pixbuf-loaders
---- gtk+-2.14.5.orig/update-gdk-pixbuf-loaders 1969-12-31 19:00:00.000000000 
-0500
-+++ gtk+-2.14.5/update-gdk-pixbuf-loaders      2008-11-26 16:15:40.000000000 
-0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/update-gdk-pixbuf-loaders 
gtk+-2.14.7/update-gdk-pixbuf-loaders
+--- gtk+-2.14.7.orig/update-gdk-pixbuf-loaders 1969-12-31 19:00:00.000000000 
-0500
++++ gtk+-2.14.7/update-gdk-pixbuf-loaders      2009-01-09 01:45:25.000000000 
-0500
 @@ -0,0 +1,21 @@
 +#!/bin/sh -e
 +#
@@ -352,9 +371,9 @@
 +chmod 0644 $CONFFILE
 +
 +exit 0
-diff -Nurd -x'*~' gtk+-2.14.5.orig/update-gtk-immodules 
gtk+-2.14.5/update-gtk-immodules
---- gtk+-2.14.5.orig/update-gtk-immodules      1969-12-31 19:00:00.000000000 
-0500
-+++ gtk+-2.14.5/update-gtk-immodules   2008-11-26 16:15:40.000000000 -0500
+diff -Nurd -x'*~' gtk+-2.14.7.orig/update-gtk-immodules 
gtk+-2.14.7/update-gtk-immodules
+--- gtk+-2.14.7.orig/update-gtk-immodules      1969-12-31 19:00:00.000000000 
-0500
++++ gtk+-2.14.7/update-gtk-immodules   2009-01-09 01:45:25.000000000 -0500
 @@ -0,0 +1,20 @@
 +#!/bin/sh -e
 +#

Index: gtk+2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtk+2.info,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- gtk+2.info  4 Dec 2008 20:32:48 -0000       1.29
+++ gtk+2.info  20 Jan 2009 06:17:33 -0000      1.30
@@ -1,7 +1,6 @@
 Package: gtk+2
-Version: 2.14.5
-Revision: 1
-# add ". %p/bin/init.sh" to PostInst next time rev/version-up
+Version: 2.14.7
+Revision: 2
 Description: The Gimp Toolkit
 License: LGPL
 Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
@@ -42,11 +41,11 @@
 Conflicts: %N-common
 Replaces: %N-common
 Source: mirror:gnome:sources/gtk+/2.14/gtk+-%v.tar.bz2
-Source-MD5: 1b1b5d7ab5a25e84682cb27ee4808a40
-Source2: mirror:debian:pool/main/g/gtk+2.0/gtk+2.0_2.14.5-1.diff.gz
-Source2-MD5: 0c1ee9203ff4c348dcccf386ad91e545
+Source-MD5: fb1614d4b2adba7b078e2e799b5db604
+Source2: mirror:debian:pool/main/g/gtk+2.0/gtk+2.0_2.14.7-1.diff.gz
+Source2-MD5: 35e6b8cff0070e4231537f0671571767
 PatchFile: %n.patch
-PatchFile-MD5: 50367f47b8b32fd52d78c442b67473b6
+PatchFile-MD5: d995d10089c346899a0b2fd002472630
 PatchScript: <<
 #!/bin/sh -ev
        sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
@@ -100,9 +99,25 @@
 InfoTest: TestScript: make -C tests || exit 2
 InstallScript: <<
        make install DESTDIR=%d
-       install -d -m 755 %i/sbin %i/etc/gtk-2.0
+
+       install -d -m 755 %i/sbin
        install -c -m 755 update-gdk-pixbuf-loaders %i/sbin/
        install -c -m 755 update-gtk-immodules %i/sbin/
+
+       # libversioned actual placed in %N-shlibs because needed
+       # during %N-shlibs PostInst; keep unversioned links in %N for
+       # legacy compat for others' PostInst
+       mv %i/bin/gdk-pixbuf-query-loaders     
%i/bin/gdk-pixbuf-query-loaders-2.0
+       ln -s     gdk-pixbuf-query-loaders-2.0 %i/bin/gdk-pixbuf-query-loaders
+       perl -pi -e 's/(gdk-pixbuf-query-loaders)/\1-2.0/' 
%i/sbin/update-gdk-pixbuf-loaders
+       mv %i/sbin/update-gdk-pixbuf-loaders     
%i/sbin/update-gdk-pixbuf-loaders-2.0
+       ln -s      update-gdk-pixbuf-loaders-2.0 
%i/sbin/update-gdk-pixbuf-loaders
+       mv %i/sbin/update-gtk-immodules     %i/sbin/update-gtk-immodules-2.0
+       ln -s      update-gtk-immodules-2.0 %i/sbin/update-gtk-immodules
+
+       install -d -m 755 %i/etc/gtk-2.0
+       touch %i/etc/gtk-2.0/gtk.immodules
+       touch %i/etc/gtk-2.0/gdk-pixbuf.loaders
 <<
 DocFiles: AUTHORS COPYING ChangeLog NEWS README
 SplitOff: <<
@@ -132,6 +147,7 @@
        DocFiles: AUTHORS COPYING ChangeLog NEWS README
        RuntimeVars: GDK_USE_XFT: 1
        Files: <<
+               bin/gdk-pixbuf-query-loaders-2.0
                bin/gtk-query-immodules-2.0
                etc/gtk-2.0
                lib/libgailutil.18*.dylib
@@ -141,6 +157,8 @@
                lib/gtk-2.0/2.10.0/loaders/*.so
                lib/gtk-2.0/2.10.0/printbackends/*.so
                lib/gtk-2.0/modules/*.so
+               sbin/update-gdk-pixbuf-loaders-2.0
+               sbin/update-gtk-immodules-2.0
                share/locale
                share/man/man1/gtk-query-immodules-2.0.1
                share/themes
@@ -152,6 +170,15 @@
                %p/lib/libgdk_pixbuf_xlib-2.0.0.dylib 1401.0.0 %n (>= 2.14.3-1)
                %p/lib/libgtk-x11-2.0.0.dylib         1401.0.0 %n (>= 2.14.3-1)
        <<
+       PostInstScript: <<
+               . %p/bin/init.sh
+               case "$1" in
+                       configure)
+                               update-gdk-pixbuf-loaders-2.0
+                               update-gtk-immodules-2.0
+                               ;;
+               esac
+       <<
 <<
 SplitOff2: <<
        Package: %N-dev
@@ -186,24 +213,6 @@
        <<
 <<
 
-PostInstScript: <<
- case "$1" in
-       configure)
-        update-gdk-pixbuf-loaders
-        update-gtk-immodules
-        ;;
- esac
-<<
-PostRmScript: <<
- case "$1" in
-       purge)
-        rm -f %p/etc/gtk-2.0/gdk-pixbuf.loaders
-        rm -f %p/etc/gtk-2.0/gtk.immodules
-        rmdir %p/etc/gtk-2.0 || true
-        ;;
- esac
-<<
-
 Homepage: http://www.gtk.org
 DescDetail: <<
 The X libraries originally written for the GIMP, which are now used by
@@ -216,6 +225,9 @@
 
 Packages which install gtk immodule(s) should call update-gtk-immodules
 in their PostInstScript and PostRmScript to update the gtk.immodules file.
+
+Reinstall %N-shlibs to regenerate those index files if they get
+damaged or lost.
 <<
 
 DescPackaging: <<
@@ -248,8 +260,23 @@
        (developer tool to generate C code)
 
        Patch gtk-builder-convert to work with any python version (svn
-       revision #21807). See:
+       revision #21807 and additional patch from comment #5-6). See:
        http://bugzilla.gnome.org/show_bug.cgi?id=559947
+
+       As of 2.14.7-1, %N-shlibs contains a libversioned form of many
+       utility programs that generate files needed by %N-shlibs so
+       that users don't need to install %N in order for %N-shlibs to
+       have the files. All data being handled is already in
+       libversioned directories, so still sane for Shlibs Policy.
+
+       As of 2.14.7-1, there are blank files installed in the .deb
+       for the live indexes generated by the update-gtk-immodules and
+       update-gdk-pixbuf-loaders scripts (run during PostInst).
+       Having these files "owned" allows dpkg to remove them
+       automatically when the package that can create them is
+       removed, rather than needing to play PostRm purge and hope
+       that doesn't interfere with a differently-named package that
+       may handle these files in the future.
 <<
 DescPort: <<
 gtk+2-dev conflicts with gtk+ (<< 1.2.11), because it has symbolic


------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to