r15883 - in /desktop/unstable/gtk+2.0/debian: changelog patches/021_loader-files-d.patch patches/070_mandatory-relibtoolize.patch
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Sat May 10 22:09:25 UTC 2008
Author: lool
Date: Sat May 10 22:09:25 2008
New Revision: 15883
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15883
Log:
Update patch 021_loader-files-d to use PIXBUF_FILES_LIBDIR which is
defined in gdk-pixbuf/Makefile.am, similarly to PIXBUF_LIBDIR, and based
on the newly defined loaderfilesdir, similar to loaderdir; update
070_mandatory-relibtoolize.
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch
desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.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=15883&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sat May 10 22:09:25 2008
@@ -1,4 +1,4 @@
-gtk+2.0 (2.12.9-4) UNRELEASED; urgency=low
+gtk+2.0 (2.12.9-4) unstable; urgency=low
[ Loic Minier ]
* Flip back gdkpixbuf_module_files_d_str after gdkpixbuf_module_file_str in
@@ -32,6 +32,10 @@
[ Loic Minier ]
* Fix broken second dh_strip invocation which was not only acting on the
udeb but also on binary packages (-s -pUDEB should have been -pUDEB).
+ * Update patch 021_loader-files-d to use PIXBUF_FILES_LIBDIR which is
+ defined in gdk-pixbuf/Makefile.am, similarly to PIXBUF_LIBDIR, and based
+ on the newly defined loaderfilesdir, similar to loaderdir; update
+ 070_mandatory-relibtoolize.
-- Loic Minier <lool at dooz.org> Thu, 17 Apr 2008 12:34:24 +0200
Modified: desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/021_loader-files-d.patch?rev=15883&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch Sat May 10 22:09:25 2008
@@ -1,7 +1,5 @@
-Index: gtk+-2.12.1/gdk-pixbuf/gdk-pixbuf-io.c
-===================================================================
---- gtk+-2.12.1.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-11-04 12:35:24.378152677 +0100
-+++ gtk+-2.12.1/gdk-pixbuf/gdk-pixbuf-io.c 2007-11-04 12:38:15.659913468 +0100
+--- a/gdk-pixbuf/gdk-pixbuf-io.c 2008-03-12 05:17:00.000000000 +0100
++++ b/gdk-pixbuf/gdk-pixbuf-io.c 2008-05-10 23:14:29.000000000 +0200
@@ -45,6 +45,9 @@
#undef STRICT
#endif
@@ -12,7 +10,7 @@
static gint
format_check (GdkPixbufModule *module, guchar *buffer, int size)
{
-@@ -284,87 +287,95 @@ gdk_pixbuf_get_module_file (void)
+@@ -284,87 +287,95 @@
#endif /* USE_GMODULE */
@@ -178,7 +176,7 @@
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
const char *p;
-@@ -497,8 +508,140 @@ gdk_pixbuf_io_init (void)
+@@ -497,8 +508,134 @@
g_free (line_buf);
}
g_string_free (tmp_buf, TRUE);
@@ -194,11 +192,6 @@
+#ifdef USE_GMODULE
+ GIOChannel *channel;
+ gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
-+ /* FIXME: using an absolute path requires patching Makefile.am */
-+ gchar *gdkpixbuf_module_files_d_str = g_build_filename (PIXBUF_LIBDIR,
-+ "..",
-+ "loader-files.d",
-+ NULL);
+ gchar *list_str;
+ char **files;
+ GError *error = NULL;
@@ -262,7 +255,7 @@
+#ifdef USE_GMODULE
+ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
+ gdkpixbuf_module_file_str,
-+ gdkpixbuf_module_files_d_str,
++ PIXBUF_FILES_LIBDIR,
+ NULL);
+
+ files = _ugly_copy_of_pango_split_file_list (list_str);
@@ -316,8 +309,26 @@
+
+ g_strfreev (files);
+ g_free (list_str);
-+ g_free (gdkpixbuf_module_files_d_str);
+ g_free (gdkpixbuf_module_file_str);
#endif
}
+--- a/gdk-pixbuf/Makefile.am 2008-03-12 05:17:00.000000000 +0100
++++ b/gdk-pixbuf/Makefile.am 2008-05-10 23:14:06.000000000 +0200
+@@ -57,6 +57,7 @@
+ libgdk_pixbuf-2.0.la
+
+ loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
++loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d
+
+ module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+
+@@ -317,7 +318,7 @@
+ $(GDK_PIXBUF_DEP_CFLAGS) \
+ -DGDK_PIXBUF_ENABLE_BACKEND
+
+-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+
+ noinst_PROGRAMS = test-gdk-pixbuf
Modified: desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=15883&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch Sat May 10 22:09:25 2008
@@ -9,9 +9,8 @@
This is required because of patches touching autotools files, but also because
of upstream using an older libtool; see GNOME #484426; Debian #445001.
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/aclocal.m4 gtk+2.0-2.12.9/aclocal.m4
---- gtk+2.0-2.12.9.old/aclocal.m4 2008-03-12 05:17:55.000000000 +0100
-+++ gtk+2.0-2.12.9/aclocal.m4 2008-03-12 09:50:51.000000000 +0100
+--- a/aclocal.m4 2008-03-12 05:17:55.000000000 +0100
++++ b/aclocal.m4 2008-05-10 23:21:25.000000000 +0200
@@ -941,7 +941,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -652,9 +651,8 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/configure gtk+2.0-2.12.9/configure
---- gtk+2.0-2.12.9.old/configure 2008-03-12 05:18:17.000000000 +0100
-+++ gtk+2.0-2.12.9/configure 2008-03-12 09:50:58.000000000 +0100
+--- a/configure 2008-03-12 05:18:17.000000000 +0100
++++ b/configure 2008-05-10 23:21:25.000000000 +0200
@@ -863,6 +863,8 @@
CCDEPMODE
am__fastdepCC_TRUE
@@ -2656,9 +2654,8 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.12.9/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.12.9.old/contrib/gdk-pixbuf-xlib/Makefile.in 2008-03-12 05:18:08.000000000 +0100
-+++ gtk+2.0-2.12.9/contrib/gdk-pixbuf-xlib/Makefile.in 2008-03-12 09:50:59.000000000 +0100
+--- a/contrib/gdk-pixbuf-xlib/Makefile.in 2008-03-12 05:18:08.000000000 +0100
++++ b/contrib/gdk-pixbuf-xlib/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -2692,9 +2689,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/contrib/Makefile.in gtk+2.0-2.12.9/contrib/Makefile.in
---- gtk+2.0-2.12.9.old/contrib/Makefile.in 2008-03-12 05:18:08.000000000 +0100
-+++ gtk+2.0-2.12.9/contrib/Makefile.in 2008-03-12 09:50:59.000000000 +0100
+--- a/contrib/Makefile.in 2008-03-12 05:18:08.000000000 +0100
++++ b/contrib/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -81,6 +81,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -2728,9 +2724,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/demos/gtk-demo/Makefile.in gtk+2.0-2.12.9/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.12.9.old/demos/gtk-demo/Makefile.in 2008-03-12 05:18:08.000000000 +0100
-+++ gtk+2.0-2.12.9/demos/gtk-demo/Makefile.in 2008-03-12 09:50:59.000000000 +0100
+--- a/demos/gtk-demo/Makefile.in 2008-03-12 05:18:08.000000000 +0100
++++ b/demos/gtk-demo/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -2764,9 +2759,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/demos/Makefile.in gtk+2.0-2.12.9/demos/Makefile.in
---- gtk+2.0-2.12.9.old/demos/Makefile.in 2008-03-12 05:18:08.000000000 +0100
-+++ gtk+2.0-2.12.9/demos/Makefile.in 2008-03-12 09:50:59.000000000 +0100
+--- a/demos/Makefile.in 2008-03-12 05:18:08.000000000 +0100
++++ b/demos/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -81,6 +81,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -2800,9 +2794,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/docs/faq/Makefile.in gtk+2.0-2.12.9/docs/faq/Makefile.in
---- gtk+2.0-2.12.9.old/docs/faq/Makefile.in 2008-03-12 05:18:09.000000000 +0100
-+++ gtk+2.0-2.12.9/docs/faq/Makefile.in 2008-03-12 09:50:59.000000000 +0100
+--- a/docs/faq/Makefile.in 2008-03-12 05:18:09.000000000 +0100
++++ b/docs/faq/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -2836,9 +2829,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/docs/Makefile.in gtk+2.0-2.12.9/docs/Makefile.in
---- gtk+2.0-2.12.9.old/docs/Makefile.in 2008-03-12 05:18:09.000000000 +0100
-+++ gtk+2.0-2.12.9/docs/Makefile.in 2008-03-12 09:50:59.000000000 +0100
+--- a/docs/Makefile.in 2008-03-12 05:18:09.000000000 +0100
++++ b/docs/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -2872,9 +2864,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/docs/reference/gdk/Makefile.in gtk+2.0-2.12.9/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.12.9.old/docs/reference/gdk/Makefile.in 2008-03-12 05:18:09.000000000 +0100
-+++ gtk+2.0-2.12.9/docs/reference/gdk/Makefile.in 2008-03-12 09:51:00.000000000 +0100
+--- a/docs/reference/gdk/Makefile.in 2008-03-12 05:18:09.000000000 +0100
++++ b/docs/reference/gdk/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -86,6 +86,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -2908,9 +2899,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.12.9/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.12.9.old/docs/reference/gdk-pixbuf/Makefile.in 2008-03-12 05:18:09.000000000 +0100
-+++ gtk+2.0-2.12.9/docs/reference/gdk-pixbuf/Makefile.in 2008-03-12 09:51:00.000000000 +0100
+--- a/docs/reference/gdk-pixbuf/Makefile.in 2008-03-12 05:18:09.000000000 +0100
++++ b/docs/reference/gdk-pixbuf/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -86,6 +86,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -2944,9 +2934,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/docs/reference/gtk/Makefile.in gtk+2.0-2.12.9/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.12.9.old/docs/reference/gtk/Makefile.in 2008-03-12 05:18:09.000000000 +0100
-+++ gtk+2.0-2.12.9/docs/reference/gtk/Makefile.in 2008-03-12 09:51:00.000000000 +0100
+--- a/docs/reference/gtk/Makefile.in 2008-03-12 05:18:09.000000000 +0100
++++ b/docs/reference/gtk/Makefile.in 2008-05-10 23:21:40.000000000 +0200
@@ -86,6 +86,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -2980,9 +2969,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/docs/reference/Makefile.in gtk+2.0-2.12.9/docs/reference/Makefile.in
---- gtk+2.0-2.12.9.old/docs/reference/Makefile.in 2008-03-12 05:18:09.000000000 +0100
-+++ gtk+2.0-2.12.9/docs/reference/Makefile.in 2008-03-12 09:51:00.000000000 +0100
+--- a/docs/reference/Makefile.in 2008-03-12 05:18:09.000000000 +0100
++++ b/docs/reference/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3016,9 +3004,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/docs/tools/Makefile.in gtk+2.0-2.12.9/docs/tools/Makefile.in
---- gtk+2.0-2.12.9.old/docs/tools/Makefile.in 2008-03-12 05:18:10.000000000 +0100
-+++ gtk+2.0-2.12.9/docs/tools/Makefile.in 2008-03-12 09:51:00.000000000 +0100
+--- a/docs/tools/Makefile.in 2008-03-12 05:18:10.000000000 +0100
++++ b/docs/tools/Makefile.in 2008-05-10 23:21:40.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3052,9 +3039,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/docs/tutorial/Makefile.in gtk+2.0-2.12.9/docs/tutorial/Makefile.in
---- gtk+2.0-2.12.9.old/docs/tutorial/Makefile.in 2008-03-12 05:18:10.000000000 +0100
-+++ gtk+2.0-2.12.9/docs/tutorial/Makefile.in 2008-03-12 09:51:01.000000000 +0100
+--- a/docs/tutorial/Makefile.in 2008-03-12 05:18:10.000000000 +0100
++++ b/docs/tutorial/Makefile.in 2008-05-10 23:21:40.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3088,9 +3074,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gdk/directfb/Makefile.in gtk+2.0-2.12.9/gdk/directfb/Makefile.in
---- gtk+2.0-2.12.9.old/gdk/directfb/Makefile.in 2008-03-12 05:18:11.000000000 +0100
-+++ gtk+2.0-2.12.9/gdk/directfb/Makefile.in 2008-03-12 09:51:02.000000000 +0100
+--- a/gdk/directfb/Makefile.in 2008-03-12 05:18:11.000000000 +0100
++++ b/gdk/directfb/Makefile.in 2008-05-10 23:21:41.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3124,9 +3109,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gdk/Makefile.in gtk+2.0-2.12.9/gdk/Makefile.in
---- gtk+2.0-2.12.9.old/gdk/Makefile.in 2008-03-12 05:18:11.000000000 +0100
-+++ gtk+2.0-2.12.9/gdk/Makefile.in 2008-03-12 09:51:02.000000000 +0100
+--- a/gdk/Makefile.in 2008-03-12 05:18:11.000000000 +0100
++++ b/gdk/Makefile.in 2008-05-10 23:21:40.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3160,9 +3144,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gdk/quartz/Makefile.in gtk+2.0-2.12.9/gdk/quartz/Makefile.in
---- gtk+2.0-2.12.9.old/gdk/quartz/Makefile.in 2008-03-12 05:18:11.000000000 +0100
-+++ gtk+2.0-2.12.9/gdk/quartz/Makefile.in 2008-03-12 09:51:02.000000000 +0100
+--- a/gdk/quartz/Makefile.in 2008-03-12 05:18:11.000000000 +0100
++++ b/gdk/quartz/Makefile.in 2008-05-10 23:21:41.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3196,9 +3179,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gdk/win32/Makefile.in gtk+2.0-2.12.9/gdk/win32/Makefile.in
---- gtk+2.0-2.12.9.old/gdk/win32/Makefile.in 2008-03-12 05:18:11.000000000 +0100
-+++ gtk+2.0-2.12.9/gdk/win32/Makefile.in 2008-03-12 09:51:02.000000000 +0100
+--- a/gdk/win32/Makefile.in 2008-03-12 05:18:11.000000000 +0100
++++ b/gdk/win32/Makefile.in 2008-05-10 23:21:41.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3232,9 +3214,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gdk/win32/rc/Makefile.in gtk+2.0-2.12.9/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.12.9.old/gdk/win32/rc/Makefile.in 2008-03-12 05:18:11.000000000 +0100
-+++ gtk+2.0-2.12.9/gdk/win32/rc/Makefile.in 2008-03-12 09:51:02.000000000 +0100
+--- a/gdk/win32/rc/Makefile.in 2008-03-12 05:18:11.000000000 +0100
++++ b/gdk/win32/rc/Makefile.in 2008-05-10 23:21:41.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3268,9 +3249,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gdk/x11/Makefile.in gtk+2.0-2.12.9/gdk/x11/Makefile.in
---- gtk+2.0-2.12.9.old/gdk/x11/Makefile.in 2008-03-12 05:18:12.000000000 +0100
-+++ gtk+2.0-2.12.9/gdk/x11/Makefile.in 2008-03-12 09:51:02.000000000 +0100
+--- a/gdk/x11/Makefile.in 2008-03-12 05:18:12.000000000 +0100
++++ b/gdk/x11/Makefile.in 2008-05-10 23:21:41.000000000 +0200
@@ -82,6 +82,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3304,9 +3284,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gdk-pixbuf/Makefile.in gtk+2.0-2.12.9/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.12.9.old/gdk-pixbuf/Makefile.in 2008-03-12 05:18:10.000000000 +0100
-+++ gtk+2.0-2.12.9/gdk-pixbuf/Makefile.in 2008-03-12 09:51:01.000000000 +0100
+--- a/gdk-pixbuf/Makefile.in 2008-03-12 05:18:10.000000000 +0100
++++ b/gdk-pixbuf/Makefile.in 2008-05-10 23:21:40.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3340,9 +3319,25 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.12.9/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.12.9.old/gdk-pixbuf/pixops/Makefile.in 2008-03-12 05:18:11.000000000 +0100
-+++ gtk+2.0-2.12.9/gdk-pixbuf/pixops/Makefile.in 2008-03-12 09:51:01.000000000 +0100
+@@ -348,6 +353,7 @@
+
+
+ loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
++loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d
+
+ module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+
+@@ -557,7 +563,7 @@
+ -DGDK_PIXBUF_ENABLE_BACKEND
+
+
+-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+
+ noinst_PROGRAMS = test-gdk-pixbuf
+--- a/gdk-pixbuf/pixops/Makefile.in 2008-03-12 05:18:11.000000000 +0100
++++ b/gdk-pixbuf/pixops/Makefile.in 2008-05-10 23:21:40.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3376,9 +3371,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gtk/Makefile.in gtk+2.0-2.12.9/gtk/Makefile.in
---- gtk+2.0-2.12.9.old/gtk/Makefile.in 2008-03-12 05:18:12.000000000 +0100
-+++ gtk+2.0-2.12.9/gtk/Makefile.in 2008-03-12 09:51:03.000000000 +0100
+--- a/gtk/Makefile.in 2008-03-12 05:18:12.000000000 +0100
++++ b/gtk/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -104,6 +104,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3452,9 +3446,8 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gtk/theme-bits/Makefile.in gtk+2.0-2.12.9/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.12.9.old/gtk/theme-bits/Makefile.in 2008-03-12 05:18:12.000000000 +0100
-+++ gtk+2.0-2.12.9/gtk/theme-bits/Makefile.in 2008-03-12 09:51:04.000000000 +0100
+--- a/gtk/theme-bits/Makefile.in 2008-03-12 05:18:12.000000000 +0100
++++ b/gtk/theme-bits/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3488,9 +3481,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/gtk/xdgmime/Makefile.in gtk+2.0-2.12.9/gtk/xdgmime/Makefile.in
---- gtk+2.0-2.12.9.old/gtk/xdgmime/Makefile.in 2008-03-12 05:18:12.000000000 +0100
-+++ gtk+2.0-2.12.9/gtk/xdgmime/Makefile.in 2008-03-12 09:51:04.000000000 +0100
+--- a/gtk/xdgmime/Makefile.in 2008-03-12 05:18:12.000000000 +0100
++++ b/gtk/xdgmime/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3524,9 +3516,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/ltmain.sh gtk+2.0-2.12.9/ltmain.sh
---- gtk+2.0-2.12.9.old/ltmain.sh 2008-01-30 21:26:55.000000000 +0100
-+++ gtk+2.0-2.12.9/ltmain.sh 2008-02-02 14:28:24.000000000 +0100
+--- a/ltmain.sh 2008-01-30 21:26:55.000000000 +0100
++++ b/ltmain.sh 2008-05-10 23:21:26.000000000 +0200
@@ -2,7 +2,7 @@
# NOTE: Changing this file will not affect anything until you rerun configure.
#
@@ -3720,9 +3711,8 @@
do
eval "if test \"\${save_$lt_var+set}\" = set; then
$lt_var=\$save_$lt_var; export $lt_var
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/m4macros/Makefile.in gtk+2.0-2.12.9/m4macros/Makefile.in
---- gtk+2.0-2.12.9.old/m4macros/Makefile.in 2008-03-12 05:18:13.000000000 +0100
-+++ gtk+2.0-2.12.9/m4macros/Makefile.in 2008-03-12 09:51:04.000000000 +0100
+--- a/m4macros/Makefile.in 2008-03-12 05:18:13.000000000 +0100
++++ b/m4macros/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3756,9 +3746,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/Makefile.in gtk+2.0-2.12.9/Makefile.in
---- gtk+2.0-2.12.9.old/Makefile.in 2008-03-12 05:18:08.000000000 +0100
-+++ gtk+2.0-2.12.9/Makefile.in 2008-03-12 09:50:59.000000000 +0100
+--- a/Makefile.in 2008-03-12 05:18:08.000000000 +0100
++++ b/Makefile.in 2008-05-10 23:21:39.000000000 +0200
@@ -81,6 +81,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3830,9 +3819,8 @@
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/engines/Makefile.in gtk+2.0-2.12.9/modules/engines/Makefile.in
---- gtk+2.0-2.12.9.old/modules/engines/Makefile.in 2008-03-12 05:18:13.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/engines/Makefile.in 2008-03-12 09:51:04.000000000 +0100
+--- a/modules/engines/Makefile.in 2008-03-12 05:18:13.000000000 +0100
++++ b/modules/engines/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3866,9 +3854,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.12.9/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.12.9.old/modules/engines/ms-windows/Makefile.in 2008-03-12 05:18:13.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/engines/ms-windows/Makefile.in 2008-03-12 09:51:05.000000000 +0100
+--- a/modules/engines/ms-windows/Makefile.in 2008-03-12 05:18:13.000000000 +0100
++++ b/modules/engines/ms-windows/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3902,9 +3889,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.12.9/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.12.9.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-03-12 05:18:13.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-03-12 09:51:05.000000000 +0100
+--- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-03-12 05:18:13.000000000 +0100
++++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3938,9 +3924,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.12.9/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.12.9.old/modules/engines/ms-windows/Theme/Makefile.in 2008-03-12 05:18:13.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/engines/ms-windows/Theme/Makefile.in 2008-03-12 09:51:05.000000000 +0100
+--- a/modules/engines/ms-windows/Theme/Makefile.in 2008-03-12 05:18:13.000000000 +0100
++++ b/modules/engines/ms-windows/Theme/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -3974,9 +3959,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.12.9/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.12.9.old/modules/engines/pixbuf/Makefile.in 2008-03-12 05:18:13.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/engines/pixbuf/Makefile.in 2008-03-12 09:51:05.000000000 +0100
+--- a/modules/engines/pixbuf/Makefile.in 2008-03-12 05:18:13.000000000 +0100
++++ b/modules/engines/pixbuf/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -4010,9 +3994,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/input/Makefile.in gtk+2.0-2.12.9/modules/input/Makefile.in
---- gtk+2.0-2.12.9.old/modules/input/Makefile.in 2008-03-12 05:18:14.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/input/Makefile.in 2008-03-12 09:51:05.000000000 +0100
+--- a/modules/input/Makefile.in 2008-03-12 05:18:14.000000000 +0100
++++ b/modules/input/Makefile.in 2008-05-10 23:21:43.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -4078,9 +4061,8 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/Makefile.in gtk+2.0-2.12.9/modules/Makefile.in
---- gtk+2.0-2.12.9.old/modules/Makefile.in 2008-03-12 05:18:13.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/Makefile.in 2008-03-12 09:51:04.000000000 +0100
+--- a/modules/Makefile.in 2008-03-12 05:18:13.000000000 +0100
++++ b/modules/Makefile.in 2008-05-10 23:21:42.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -4114,9 +4096,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.12.9/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.12.9.old/modules/printbackends/cups/Makefile.in 2008-03-12 05:18:14.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/printbackends/cups/Makefile.in 2008-03-12 09:51:06.000000000 +0100
+--- a/modules/printbackends/cups/Makefile.in 2008-03-12 05:18:14.000000000 +0100
++++ b/modules/printbackends/cups/Makefile.in 2008-05-10 23:21:43.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -4150,9 +4131,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/printbackends/file/Makefile.in gtk+2.0-2.12.9/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.12.9.old/modules/printbackends/file/Makefile.in 2008-03-12 05:18:14.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/printbackends/file/Makefile.in 2008-03-12 09:51:06.000000000 +0100
+--- a/modules/printbackends/file/Makefile.in 2008-03-12 05:18:14.000000000 +0100
++++ b/modules/printbackends/file/Makefile.in 2008-05-10 23:21:43.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -4186,9 +4166,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.12.9/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.12.9.old/modules/printbackends/lpr/Makefile.in 2008-03-12 05:18:14.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/printbackends/lpr/Makefile.in 2008-03-12 09:51:06.000000000 +0100
+--- a/modules/printbackends/lpr/Makefile.in 2008-03-12 05:18:14.000000000 +0100
++++ b/modules/printbackends/lpr/Makefile.in 2008-05-10 23:21:43.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -4222,9 +4201,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/printbackends/Makefile.in gtk+2.0-2.12.9/modules/printbackends/Makefile.in
---- gtk+2.0-2.12.9.old/modules/printbackends/Makefile.in 2008-03-12 05:18:14.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/printbackends/Makefile.in 2008-03-12 09:51:05.000000000 +0100
+--- a/modules/printbackends/Makefile.in 2008-03-12 05:18:14.000000000 +0100
++++ b/modules/printbackends/Makefile.in 2008-05-10 23:21:43.000000000 +0200
@@ -82,6 +82,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -4258,9 +4236,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/modules/printbackends/test/Makefile.in gtk+2.0-2.12.9/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.12.9.old/modules/printbackends/test/Makefile.in 2008-03-12 05:18:14.000000000 +0100
-+++ gtk+2.0-2.12.9/modules/printbackends/test/Makefile.in 2008-03-12 09:51:06.000000000 +0100
+--- a/modules/printbackends/test/Makefile.in 2008-03-12 05:18:14.000000000 +0100
++++ b/modules/printbackends/test/Makefile.in 2008-05-10 23:21:43.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -4294,9 +4271,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/perf/Makefile.in gtk+2.0-2.12.9/perf/Makefile.in
---- gtk+2.0-2.12.9.old/perf/Makefile.in 2008-03-12 05:18:14.000000000 +0100
-+++ gtk+2.0-2.12.9/perf/Makefile.in 2008-03-12 09:51:06.000000000 +0100
+--- a/perf/Makefile.in 2008-03-12 05:18:14.000000000 +0100
++++ b/perf/Makefile.in 2008-05-10 23:21:43.000000000 +0200
@@ -80,6 +80,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
@@ -4330,9 +4306,8 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_LINUX_FALSE = @OS_LINUX_FALSE@
-diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.9.old/tests/Makefile.in gtk+2.0-2.12.9/tests/Makefile.in
---- gtk+2.0-2.12.9.old/tests/Makefile.in 2008-03-12 05:18:15.000000000 +0100
-+++ gtk+2.0-2.12.9/tests/Makefile.in 2008-03-12 09:51:07.000000000 +0100
+--- a/tests/Makefile.in 2008-03-12 05:18:15.000000000 +0100
++++ b/tests/Makefile.in 2008-05-10 23:21:44.000000000 +0200
@@ -83,6 +83,7 @@
DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@
DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@
More information about the pkg-gnome-commits
mailing list