r20997 - in /desktop/experimental/gtk+2.0/debian: changelog patches/001_static-linking-dont-query-immodules.patch patches/002_static-linking-dont-build-perf.patch patches/005_xpmico.patch patches/series

[pochu-guest at users.alioth.debian.org]

Author: pochu-guest
Date: Wed Aug 19 01:10:00 2009
New Revision: 20997

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20997
Log:
* debian/patches/005_xpmico.patch:
  - Removed, this check is not needed as HeaderSize can't overflow because
    IconCount will be at most 16 bits, and that multiplied by 16 is not
    enough to overflow an integer. (Checked with upstream)
* debian/patches/001_static-linking-dont-query-immodules.patch,
  debian/patches/002_static-linking-dont-build-perf.patch:
  - Add headers.

Removed:
    desktop/experimental/gtk+2.0/debian/patches/005_xpmico.patch
Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
    desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch
    desktop/experimental/gtk+2.0/debian/patches/series

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=20997&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Wed Aug 19 01:10:00 2009
@@ -10,6 +10,13 @@
     - Remove conflicts and replaces no longer needed for packages in stable.
   * debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch:
     - Removed, GtkFileSelection is deprecated.
+  * debian/patches/005_xpmico.patch:
+    - Removed, this check is not needed as HeaderSize can't overflow because
+      IconCount will be at most 16 bits, and that multiplied by 16 is not
+      enough to overflow an integer. (Checked with upstream)
+  * debian/patches/001_static-linking-dont-query-immodules.patch,
+    debian/patches/002_static-linking-dont-build-perf.patch:
+    - Add headers.
   * debian/patches/*
     - Refreshed.
 

Modified: desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=20997&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] Wed Aug 19 01:10:00 2009
@@ -1,3 +1,7 @@
+Description: Don't query immodules for the local tree when cross-compiling or
+             when --disable-shared was given
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
+
 --- a/configure.in
 +++ b/configure.in
 @@ -157,6 +157,7 @@

Modified: desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/002_static-linking-dont-build-perf.patch?rev=20997&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch [utf-8] Wed Aug 19 01:10:00 2009
@@ -1,3 +1,6 @@
+Description: don't build perf measurement tools in static builds
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346559
+
 Index: gtk+-2.14.7/Makefile.am
 ===================================================================
 --- gtk+-2.14.7.orig/Makefile.am	2009-01-07 17:33:57.000000000 +0100

Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=20997&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series [utf-8] Wed Aug 19 01:10:00 2009
@@ -1,7 +1,6 @@
 001_static-linking-dont-query-immodules.patch
 002_static-linking-dont-build-perf.patch
 003_gdk.pc_privates.patch
-005_xpmico.patch
 009_gtk-export-filechooser.patch
 010_gdkpixbuf_-lm.patch
 015_default-fallback-icon-theme.patch