r32444 - in /desktop/unstable/gtk+2.0/debian: changelog patches/003_gdk.pc_privates.patch patches/005_support_disabling_x11_extensions.patch patches/065_gir_set_packages.patch patches/070_revert_gtk_iconview_layout.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Jan 25 11:31:09 UTC 2012 

Author: biebl
Date: Wed Jan 25 11:31:09 2012
New Revision: 32444

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32444
Log:
* Remove debian/patches/070_revert_gtk_iconview_layout.patch, merged
  upstream.
* Update debian/patches/065_gir_set_packages.patch.

Removed:
    desktop/unstable/gtk+2.0/debian/patches/070_revert_gtk_iconview_layout.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
    desktop/unstable/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch
    desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=32444&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Wed Jan 25 11:31:09 2012
@@ -1,8 +1,11 @@
 gtk+2.0 (2.24.9-1) UNRELEASED; urgency=low
 
   * New upstream release.
-
- -- Michael Biebl <biebl at debian.org>  Wed, 25 Jan 2012 12:24:19 +0100
+  * Remove debian/patches/070_revert_gtk_iconview_layout.patch, merged
+    upstream.
+  * Update debian/patches/065_gir_set_packages.patch.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 25 Jan 2012 12:30:03 +0100
 
 gtk+2.0 (2.24.8-3) unstable; urgency=low
 

Modified: desktop/unstable/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/003_gdk.pc_privates.patch?rev=32444&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] Wed Jan 25 11:31:09 2012
@@ -1,8 +1,8 @@
-Index: gtk+-2.24.7/configure.in
+Index: gtk+-2.24.9/configure.in
 ===================================================================
---- gtk+-2.24.7.orig/configure.in	2011-10-18 07:59:56.724172795 +0200
-+++ gtk+-2.24.7/configure.in	2011-10-18 07:59:59.172142019 +0200
-@@ -1320,23 +1320,27 @@
+--- gtk+-2.24.9.orig/configure.in	2012-01-25 12:26:35.144442401 +0100
++++ gtk+-2.24.9/configure.in	2012-01-25 12:26:57.180441622 +0100
+@@ -1322,23 +1322,27 @@
  
  # Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
  if test "x$gdktarget" = "xx11"; then
@@ -35,10 +35,10 @@
  AC_SUBST(GDK_EXTRA_LIBS)
  AC_SUBST(GDK_EXTRA_CFLAGS)
  AC_SUBST(GDK_DEP_LIBS)
-Index: gtk+-2.24.7/gdk-2.0.pc.in
+Index: gtk+-2.24.9/gdk-2.0.pc.in
 ===================================================================
---- gtk+-2.24.7.orig/gdk-2.0.pc.in	2011-08-16 04:30:51.000000000 +0200
-+++ gtk+-2.24.7/gdk-2.0.pc.in	2011-10-18 07:59:59.176141969 +0200
+--- gtk+-2.24.9.orig/gdk-2.0.pc.in	2012-01-24 20:38:37.000000000 +0100
++++ gtk+-2.24.9/gdk-2.0.pc.in	2012-01-25 12:26:57.180441622 +0100
 @@ -8,5 +8,6 @@
  Description: GTK+ Drawing Kit (${target} target)
  Version: @VERSION@

Modified: desktop/unstable/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/005_support_disabling_x11_extensions.patch?rev=32444&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] Wed Jan 25 11:31:09 2012
@@ -3,10 +3,10 @@
 
 Support disabling X11 extensions
 
-Index: gtk+-2.24.6/configure.in
+Index: gtk+-2.24.9/configure.in
 ===================================================================
---- gtk+-2.24.6.orig/configure.in	2011-10-05 11:31:53.738123214 +0200
-+++ gtk+-2.24.6/configure.in	2011-10-05 11:31:56.410089622 +0200
+--- gtk+-2.24.9.orig/configure.in	2012-01-25 12:26:57.180441622 +0100
++++ gtk+-2.24.9/configure.in	2012-01-25 12:27:10.980441134 +0100
 @@ -242,6 +242,18 @@
                [AC_HELP_STRING([--enable-xinerama],
  	                      [support xinerama extension if available [default=yes]])],,
@@ -26,7 +26,7 @@
  AC_ARG_ENABLE(rebuilds,
                [AC_HELP_STRING([--disable-rebuilds],
                                [disable all source autogeneration rules])],,
-@@ -1188,7 +1200,8 @@
+@@ -1190,7 +1202,8 @@
    AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes)
  
    # Check for the RANDR extension
@@ -36,7 +36,7 @@
       AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
  
       X_PACKAGES="$X_PACKAGES xrandr"
-@@ -1204,7 +1217,8 @@
+@@ -1206,7 +1219,8 @@
  
    # Checks for XFixes extension
    
@@ -46,7 +46,7 @@
      AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
      
      X_PACKAGES="$X_PACKAGES xfixes"
-@@ -1213,7 +1227,8 @@
+@@ -1215,7 +1229,8 @@
  
    # Checks for Xcomposite extension
  
@@ -56,7 +56,7 @@
      AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
  
      X_PACKAGES="$X_PACKAGES xcomposite"
-@@ -1222,7 +1237,7 @@
+@@ -1224,7 +1239,7 @@
  
    # Checks for Xdamage extension
  

Modified: desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/065_gir_set_packages.patch?rev=32444&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch [utf-8] Wed Jan 25 11:31:09 2012
@@ -1,8 +1,8 @@
 === modified file 'gdk/Makefile.am'
-Index: gtk+-2.24.7/gdk/Makefile.am
+Index: gtk+-2.24.9/gdk/Makefile.am
 ===================================================================
---- gtk+-2.24.7.orig/gdk/Makefile.am	2011-08-16 04:30:51.000000000 +0200
-+++ gtk+-2.24.7/gdk/Makefile.am	2011-10-18 20:15:07.000000000 +0200
+--- gtk+-2.24.9.orig/gdk/Makefile.am	2012-01-24 20:38:37.000000000 +0100
++++ gtk+-2.24.9/gdk/Makefile.am	2012-01-25 12:29:30.928436184 +0100
 @@ -3,6 +3,7 @@
  -include $(INTROSPECTION_MAKEFILE)
  INTROSPECTION_GIRS =
@@ -11,7 +11,7 @@
     --add-include-path=../gdk
  INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(srcdir) \
-@@ -198,10 +199,11 @@
+@@ -199,10 +200,11 @@
          gdkenumtypes.h
  
  Gdk-2.0.gir: $(gdktargetlib) Makefile
@@ -24,7 +24,7 @@
  Gdk_2_0_gir_CFLAGS = $(INCLUDES)
  INTROSPECTION_GIRS += Gdk-2.0.gir
  
-@@ -239,10 +241,12 @@
+@@ -240,10 +242,12 @@
          x11/gdkx.h
  
  GdkX11-2.0.gir: $(gdktargetlib) Gdk-2.0.gir Makefile
@@ -39,10 +39,10 @@
  GdkX11_2_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
  INTROSPECTION_GIRS += GdkX11-2.0.gir
  
-Index: gtk+-2.24.7/gtk/Makefile.am
+Index: gtk+-2.24.9/gtk/Makefile.am
 ===================================================================
---- gtk+-2.24.7.orig/gtk/Makefile.am	2011-10-18 00:38:28.000000000 +0200
-+++ gtk+-2.24.7/gtk/Makefile.am	2011-10-18 20:15:07.000000000 +0200
+--- gtk+-2.24.9.orig/gtk/Makefile.am	2012-01-24 20:38:37.000000000 +0100
++++ gtk+-2.24.9/gtk/Makefile.am	2012-01-25 12:29:30.928436184 +0100
 @@ -3,6 +3,7 @@
  -include $(INTROSPECTION_MAKEFILE)
  INTROSPECTION_GIRS =
@@ -68,7 +68,7 @@
 @@ -1022,6 +1023,7 @@
  		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
  Gtk_2_0_gir_LIBS = $(gtktargetlib)
- Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+ Gtk_2_0_gir_FILES = $(introspection_files)
 +Gtk_2_0_gir_EXPORT_PACKAGES = gtk+-2.0
  INTROSPECTION_GIRS += Gtk-2.0.gir
  

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=32444&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series [utf-8] Wed Jan 25 11:31:09 2012
@@ -11,6 +11,5 @@
 044_tracker_fts.patch
 060_ignore-random-icons.patch
 061_use_pdf_as_default_printing_standard.patch
-070_revert_gtk_iconview_layout.patch
 065_gir_set_packages.patch
 098_multiarch_module_path.patch

More information about the pkg-gnome-commits mailing list