Revert r13650, apps using X calls should link to X11 themselves

debian/changelog

@@ -1,18 +1,11 @@
 gtk+2.0 (2.12.2-1) UNRELEASED; urgency=low
 
-  [ Sebastian Dröge ]
   * New upstream stable release; no API change; bug fixes and translation
     updated.
     - Drop patches 034_gtkcupsutils_type_fix, 071_fix_gdk_window_null_crasher
       fixed upstream.
     - Update relibtoolizing patch, 070_mandatory-relibtoolize.
 
-  [ Josselin Mouette ]
-  * 003_gdk.pc_privates.patch: consider x11 as a public dependency and
-    not a private one, because gdkx.h #include's some of its headers and
-    packages can therefore use X11 functions. Closes: #453178.
-  * Refresh other patches; regenerate 070_mandatory-relibtoolize.
-
  -- Sebastian Dröge <slomo@debian.org>  Tue, 27 Nov 2007 05:15:01 +0100
 
 gtk+2.0 (2.12.1-3) unstable; urgency=low

debian/patches/003_gdk.pc_privates.patch

@@ -1,23 +1,12 @@
-Index: gtk+-2.12.2/configure.in
+Index: gtk+-2.12.1/configure.in
 ===================================================================
---- gtk+-2.12.2.orig/configure.in	2007-11-27 22:53:31.661288266 +0100
+--- gtk+-2.12.1.orig/configure.in	2007-11-18 00:51:06.548600130 +0100
-+++ gtk+-2.12.2/configure.in	2007-11-27 23:04:39.479345048 +0100
++++ gtk+-2.12.1/configure.in	2007-11-18 01:06:06.279872893 +0100
-@@ -1085,7 +1085,8 @@ if test "x$gdktarget" = "xx11"; then
+@@ -1459,21 +1459,23 @@ LDFLAGS="$saved_ldflags"
-   #
-   if $PKG_CONFIG --exists x11 xext xrender; then
-     have_base_x_pc=true
--    X_PACKAGES="$X_PACKAGES x11 xext xrender"
-+    X_BASE_PACKAGES=x11
-+    X_PACKAGES="$X_PACKAGES xext xrender"
-     x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
-     X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
-     
-@@ -1459,21 +1460,25 @@ LDFLAGS="$saved_ldflags"
  
  GDK_PACKAGES="$PANGO_PACKAGES"
  if test "x$gdktarget" = "xx11"; then
 -  GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
-+  GDK_PACKAGES="$GDK_PACKAGES $X_BASE_PACKAGES"
 +  GDK_PRIVATE_PACKAGES="$X_PACKAGES"
  fi
 -GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
@@ -34,7 +23,6 @@ Index: gtk+-2.12.2/configure.in
    GDK_EXTRA_LIBS=
 +else
 +  GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
-+  GDK_PRIVATE_PACKAGES=
  fi
  
  AC_SUBST(GDK_PACKAGES)
@@ -42,10 +30,10 @@ Index: gtk+-2.12.2/configure.in
  AC_SUBST(GDK_EXTRA_LIBS)
  AC_SUBST(GDK_EXTRA_CFLAGS)
  AC_SUBST(GDK_DEP_LIBS)
-Index: gtk+-2.12.2/gdk-2.0.pc.in
+Index: gtk+-2.12.1/gdk-2.0.pc.in
 ===================================================================
---- gtk+-2.12.2.orig/gdk-2.0.pc.in	2007-11-26 20:40:52.000000000 +0100
+--- gtk+-2.12.1.orig/gdk-2.0.pc.in	2007-11-17 23:53:16.038827049 +0100
-+++ gtk+-2.12.2/gdk-2.0.pc.in	2007-11-27 22:53:32.877357566 +0100
++++ gtk+-2.12.1/gdk-2.0.pc.in	2007-11-18 01:06:30.821271428 +0100
 @@ -8,5 +8,6 @@ Name: GDK
  Description: GIMP Drawing Kit (${target} target)
  Version: @VERSION@

debian/patches/006_proper-directfb-modules.patch

@@ -1,10 +1,10 @@
 GNOME #447118; related to Debian #381081
 
-Index: gtk+-2.12.2/configure.in
+Index: gtk+-2.12.1/configure.in
 ===================================================================
---- gtk+-2.12.2.orig/configure.in	2007-11-27 23:06:22.533217754 +0100
+--- gtk+-2.12.1.orig/configure.in	2007-11-18 00:52:41.125989789 +0100
-+++ gtk+-2.12.2/configure.in	2007-11-27 23:06:23.961299135 +0100
++++ gtk+-2.12.1/configure.in	2007-11-18 00:53:48.389822936 +0100
-@@ -1405,8 +1405,18 @@ if test "x$gdktarget" = "xdirectfb"; the
+@@ -1404,8 +1404,18 @@ if test "x$gdktarget" = "xdirectfb"; the
  
    if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
        AC_MSG_RESULT(found)
@@ -25,12 +25,12 @@ Index: gtk+-2.12.2/configure.in
    else
        AC_MSG_ERROR([
  *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend 
-@@ -1458,7 +1468,7 @@ fi
+@@ -1457,7 +1467,7 @@ fi
  CFLAGS="$saved_cflags"
  LDFLAGS="$saved_ldflags"
  
 -GDK_PACKAGES="$PANGO_PACKAGES"
 +GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES"
  if test "x$gdktarget" = "xx11"; then
-   GDK_PACKAGES="$GDK_PACKAGES $X_BASE_PACKAGES"
    GDK_PRIVATE_PACKAGES="$X_PACKAGES"
+ fi

debian/patches/010_gdkpixbuf_-lm.patch

@@ -1,8 +1,8 @@
-Index: gtk+-2.12.2/configure.in
+Index: gtk+-2.12.1/configure.in
 ===================================================================
---- gtk+-2.12.2.orig/configure.in	2007-11-27 23:06:23.961299135 +0100
+--- gtk+-2.12.1.orig/configure.in	2007-11-18 01:23:24.599043331 +0100
-+++ gtk+-2.12.2/configure.in	2007-11-27 23:06:56.411148347 +0100
++++ gtk+-2.12.1/configure.in	2007-11-18 01:23:24.695048802 +0100
-@@ -1540,7 +1540,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr
+@@ -1537,7 +1537,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr
  CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
  
  if test $enable_explicit_deps != yes ; then