r24866 - in /desktop/experimental/gtk+2.0/debian: ./ patches/

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Thu Jul 22 19:02:06 UTC 2010


Author: slomo
Date: Thu Jul 22 19:02:05 2010
New Revision: 24866

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24866
Log:
  + debian/update-gdkpixbuf-loaders*,
    debian/update-gtk-immodules*:
    - Drop module update scripts which are no-ops since 2.10.1.

Removed:
    desktop/experimental/gtk+2.0/debian/update-gdkpixbuf-loaders.8
    desktop/experimental/gtk+2.0/debian/update-gdkpixbuf-loaders.in
    desktop/experimental/gtk+2.0/debian/update-gtk-immodules.8
    desktop/experimental/gtk+2.0/debian/update-gtk-immodules.fr.8
    desktop/experimental/gtk+2.0/debian/update-gtk-immodules.in
Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in
    desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postinst.in
    desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postrm.in
    desktop/experimental/gtk+2.0/debian/libgtk2.0-0.triggers.in
    desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in
    desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch
    desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=24866&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Thu Jul 22 19:02:05 2010
@@ -16,8 +16,11 @@
     + debian/rules,
       debian/libgtk2.0-0.symbols:
       - Update for new API symbols.
-
- -- Sebastian Dröge <slomo at debian.org>  Thu, 22 Jul 2010 18:05:38 +0200
+    + debian/update-gdkpixbuf-loaders*,
+      debian/update-gtk-immodules*:
+      - Drop module update scripts which are no-ops since 2.10.1.
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 22 Jul 2010 21:01:09 +0200
 
 gtk+2.0 (2.21.2-1) experimental; urgency=low
 

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.install.in?rev=24866&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in [utf-8] Thu Jul 22 19:02:05 2010
@@ -1,6 +1,3 @@
-# from Debian
-debian/update-gdkpixbuf-loaders @LIBDIR@/@SHARED_PKG@
-debian/update-gtk-immodules @LIBDIR@/@SHARED_PKG@
 # from the shared flavor
 debian/install/shared/etc/gtk- at APIVER@/im-multipress.conf etc/gtk- at APIVER@
 debian/install/shared/usr/bin/gtk-query-immodules-2.0 @LIBDIR@/@SHARED_PKG@

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.postinst.in?rev=24866&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postinst.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postinst.in [utf-8] Thu Jul 22 19:02:05 2010
@@ -7,10 +7,10 @@
             continue
         fi
         case $trigger in
-          @MODULES_BASE_PATH@/immodules)
+          /@MODULES_BASE_PATH@/immodules)
             # This is triggered everytime an application installs a
             # GTK immodule loader
-            @LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 @MODULES_BASE_PATH@/immodules/*.so > @MODULES_BASE_PATH@/gtk.immodules || true
+            /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/gtk.immodules || true
             ;;
         esac
     done
@@ -20,7 +20,7 @@
 #DEBHELPER#
 
 # Also handle the initial installation
-if [ -d @MODULES_BASE_PATH@/immodules ]; then
-     @LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 @MODULES_BASE_PATH@/immodules/*.so > @MODULES_BASE_PATH@/gtk.immodules || true
+if [ -d /@MODULES_BASE_PATH@/immodules ]; then
+     /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/gtk.immodules || true
 fi
 

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postrm.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.postrm.in?rev=24866&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postrm.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postrm.in [utf-8] Thu Jul 22 19:02:05 2010
@@ -10,8 +10,8 @@
 
 #DEBHELPER#
 
-if [ -d @MODULES_BASE_PATH@/immodules ]; then
+if [ -d /@MODULES_BASE_PATH@/immodules ]; then
     # Purge the cache
-    rm -f @MODULES_BASE_PATH@/gtk.immodules
-    rmdir -p --ignore-fail-on-non-empty @MODULES_BASE_PATH@
+    rm -f /@MODULES_BASE_PATH@/gtk.immodules
+    rmdir -p --ignore-fail-on-non-empty /@MODULES_BASE_PATH@
 fi

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.triggers.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.triggers.in?rev=24866&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.triggers.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.triggers.in [utf-8] Thu Jul 22 19:02:05 2010
@@ -1,1 +1,1 @@
-interest @MODULES_BASE_PATH@/immodules
+interest /@MODULES_BASE_PATH@/immodules

Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-bin.links.in?rev=24866&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in [utf-8] Thu Jul 22 19:02:05 2010
@@ -1,7 +1,5 @@
 @LIBDIR@/@SHARED_PKG@/gtk-query-immodules- at APIVER@ usr/bin/gtk-query-immodules- at APIVER@
 @LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache
- at LIBDIR@/@SHARED_PKG@/update-gtk-immodules usr/sbin/update-gtk-immodules
- at LIBDIR@/@SHARED_PKG@/update-gdkpixbuf-loaders usr/sbin/update-gdkpixbuf-loaders
 usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@BIN_PKG@/changelog.gz
 usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz
 usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@BIN_PKG@/README.gz

Modified: desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/011_immodule-cache-dir.patch?rev=24866&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch [utf-8] Thu Jul 22 19:02:05 2010
@@ -7,7 +7,7 @@
  	result = g_strdup (im_module_file);
        else
 -	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules", NULL);
++	result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules", NULL);
      }
  
    return result;

Modified: desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/041_ia32-libs.patch?rev=24866&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch [utf-8] Thu Jul 22 19:02:05 2010
@@ -6,20 +6,20 @@
        if (im_module_file)
  	result = g_strdup (im_module_file);
        else
--	result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules", NULL);
+-	result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules", NULL);
 +        {
 +#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
 +# if defined (__i386__)
-+         result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules.32", NULL);
++         result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules.32", NULL);
 +# else
-+         result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules.64", NULL);
++         result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules.64", NULL);
 +# endif
 +          /* Prefer compat gtk.immodules file if it's usable. */
 +          if (g_file_test(result, G_FILE_TEST_EXISTS))
 +            return result;
 +          g_free (result);
 +#endif
-+          result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules", NULL);
++          result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules", NULL);
 +        }
      }
  

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=24866&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Thu Jul 22 19:02:05 2010
@@ -266,7 +266,7 @@
 	rm -f debian/*.devhelp
 	-rm -rf $(STAMP_DIR)
 	-rm -f $(call dh_subst_files,$(ALL_PKGS))
-	-rm -f debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
+	-rm -f debian/dh_gtkmodules debian/dh_gtkmodules.1
 	dh_clean
 
 maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
@@ -293,7 +293,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
+binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/dh_gtkmodules debian/dh_gtkmodules.1
 	dh_testdir
 	dh_testroot
 	dh_install -s
@@ -301,10 +301,6 @@
 	sed -i "/dependency_libs/ s/'.*'/''/" debian/*/$(LIBDIR)/*.la
 	# we don't need the rpath in the udeb
 	chrpath -d debian/$(UDEB_PKG)/$(LIBDIR)/*x11*.so.*
-	# fix permissions of binaries below /$(LIBDIR)/$(SHARED_PKG)
-	for f in update-gdkpixbuf-loaders update-gtk-immodules; do \
-	    chmod 755 debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/$$f; \
-	done
 	# changelog.gz symlinks will be overwritten by dh_link
 	dh_installchangelogs -s ChangeLog
 	# do not merge the calls: dh_installdocs only installs in the first pkg




More information about the pkg-gnome-commits mailing list