r22848 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in patches/90_schemas-syntax-error.patch patches/99_autoreconf.patch patches/series
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Jan 26 07:24:06 UTC 2010
Author: slomo
Date: Tue Jan 26 07:24:03 2010
New Revision: 22848
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22848
Log:
* New upstream development release:
+ debian/patches/99_autoreconf.patch:
- Regenerated for the new version.
+ debian/control.in:
- Build depend on WebKit >= 1.1.19.
+ debian/patches/90_schemas-syntax-error.patch:
- Dropped, merged upstream.
Removed:
desktop/unstable/epiphany-browser/debian/patches/90_schemas-syntax-error.patch
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/control
desktop/unstable/epiphany-browser/debian/control.in
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=22848&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Tue Jan 26 07:24:03 2010
@@ -1,11 +1,21 @@
-epiphany-browser (2.29.5-4) UNRELEASED; urgency=low
-
+epiphany-browser (2.29.6-1) unstable; urgency=low
+
+ [ Emilio Pozuelo Monfort ]
* 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
+ [ Sebastian Dröge ]
+ * New upstream development release:
+ + debian/patches/99_autoreconf.patch:
+ - Regenerated for the new version.
+ + debian/control.in:
+ - Build depend on WebKit >= 1.1.19.
+ + debian/patches/90_schemas-syntax-error.patch:
+ - Dropped, merged upstream.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 26 Jan 2010 08:19:29 +0100
epiphany-browser (2.29.5-3) unstable; urgency=low
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=22848&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Tue Jan 26 07:24:03 2010
@@ -29,7 +29,7 @@
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- libwebkit-dev (>= 1.1.18),
+ libwebkit-dev (>= 1.1.19),
libsoup-gnome2.4-dev (>= 2.29.5),
gobject-introspection (>= 0.6.7),
libgirepository1.0-dev (>= 0.6.7),
Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=22848&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Tue Jan 26 07:24:03 2010
@@ -24,7 +24,7 @@
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- libwebkit-dev (>= 1.1.18),
+ libwebkit-dev (>= 1.1.19),
libsoup-gnome2.4-dev (>= 2.29.5),
gobject-introspection (>= 0.6.7),
libgirepository1.0-dev (>= 0.6.7),
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=22848&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] Tue Jan 26 07:24:03 2010
@@ -1,5 +1,6 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/aclocal.m4 epiphany-browser-2.29.6/aclocal.m4
+--- epiphany-browser-2.29.6.old/aclocal.m4 2010-01-25 19:41:33.000000000 +0100
++++ epiphany-browser-2.29.6/aclocal.m4 2010-01-26 08:23:11.401649926 +0100
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -48,8 +49,9 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
---- a/config.h.in
-+++ b/config.h.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/config.h.in epiphany-browser-2.29.6/config.h.in
+--- epiphany-browser-2.29.6.old/config.h.in 2010-01-25 19:41:54.000000000 +0100
++++ epiphany-browser-2.29.6/config.h.in 2010-01-26 08:23:14.401651393 +0100
@@ -169,6 +169,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -60,13 +62,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
---- a/configure
-+++ b/configure
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/configure epiphany-browser-2.29.6/configure
+--- epiphany-browser-2.29.6.old/configure 2010-01-25 19:41:40.000000000 +0100
++++ epiphany-browser-2.29.6/configure 2010-01-26 08:23:13.685650265 +0100
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.29.5.
-+# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.29.5.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.29.6.
++# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.29.6.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -873,8 +876,8 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.29.5'
- PACKAGE_STRING='GNOME Web Browser 2.29.5'
+ PACKAGE_VERSION='2.29.6'
+ PACKAGE_STRING='GNOME Web Browser 2.29.6'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+PACKAGE_URL=''
@@ -1074,7 +1077,7 @@
@@ -1845,21 +1806,432 @@
if $ac_init_version; then
cat <<\_ACEOF
- GNOME Web Browser configure 2.29.5
+ GNOME Web Browser configure 2.29.6
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -1502,7 +1505,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by GNOME Web Browser $as_me 2.29.5, which was
+ It was created by GNOME Web Browser $as_me 2.29.6, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -2119,7 +2122,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.29.5'
+ VERSION='2.29.6'
@@ -2786,7 +3117,7 @@
@@ -14591,7 +14594,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by GNOME Web Browser $as_me 2.29.5, which was
+ This file was extended by GNOME Web Browser $as_me 2.29.6, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -14627,7 +14630,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- GNOME Web Browser config.status 2.29.5
+ GNOME Web Browser config.status 2.29.6
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -15103,8 +15106,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
---- a/data/art/Makefile.in
-+++ b/data/art/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/data/art/Makefile.in epiphany-browser-2.29.6/data/art/Makefile.in
+--- epiphany-browser-2.29.6.old/data/art/Makefile.in 2010-01-25 19:41:36.000000000 +0100
++++ epiphany-browser-2.29.6/data/art/Makefile.in 2010-01-26 08:23:17.293649892 +0100
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15122,8 +15126,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/glade/Makefile.in
-+++ b/data/glade/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/data/glade/Makefile.in epiphany-browser-2.29.6/data/glade/Makefile.in
+--- epiphany-browser-2.29.6.old/data/glade/Makefile.in 2010-01-25 19:41:36.000000000 +0100
++++ epiphany-browser-2.29.6/data/glade/Makefile.in 2010-01-26 08:23:17.425650181 +0100
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15141,8 +15146,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/icons/Makefile.in
-+++ b/data/icons/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/data/icons/Makefile.in epiphany-browser-2.29.6/data/icons/Makefile.in
+--- epiphany-browser-2.29.6.old/data/icons/Makefile.in 2010-01-25 19:41:36.000000000 +0100
++++ epiphany-browser-2.29.6/data/icons/Makefile.in 2010-01-26 08:23:17.561650282 +0100
@@ -119,6 +119,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15160,8 +15166,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/Makefile.in
-+++ b/data/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/data/Makefile.in epiphany-browser-2.29.6/data/Makefile.in
+--- epiphany-browser-2.29.6.old/data/Makefile.in 2010-01-25 19:41:36.000000000 +0100
++++ epiphany-browser-2.29.6/data/Makefile.in 2010-01-26 08:23:17.149651064 +0100
@@ -191,6 +191,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15179,8 +15186,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/ui/Makefile.in
-+++ b/data/ui/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/data/ui/Makefile.in epiphany-browser-2.29.6/data/ui/Makefile.in
+--- epiphany-browser-2.29.6.old/data/ui/Makefile.in 2010-01-25 19:41:36.000000000 +0100
++++ epiphany-browser-2.29.6/data/ui/Makefile.in 2010-01-26 08:23:17.693649746 +0100
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15198,8 +15206,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/doc/Makefile.in epiphany-browser-2.29.6/doc/Makefile.in
+--- epiphany-browser-2.29.6.old/doc/Makefile.in 2010-01-25 19:41:36.000000000 +0100
++++ epiphany-browser-2.29.6/doc/Makefile.in 2010-01-26 08:23:17.853650673 +0100
@@ -182,6 +182,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15217,8 +15226,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/doc/reference/Makefile.in
-+++ b/doc/reference/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/doc/reference/Makefile.in epiphany-browser-2.29.6/doc/reference/Makefile.in
+--- epiphany-browser-2.29.6.old/doc/reference/Makefile.in 2010-01-25 19:41:36.000000000 +0100
++++ epiphany-browser-2.29.6/doc/reference/Makefile.in 2010-01-26 08:23:17.997650736 +0100
@@ -123,6 +123,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15236,8 +15246,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/embed/Makefile.in
-+++ b/embed/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/embed/Makefile.in epiphany-browser-2.29.6/embed/Makefile.in
+--- epiphany-browser-2.29.6.old/embed/Makefile.in 2010-01-25 19:41:37.000000000 +0100
++++ epiphany-browser-2.29.6/embed/Makefile.in 2010-01-26 08:23:18.325651235 +0100
@@ -196,6 +196,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15255,8 +15266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- /dev/null
-+++ b/gtk-doc.make
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/gtk-doc.make epiphany-browser-2.29.6/gtk-doc.make
+--- epiphany-browser-2.29.6.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
++++ epiphany-browser-2.29.6/gtk-doc.make 2010-01-26 08:23:04.929650688 +0100
@@ -0,0 +1,224 @@
+# -*- mode: makefile -*-
+
@@ -15482,8 +15494,9 @@
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
---- a/help/Makefile.in
-+++ b/help/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/help/Makefile.in epiphany-browser-2.29.6/help/Makefile.in
+--- epiphany-browser-2.29.6.old/help/Makefile.in 2010-01-25 19:41:37.000000000 +0100
++++ epiphany-browser-2.29.6/help/Makefile.in 2010-01-26 08:23:18.529650124 +0100
@@ -142,6 +142,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15501,8 +15514,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/lib/egg/Makefile.in
-+++ b/lib/egg/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/lib/egg/Makefile.in epiphany-browser-2.29.6/lib/egg/Makefile.in
+--- epiphany-browser-2.29.6.old/lib/egg/Makefile.in 2010-01-25 19:41:37.000000000 +0100
++++ epiphany-browser-2.29.6/lib/egg/Makefile.in 2010-01-26 08:23:19.169650324 +0100
@@ -165,6 +165,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15520,8 +15534,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/lib/Makefile.in epiphany-browser-2.29.6/lib/Makefile.in
+--- epiphany-browser-2.29.6.old/lib/Makefile.in 2010-01-25 19:41:37.000000000 +0100
++++ epiphany-browser-2.29.6/lib/Makefile.in 2010-01-26 08:23:18.925650530 +0100
@@ -275,6 +275,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15548,8 +15563,9 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
---- a/lib/widgets/Makefile.in
-+++ b/lib/widgets/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/lib/widgets/Makefile.in epiphany-browser-2.29.6/lib/widgets/Makefile.in
+--- epiphany-browser-2.29.6.old/lib/widgets/Makefile.in 2010-01-25 19:41:38.000000000 +0100
++++ epiphany-browser-2.29.6/lib/widgets/Makefile.in 2010-01-26 08:23:19.437650098 +0100
@@ -160,6 +160,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15567,8 +15583,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/ltmain.sh
-+++ b/ltmain.sh
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/ltmain.sh epiphany-browser-2.29.6/ltmain.sh
+--- epiphany-browser-2.29.6.old/ltmain.sh 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.6/ltmain.sh 2010-01-26 08:23:01.029651172 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -15647,8 +15664,9 @@
esac
;;
no)
---- a/m4/gtk-doc.m4
-+++ b/m4/gtk-doc.m4
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/m4/gtk-doc.m4 epiphany-browser-2.29.6/m4/gtk-doc.m4
+--- epiphany-browser-2.29.6.old/m4/gtk-doc.m4 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.6/m4/gtk-doc.m4 2010-01-26 08:23:04.905650574 +0100
@@ -8,6 +8,12 @@
[
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -15695,8 +15713,9 @@
AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
])
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/m4/libtool.m4 epiphany-browser-2.29.6/m4/libtool.m4
+--- epiphany-browser-2.29.6.old/m4/libtool.m4 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.6/m4/libtool.m4 2010-01-26 08:23:01.541650882 +0100
@@ -2445,7 +2445,7 @@
;;
@@ -15853,8 +15872,9 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
---- a/Makefile.in
-+++ b/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/Makefile.in epiphany-browser-2.29.6/Makefile.in
+--- epiphany-browser-2.29.6.old/Makefile.in 2010-01-25 19:41:39.000000000 +0100
++++ epiphany-browser-2.29.6/Makefile.in 2010-01-26 08:23:20.653651433 +0100
@@ -178,6 +178,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15872,8 +15892,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/po/Makefile.in.in epiphany-browser-2.29.6/po/Makefile.in.in
+--- epiphany-browser-2.29.6.old/po/Makefile.in.in 2010-01-05 19:51:24.000000000 +0100
++++ epiphany-browser-2.29.6/po/Makefile.in.in 2010-01-26 08:23:04.597650320 +0100
@@ -129,7 +129,7 @@
done
@@ -15883,8 +15904,9 @@
# Define this as empty until I found a useful application.
install-exec installcheck:
---- a/src/bookmarks/Makefile.in
-+++ b/src/bookmarks/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/src/bookmarks/Makefile.in epiphany-browser-2.29.6/src/bookmarks/Makefile.in
+--- epiphany-browser-2.29.6.old/src/bookmarks/Makefile.in 2010-01-25 19:41:38.000000000 +0100
++++ epiphany-browser-2.29.6/src/bookmarks/Makefile.in 2010-01-26 08:23:20.301650280 +0100
@@ -208,6 +208,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15902,8 +15924,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/src/Makefile.in epiphany-browser-2.29.6/src/Makefile.in
+--- epiphany-browser-2.29.6.old/src/Makefile.in 2010-01-25 19:41:38.000000000 +0100
++++ epiphany-browser-2.29.6/src/Makefile.in 2010-01-26 08:23:19.961649933 +0100
@@ -331,6 +331,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15932,9 +15955,10 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -169,6 +169,8 @@
+diff -x'*config.guess' -x'*config.sub' -Naur epiphany-browser-2.29.6.old/tests/Makefile.in epiphany-browser-2.29.6/tests/Makefile.in
+--- epiphany-browser-2.29.6.old/tests/Makefile.in 2010-01-25 19:41:38.000000000 +0100
++++ epiphany-browser-2.29.6/tests/Makefile.in 2010-01-26 08:23:20.509650095 +0100
+@@ -184,6 +184,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -15943,7 +15967,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -222,6 +224,7 @@
+@@ -237,6 +239,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -15951,362 +15975,3 @@
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=22848&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Tue Jan 26 07:24:03 2010
@@ -6,6 +6,5 @@
07_bookmarks.patch
10_smart_bookmarks.patch
12_safetypes.patch
-90_schemas-syntax-error.patch
99_autoreconf.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list