r39619 - in /desktop/unstable/gtk+2.0/debian: changelog patches/001_static-linking-dont-query-immodules.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Sep 21 21:26:08 2013
New Revision: 39619

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39619
Log:
Update 001_static-linking-dont-query-immodules.patch, follow upstream and
use immodules.cache instead of gtk.immodules.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=39619&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog	[utf-8] Sat Sep 21 21:26:08 2013
@@ -2,6 +2,8 @@
 
   * New upstream release.
   * Use the official field for udebs: Package-Type.
+  * Update 001_static-linking-dont-query-immodules.patch, follow upstream and
+    use immodules.cache instead of gtk.immodules.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 17 Sep 2013 18:15:39 +0200
 

Modified: desktop/unstable/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=39619&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch	[utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch	[utf-8] Sat Sep 21 21:26:08 2013
@@ -34,20 +34,20 @@
 @@ -253,7 +257,18 @@
  included-modules: $(noinst_LTLIBRARIES)
  
- gtk.immodules: Makefile.am $(module_LTLIBRARIES)
--	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
+ immodules.cache: Makefile.am $(module_LTLIBRARIES)
+-	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > immodules.cache
 +	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
-+	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
-+	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
++	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > immodules.cache" ; \
++	  $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > immodules.cache; \
 +	else \
 +	  echo "***" ; \
-+	  echo "*** Warning: gtk.immodules not built" ; \
++	  echo "*** Warning: immodules.cache not built" ; \
 +	  echo "***" ; \
 +	  echo "*** Generate this file manually on host" ; \
 +	  echo "*** system using gtk-query-immodules-2.0" ; \
 +	  echo "***" ; \
-+	  touch gtk.immodules; \
++	  touch immodules.cache; \
 +        fi
  
- CLEANFILES = gtk.immodules
+ CLEANFILES = immodules.cache