r22830 - in /desktop/unstable/epiphany-browser/debian: changelog patches/91_gtk-doc-1.13.patch patches/99_autoreconf.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Wed Jan 20 08:39:17 UTC 2010
Author: pochu
Date: Wed Jan 20 08:39:15 2010
New Revision: 22830
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22830
Log:
* debian/patches/91_gtk-doc-1.13.patch:
- Removed, gtk-doc has been fixed so this is no longer needed.
* debian/patches/99_autoreconf.patch:
- Regenerated.
Removed:
desktop/unstable/epiphany-browser/debian/patches/91_gtk-doc-1.13.patch
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
desktop/unstable/epiphany-browser/debian/patches/series
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=22830&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Wed Jan 20 08:39:15 2010
@@ -1,3 +1,12 @@
+epiphany-browser (2.29.5-4) UNRELEASED; urgency=low
+
+ * debian/patches/91_gtk-doc-1.13.patch:
+ - Removed, gtk-doc has been fixed so this is no longer needed.
+ * debian/patches/99_autoreconf.patch:
+ - Regenerated.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Wed, 20 Jan 2010 09:37:51 +0100
+
epiphany-browser (2.29.5-3) unstable; urgency=low
* debian/patches/91_gtk-doc-1.13.patch,
Modified: desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch?rev=22830&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] Wed Jan 20 08:39:15 2010
@@ -1,12 +1,5 @@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/aclocal.m4 epiphany-browser-2.29.5/aclocal.m4
---- epiphany-browser-2.29.5.old/aclocal.m4 2010-01-11 21:37:17.000000000 +0100
-+++ epiphany-browser-2.29.5/aclocal.m4 2010-01-14 18:15:46.759691929 +0100
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+--- a/aclocal.m4
++++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -55,27 +48,8 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-@@ -893,7 +895,7 @@
- [am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.11.1], [],
-+m4_if([$1], [1.11], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -909,7 +911,7 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11.1])dnl
-+[AM_AUTOMAKE_VERSION([1.11])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/config.h.in epiphany-browser-2.29.5/config.h.in
---- epiphany-browser-2.29.5.old/config.h.in 2010-01-11 21:37:38.000000000 +0100
-+++ epiphany-browser-2.29.5/config.h.in 2010-01-14 18:15:47.979691548 +0100
+--- a/config.h.in
++++ b/config.h.in
@@ -169,6 +169,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -86,9 +60,8 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/configure epiphany-browser-2.29.5/configure
---- epiphany-browser-2.29.5.old/configure 2010-01-11 21:37:23.000000000 +0100
-+++ epiphany-browser-2.29.5/configure 2010-01-14 18:15:47.724689295 +0100
+--- a/configure
++++ b/configure
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -15130,15 +15103,8 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/art/Makefile.in epiphany-browser-2.29.5/data/art/Makefile.in
---- epiphany-browser-2.29.5.old/data/art/Makefile.in 2010-01-11 21:37:19.000000000 +0100
-+++ epiphany-browser-2.29.5/data/art/Makefile.in 2010-01-14 18:15:48.724690412 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/data/art/Makefile.in
++++ b/data/art/Makefile.in
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15156,15 +15122,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/glade/Makefile.in epiphany-browser-2.29.5/data/glade/Makefile.in
---- epiphany-browser-2.29.5.old/data/glade/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/data/glade/Makefile.in 2010-01-14 18:15:48.784689799 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/data/glade/Makefile.in
++++ b/data/glade/Makefile.in
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15182,15 +15141,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/icons/Makefile.in epiphany-browser-2.29.5/data/icons/Makefile.in
---- epiphany-browser-2.29.5.old/data/icons/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/data/icons/Makefile.in 2010-01-14 18:15:48.840689378 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/data/icons/Makefile.in
++++ b/data/icons/Makefile.in
@@ -119,6 +119,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15208,15 +15160,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/Makefile.in epiphany-browser-2.29.5/data/Makefile.in
---- epiphany-browser-2.29.5.old/data/Makefile.in 2010-01-11 21:37:19.000000000 +0100
-+++ epiphany-browser-2.29.5/data/Makefile.in 2010-01-14 18:15:48.668690066 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/data/Makefile.in
++++ b/data/Makefile.in
@@ -191,6 +191,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15234,33 +15179,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -625,7 +628,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -650,7 +653,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/data/ui/Makefile.in epiphany-browser-2.29.5/data/ui/Makefile.in
---- epiphany-browser-2.29.5.old/data/ui/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/data/ui/Makefile.in 2010-01-14 18:15:48.900689956 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/data/ui/Makefile.in
++++ b/data/ui/Makefile.in
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15278,15 +15198,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/doc/Makefile.in epiphany-browser-2.29.5/doc/Makefile.in
---- epiphany-browser-2.29.5.old/doc/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/doc/Makefile.in 2010-01-14 18:15:48.960689622 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
@@ -182,6 +182,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15304,33 +15217,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -400,7 +403,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -425,7 +428,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/doc/reference/Makefile.in epiphany-browser-2.29.5/doc/reference/Makefile.in
---- epiphany-browser-2.29.5.old/doc/reference/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/doc/reference/Makefile.in 2010-01-14 18:15:49.028691209 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/doc/reference/Makefile.in
++++ b/doc/reference/Makefile.in
@@ -123,6 +123,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15348,24 +15236,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -667,7 +670,7 @@
- @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences'
-- at ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+ at ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- @ENABLE_GTK_DOC_TRUE@ touch html-build.stamp
-
- ##############
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/embed/Makefile.in epiphany-browser-2.29.5/embed/Makefile.in
---- epiphany-browser-2.29.5.old/embed/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/embed/Makefile.in 2010-01-14 18:15:49.172690435 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/embed/Makefile.in
++++ b/embed/Makefile.in
@@ -196,6 +196,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15383,9 +15255,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/gtk-doc.make epiphany-browser-2.29.5/gtk-doc.make
---- epiphany-browser-2.29.5.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
-+++ epiphany-browser-2.29.5/gtk-doc.make 2010-01-14 18:15:44.164691233 +0100
+--- /dev/null
++++ b/gtk-doc.make
@@ -0,0 +1,224 @@
+# -*- mode: makefile -*-
+
@@ -15611,15 +15482,8 @@
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/help/Makefile.in epiphany-browser-2.29.5/help/Makefile.in
---- epiphany-browser-2.29.5.old/help/Makefile.in 2010-01-11 21:37:20.000000000 +0100
-+++ epiphany-browser-2.29.5/help/Makefile.in 2010-01-14 18:15:49.256690011 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/help/Makefile.in
++++ b/help/Makefile.in
@@ -142,6 +142,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15637,15 +15501,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/lib/egg/Makefile.in epiphany-browser-2.29.5/lib/egg/Makefile.in
---- epiphany-browser-2.29.5.old/lib/egg/Makefile.in 2010-01-11 21:37:21.000000000 +0100
-+++ epiphany-browser-2.29.5/lib/egg/Makefile.in 2010-01-14 18:15:49.716689535 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/lib/egg/Makefile.in
++++ b/lib/egg/Makefile.in
@@ -165,6 +165,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15663,15 +15520,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/lib/Makefile.in epiphany-browser-2.29.5/lib/Makefile.in
---- epiphany-browser-2.29.5.old/lib/Makefile.in 2010-01-11 21:37:21.000000000 +0100
-+++ epiphany-browser-2.29.5/lib/Makefile.in 2010-01-14 18:15:49.584689381 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
@@ -275,6 +275,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15698,33 +15548,8 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-@@ -822,7 +825,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -847,7 +850,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/lib/widgets/Makefile.in epiphany-browser-2.29.5/lib/widgets/Makefile.in
---- epiphany-browser-2.29.5.old/lib/widgets/Makefile.in 2010-01-11 21:37:21.000000000 +0100
-+++ epiphany-browser-2.29.5/lib/widgets/Makefile.in 2010-01-14 18:15:49.824690206 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/lib/widgets/Makefile.in
++++ b/lib/widgets/Makefile.in
@@ -160,6 +160,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15742,9 +15567,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/ltmain.sh epiphany-browser-2.29.5/ltmain.sh
---- epiphany-browser-2.29.5.old/ltmain.sh 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.5/ltmain.sh 2010-01-14 18:15:43.704713426 +0100
+--- a/ltmain.sh
++++ b/ltmain.sh
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -15823,9 +15647,8 @@
esac
;;
no)
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/m4/gtk-doc.m4 epiphany-browser-2.29.5/m4/gtk-doc.m4
---- epiphany-browser-2.29.5.old/m4/gtk-doc.m4 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.5/m4/gtk-doc.m4 2010-01-14 18:15:44.164691233 +0100
+--- a/m4/gtk-doc.m4
++++ b/m4/gtk-doc.m4
@@ -8,6 +8,12 @@
[
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -15872,9 +15695,8 @@
AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
])
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/m4/libtool.m4 epiphany-browser-2.29.5/m4/libtool.m4
---- epiphany-browser-2.29.5.old/m4/libtool.m4 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.5/m4/libtool.m4 2010-01-14 18:15:43.752717784 +0100
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
@@ -2445,7 +2445,7 @@
;;
@@ -16031,15 +15853,8 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/Makefile.in epiphany-browser-2.29.5/Makefile.in
---- epiphany-browser-2.29.5.old/Makefile.in 2010-01-11 21:37:22.000000000 +0100
-+++ epiphany-browser-2.29.5/Makefile.in 2010-01-14 18:15:50.368689658 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/Makefile.in
++++ b/Makefile.in
@@ -178,6 +178,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16057,59 +15872,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -399,7 +402,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -424,7 +427,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -588,8 +591,7 @@
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -755 \
-- -exec chmod u+rwx,go+rx {} \; -o \
-+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -632,17 +634,17 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/po/Makefile.in.in epiphany-browser-2.29.5/po/Makefile.in.in
---- epiphany-browser-2.29.5.old/po/Makefile.in.in 2010-01-05 19:51:24.000000000 +0100
-+++ epiphany-browser-2.29.5/po/Makefile.in.in 2010-01-14 18:15:44.132698760 +0100
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
@@ -129,7 +129,7 @@
done
@@ -16119,15 +15883,8 @@
# Define this as empty until I found a useful application.
install-exec installcheck:
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/src/bookmarks/Makefile.in epiphany-browser-2.29.5/src/bookmarks/Makefile.in
---- epiphany-browser-2.29.5.old/src/bookmarks/Makefile.in 2010-01-11 21:37:22.000000000 +0100
-+++ epiphany-browser-2.29.5/src/bookmarks/Makefile.in 2010-01-14 18:15:50.224690971 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/src/bookmarks/Makefile.in
++++ b/src/bookmarks/Makefile.in
@@ -208,6 +208,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16145,15 +15902,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/src/Makefile.in epiphany-browser-2.29.5/src/Makefile.in
---- epiphany-browser-2.29.5.old/src/Makefile.in 2010-01-11 21:37:21.000000000 +0100
-+++ epiphany-browser-2.29.5/src/Makefile.in 2010-01-14 18:15:50.072689743 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/src/Makefile.in
++++ b/src/Makefile.in
@@ -331,6 +331,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16182,33 +15932,8 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -1181,7 +1184,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -1206,7 +1209,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @fail= failcom='exit 1'; \
-+ @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-diff -x'*config.sub' -x'*config.guess' -Naur epiphany-browser-2.29.5.old/tests/Makefile.in epiphany-browser-2.29.5/tests/Makefile.in
---- epiphany-browser-2.29.5.old/tests/Makefile.in 2010-01-11 21:37:22.000000000 +0100
-+++ epiphany-browser-2.29.5/tests/Makefile.in 2010-01-14 18:15:50.300689738 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
@@ -169,6 +169,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16226,3 +15951,362 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+--- a/config.guess
++++ b/config.guess
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2009-06-10'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -27,16 +27,16 @@
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner. Please send patches (context
+-# diff format) to <config-patches at gnu.org> and include a ChangeLog
+-# entry.
++# Originally written by Per Bothner <per at bothner.com>.
++# Please send patches to <config-patches at gnu.org>. Submit a context
++# diff and a properly formatted ChangeLog entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# You can get the latest version of this script from:
+-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++# The plan is that this can be called by configure scripts if you
++# don't specify an explicit build system type.
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -333,9 +333,6 @@
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+- echo i386-pc-auroraux${UNAME_RELEASE}
+- exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+@@ -810,12 +807,12 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:*)
++ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- authenticamd | genuineintel | EM64T)
++ EM64T | authenticamd | genuineintel)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -857,20 +854,6 @@
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
+- objdump --private-headers /bin/sh | grep -q ld.so.1
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -893,17 +876,6 @@
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
+- i*86:Linux:*:*)
+- LIBC=gnu
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+@@ -929,18 +901,39 @@
+ #endif
+ #endif
+ EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++ /^CPU/{
++ s: ::g
++ p
++ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
++ exit ;;
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
+- exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -949,11 +942,8 @@
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+@@ -976,6 +966,58 @@
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
++ i*86:Linux:*:*)
++ # The BFD linker knows what the default object file format is, so
++ # first see if it will tell us. cd to the root directory to prevent
++ # problems with other programs or directories called `ld' in the path.
++ # Set LC_ALL=C to ensure ld outputs messages in English.
++ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
++ | sed -ne '/supported targets:/!d
++ s/[ ][ ]*/ /g
++ s/.*supported targets: *//
++ s/ .*//
++ p'`
++ case "$ld_supported_targets" in
++ elf32-i386)
++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++ ;;
++ esac
++ # Determine whether the default compiler is a.out or elf
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #include <features.h>
++ #ifdef __ELF__
++ # ifdef __GLIBC__
++ # if __GLIBC__ >= 2
++ LIBC=gnu
++ # else
++ LIBC=gnulibc1
++ # endif
++ # else
++ LIBC=gnulibc1
++ # endif
++ #else
++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
++ LIBC=gnu
++ #else
++ LIBC=gnuaout
++ #endif
++ #endif
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++ /^LIBC/{
++ s: ::g
++ p
++ }'`"
++ test x"${LIBC}" != x && {
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit
++ }
++ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
++ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1205,16 +1247,6 @@
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+- i386)
+- eval $set_cc_for_build
+- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+- grep IS_64BIT_ARCH >/dev/null
+- then
+- UNAME_PROCESSOR="x86_64"
+- fi
+- fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+--- a/config.sub
++++ b/config.sub
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2009-06-11'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -32,16 +32,13 @@
+
+
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted GNU ChangeLog entry.
++# diff and a properly formatted ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
+-# You can get the latest version of this script from:
+-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+-
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -152,7 +149,7 @@
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray | -microblaze)
++ -apple | -axis | -knuth | -cray)
+ os=
+ basic_machine=$1
+ ;;
+@@ -287,7 +284,6 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+- | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -295,14 +291,13 @@
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+- | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
++ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+@@ -345,7 +340,7 @@
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -373,7 +368,7 @@
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+- | romp-* | rs6000-* | rx-* \
++ | romp-* | rs6000-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+@@ -382,7 +377,6 @@
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tron-* \
+- | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -732,9 +726,6 @@
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+- microblaze)
+- basic_machine=microblaze-xilinx
+- ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -1256,9 +1247,6 @@
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
+- -auroraux)
+- os=-auroraux
+- ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1280,8 +1268,8 @@
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+- | -sym* | -kopensolaris* \
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++ | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1302,7 +1290,7 @@
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=22830&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Wed Jan 20 08:39:15 2010
@@ -7,6 +7,5 @@
10_smart_bookmarks.patch
12_safetypes.patch
90_schemas-syntax-error.patch
-91_gtk-doc-1.13.patch
99_autoreconf.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list