summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2010-09-06 22:35:23 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2010-09-06 22:35:23 +0200
commita6ebf5113dfa2d74906525574e2bf2dc6028e027 (patch)
treefc3c0aa9c1ab9a50e5402ca10d95791a000524a4
parentabc993a6c08d6c20aa747828f3102bba19951835 (diff)
Update 99_autoreconf.patch
-rw-r--r--debian/patches/99_autoreconf.patch96
1 files changed, 48 insertions, 48 deletions
diff --git a/debian/patches/99_autoreconf.patch b/debian/patches/99_autoreconf.patch
index 29e9b07..b712eae 100644
--- a/debian/patches/99_autoreconf.patch
+++ b/debian/patches/99_autoreconf.patch
@@ -1,7 +1,7 @@
Index: cairo/config.h.in
===================================================================
---- cairo.orig/config.h.in 2010-09-06 21:06:47.484406771 +0200
-+++ cairo/config.h.in 2010-09-06 21:04:18.100407126 +0200
+--- cairo.orig/config.h.in 2010-09-06 22:34:50.735409538 +0200
++++ cairo/config.h.in 2010-09-06 22:34:13.144417114 +0200
@@ -23,6 +23,9 @@
/* Define to 1 to enable cairo's cairo-script-interpreter feature */
#undef CAIRO_HAS_INTERPRETER
@@ -14,8 +14,8 @@ Index: cairo/config.h.in
Index: cairo/configure
===================================================================
---- cairo.orig/configure 2010-09-06 21:06:44.927438562 +0200
-+++ cairo/configure 2010-09-06 21:04:23.599406230 +0200
+--- cairo.orig/configure 2010-09-06 22:34:48.587409384 +0200
++++ cairo/configure 2010-09-06 22:34:19.084406910 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -3983,8 +3983,8 @@ Index: cairo/configure
echo " pthread: $use_pthread"
Index: cairo/perf/Makefile.in
===================================================================
---- cairo.orig/perf/Makefile.in 2010-09-06 21:06:47.752423923 +0200
-+++ cairo/perf/Makefile.in 2010-09-06 21:04:19.391405976 +0200
+--- cairo.orig/perf/Makefile.in 2010-09-06 22:34:50.859408682 +0200
++++ cairo/perf/Makefile.in 2010-09-06 22:34:14.555406437 +0200
@@ -14,6 +14,7 @@
# PARTICULAR PURPOSE.
@@ -4179,8 +4179,8 @@ Index: cairo/perf/Makefile.in
# Install rules to rebuild the libraries and add explicit dependencies
Index: cairo/Makefile.in
===================================================================
---- cairo.orig/Makefile.in 2010-09-06 21:06:47.544439401 +0200
-+++ cairo/Makefile.in 2010-09-06 21:04:22.436407441 +0200
+--- cairo.orig/Makefile.in 2010-09-06 22:34:50.767407950 +0200
++++ cairo/Makefile.in 2010-09-06 22:34:17.691408346 +0200
@@ -341,6 +341,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -4191,8 +4191,8 @@ Index: cairo/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/aclocal.m4
===================================================================
---- cairo.orig/aclocal.m4 2010-09-06 21:06:47.432421599 +0200
-+++ cairo/aclocal.m4 2010-09-06 21:04:16.199408386 +0200
+--- cairo.orig/aclocal.m4 2010-09-06 22:34:50.704407973 +0200
++++ cairo/aclocal.m4 2010-09-06 22:34:11.264406522 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -4206,7 +4206,7 @@ Index: cairo/aclocal.m4
To do so, use the procedure documented by the package, typically `autoreconf'.])])
Index: cairo/boilerplate/Makefile.am.features
===================================================================
---- cairo.orig/boilerplate/Makefile.am.features 2010-09-06 21:06:39.871409910 +0200
+--- cairo.orig/boilerplate/Makefile.am.features 2010-09-06 22:34:44.223406959 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,499 +0,0 @@
-# Generated by configure. Do not edit.
@@ -4710,8 +4710,8 @@ Index: cairo/boilerplate/Makefile.am.features
-endif
Index: cairo/boilerplate/Makefile.in
===================================================================
---- cairo.orig/boilerplate/Makefile.in 2010-09-06 21:06:39.967419959 +0200
-+++ cairo/boilerplate/Makefile.in 2010-09-06 21:04:18.992406530 +0200
+--- cairo.orig/boilerplate/Makefile.in 2010-09-06 22:34:44.339408998 +0200
++++ cairo/boilerplate/Makefile.in 2010-09-06 22:34:14.071406096 +0200
@@ -16,14 +16,6 @@
@SET_MAKE@
@@ -5501,8 +5501,8 @@ Index: cairo/boilerplate/Makefile.in
Index: cairo/build/libtool.m4
===================================================================
---- cairo.orig/build/libtool.m4 2010-09-06 21:06:45.824408143 +0200
-+++ cairo/build/libtool.m4 2010-09-06 21:04:11.016422847 +0200
+--- cairo.orig/build/libtool.m4 2010-09-06 22:34:49.243409228 +0200
++++ cairo/build/libtool.m4 2010-09-06 22:34:06.488422499 +0200
@@ -1,8 +1,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
@@ -7587,8 +7587,8 @@ Index: cairo/build/libtool.m4
# func_arith arithmetic-term...
Index: cairo/build/ltmain.sh
===================================================================
---- cairo.orig/build/ltmain.sh 2010-09-06 21:06:45.768408566 +0200
-+++ cairo/build/ltmain.sh 2010-09-06 21:04:10.924426234 +0200
+--- cairo.orig/build/ltmain.sh 2010-09-06 22:34:49.183419063 +0200
++++ cairo/build/ltmain.sh 2010-09-06 22:34:06.412407733 +0200
@@ -1,10 +1,9 @@
# Generated from ltmain.m4sh.
@@ -10693,8 +10693,8 @@ Index: cairo/build/ltmain.sh
# $outputname - a libtool library file
Index: cairo/build/ltoptions.m4
===================================================================
---- cairo.orig/build/ltoptions.m4 2010-09-06 21:06:45.940409207 +0200
-+++ cairo/build/ltoptions.m4 2010-09-06 21:04:11.152408419 +0200
+--- cairo.orig/build/ltoptions.m4 2010-09-06 22:34:49.371420125 +0200
++++ cairo/build/ltoptions.m4 2010-09-06 22:34:06.616410202 +0200
@@ -1,14 +1,13 @@
# Helper functions for option handling. -*- Autoconf -*-
#
@@ -10740,8 +10740,8 @@ Index: cairo/build/ltoptions.m4
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
Index: cairo/build/ltversion.m4
===================================================================
---- cairo.orig/build/ltversion.m4 2010-09-06 21:06:45.876408678 +0200
-+++ cairo/build/ltversion.m4 2010-09-06 21:04:11.428409495 +0200
+--- cairo.orig/build/ltversion.m4 2010-09-06 22:34:49.291407859 +0200
++++ cairo/build/ltversion.m4 2010-09-06 22:34:06.848422507 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
@@ -10765,8 +10765,8 @@ Index: cairo/build/ltversion.m4
])
Index: cairo/build/lt~obsolete.m4
===================================================================
---- cairo.orig/build/lt~obsolete.m4 2010-09-06 21:06:45.716412989 +0200
-+++ cairo/build/lt~obsolete.m4 2010-09-06 21:04:11.532419576 +0200
+--- cairo.orig/build/lt~obsolete.m4 2010-09-06 22:34:49.147409742 +0200
++++ cairo/build/lt~obsolete.m4 2010-09-06 22:34:06.947408698 +0200
@@ -1,13 +1,13 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
@@ -10804,8 +10804,8 @@ Index: cairo/build/lt~obsolete.m4
-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
Index: cairo/doc/Makefile.in
===================================================================
---- cairo.orig/doc/Makefile.in 2010-09-06 21:06:47.324407376 +0200
-+++ cairo/doc/Makefile.in 2010-09-06 21:04:19.064405904 +0200
+--- cairo.orig/doc/Makefile.in 2010-09-06 22:34:50.644407685 +0200
++++ cairo/doc/Makefile.in 2010-09-06 22:34:14.192407496 +0200
@@ -287,6 +287,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -10816,8 +10816,8 @@ Index: cairo/doc/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/doc/public/Makefile.in
===================================================================
---- cairo.orig/doc/public/Makefile.in 2010-09-06 21:06:47.268409685 +0200
-+++ cairo/doc/public/Makefile.in 2010-09-06 21:04:19.167407742 +0200
+--- cairo.orig/doc/public/Makefile.in 2010-09-06 22:34:50.535409482 +0200
++++ cairo/doc/public/Makefile.in 2010-09-06 22:34:14.291406812 +0200
@@ -15,59 +15,6 @@
@SET_MAKE@
@@ -11513,7 +11513,7 @@ Index: cairo/doc/public/Makefile.in
*$$dep*) \
Index: cairo/src/Makefile.am.features
===================================================================
---- cairo.orig/src/Makefile.am.features 2010-09-06 21:06:46.124417158 +0200
+--- cairo.orig/src/Makefile.am.features 2010-09-06 22:34:49.555409928 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,637 +0,0 @@
-# Generated by configure. Do not edit.
@@ -12155,8 +12155,8 @@ Index: cairo/src/Makefile.am.features
-endif
Index: cairo/src/Makefile.in
===================================================================
---- cairo.orig/src/Makefile.in 2010-09-06 21:06:46.824408773 +0200
-+++ cairo/src/Makefile.in 2010-09-06 21:04:19.539407477 +0200
+--- cairo.orig/src/Makefile.in 2010-09-06 22:34:50.091407868 +0200
++++ cairo/src/Makefile.in 2010-09-06 22:34:14.716407613 +0200
@@ -17,59 +17,6 @@
# Note: All source files are listed in Makefile.sources.
@@ -13672,8 +13672,8 @@ Index: cairo/src/Makefile.in
Index: cairo/test/Makefile.in
===================================================================
---- cairo.orig/test/Makefile.in 2010-09-06 21:06:44.627435907 +0200
-+++ cairo/test/Makefile.in 2010-09-06 21:04:21.243409368 +0200
+--- cairo.orig/test/Makefile.in 2010-09-06 22:34:48.307408287 +0200
++++ cairo/test/Makefile.in 2010-09-06 22:34:16.583411042 +0200
@@ -878,6 +878,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -13684,8 +13684,8 @@ Index: cairo/test/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/test/pdiff/Makefile.in
===================================================================
---- cairo.orig/test/pdiff/Makefile.in 2010-09-06 21:06:40.787409374 +0200
-+++ cairo/test/pdiff/Makefile.in 2010-09-06 21:04:21.363406606 +0200
+--- cairo.orig/test/pdiff/Makefile.in 2010-09-06 22:34:45.175406592 +0200
++++ cairo/test/pdiff/Makefile.in 2010-09-06 22:34:16.691407508 +0200
@@ -282,6 +282,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -13696,8 +13696,8 @@ Index: cairo/test/pdiff/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/util/Makefile.in
===================================================================
---- cairo.orig/util/Makefile.in 2010-09-06 21:06:40.431406869 +0200
-+++ cairo/util/Makefile.in 2010-09-06 21:04:21.524408922 +0200
+--- cairo.orig/util/Makefile.in 2010-09-06 22:34:44.803406659 +0200
++++ cairo/util/Makefile.in 2010-09-06 22:34:16.835409053 +0200
@@ -368,6 +368,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -13708,8 +13708,8 @@ Index: cairo/util/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/util/cairo-fdr/Makefile.in
===================================================================
---- cairo.orig/util/cairo-fdr/Makefile.in 2010-09-06 21:06:40.371419840 +0200
-+++ cairo/util/cairo-fdr/Makefile.in 2010-09-06 21:04:21.748406302 +0200
+--- cairo.orig/util/cairo-fdr/Makefile.in 2010-09-06 22:34:44.751415691 +0200
++++ cairo/util/cairo-fdr/Makefile.in 2010-09-06 22:34:16.931409109 +0200
@@ -296,6 +296,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -13720,8 +13720,8 @@ Index: cairo/util/cairo-fdr/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/util/cairo-gobject/Makefile.in
===================================================================
---- cairo.orig/util/cairo-gobject/Makefile.in 2010-09-06 21:06:40.099407407 +0200
-+++ cairo/util/cairo-gobject/Makefile.in 2010-09-06 21:04:21.871406226 +0200
+--- cairo.orig/util/cairo-gobject/Makefile.in 2010-09-06 22:34:44.467406629 +0200
++++ cairo/util/cairo-gobject/Makefile.in 2010-09-06 22:34:17.039408453 +0200
@@ -304,6 +304,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -13732,8 +13732,8 @@ Index: cairo/util/cairo-gobject/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/util/cairo-script/Makefile.in
===================================================================
---- cairo.orig/util/cairo-script/Makefile.in 2010-09-06 21:06:40.203407770 +0200
-+++ cairo/util/cairo-script/Makefile.in 2010-09-06 21:04:21.995407400 +0200
+--- cairo.orig/util/cairo-script/Makefile.in 2010-09-06 22:34:44.663407232 +0200
++++ cairo/util/cairo-script/Makefile.in 2010-09-06 22:34:17.239412351 +0200
@@ -377,6 +377,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -13744,8 +13744,8 @@ Index: cairo/util/cairo-script/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/util/cairo-script/examples/Makefile.in
===================================================================
---- cairo.orig/util/cairo-script/examples/Makefile.in 2010-09-06 21:06:40.155416547 +0200
-+++ cairo/util/cairo-script/examples/Makefile.in 2010-09-06 21:04:22.072410552 +0200
+--- cairo.orig/util/cairo-script/examples/Makefile.in 2010-09-06 22:34:44.595409141 +0200
++++ cairo/util/cairo-script/examples/Makefile.in 2010-09-06 22:34:17.323407458 +0200
@@ -241,6 +241,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -13756,8 +13756,8 @@ Index: cairo/util/cairo-script/examples/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/util/cairo-sphinx/Makefile.in
===================================================================
---- cairo.orig/util/cairo-sphinx/Makefile.in 2010-09-06 21:06:40.291408971 +0200
-+++ cairo/util/cairo-sphinx/Makefile.in 2010-09-06 21:04:22.175406383 +0200
+--- cairo.orig/util/cairo-sphinx/Makefile.in 2010-09-06 22:34:44.707416733 +0200
++++ cairo/util/cairo-sphinx/Makefile.in 2010-09-06 22:34:17.443408121 +0200
@@ -306,6 +306,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -13768,8 +13768,8 @@ Index: cairo/util/cairo-sphinx/Makefile.in
mkdir_p = @mkdir_p@
Index: cairo/util/cairo-trace/Makefile.in
===================================================================
---- cairo.orig/util/cairo-trace/Makefile.in 2010-09-06 21:06:40.047407783 +0200
-+++ cairo/util/cairo-trace/Makefile.in 2010-09-06 21:04:22.332406856 +0200
+--- cairo.orig/util/cairo-trace/Makefile.in 2010-09-06 22:34:44.415406929 +0200
++++ cairo/util/cairo-trace/Makefile.in 2010-09-06 22:34:17.563408780 +0200
@@ -314,6 +314,7 @@
libexecdir = @libexecdir@
localedir = @localedir@