r24923 - /desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Wed Jul 28 10:45:05 UTC 2010
Author: kov
Date: Wed Jul 28 10:45:04 2010
New Revision: 24923
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24923
Log:
traditional autoreconf upgrade
Modified:
desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
Modified: desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch?rev=24923&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch [utf-8] Wed Jul 28 10:45:04 2010
@@ -1,6 +1,7 @@
-diff -Naur epiphany-browser-2.31.2.old/aclocal.m4 epiphany-browser-2.31.2/aclocal.m4
---- epiphany-browser-2.31.2.old/aclocal.m4 2010-05-24 14:03:19.000000000 +0200
-+++ epiphany-browser-2.31.2/aclocal.m4 2010-05-25 21:53:14.036375501 +0200
+Index: epiphany-browser-2.31.5/aclocal.m4
+===================================================================
+--- epiphany-browser-2.31.5.orig/aclocal.m4 2010-07-14 12:44:07.000000000 +0200
++++ epiphany-browser-2.31.5/aclocal.m4 2010-07-28 12:44:06.186625968 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -147,9 +148,10 @@
fi[]dnl
])# PKG_CHECK_MODULES
-diff -Naur epiphany-browser-2.31.2.old/config.guess epiphany-browser-2.31.2/config.guess
---- epiphany-browser-2.31.2.old/config.guess 2010-04-27 13:58:12.000000000 +0200
-+++ epiphany-browser-2.31.2/config.guess 2010-05-25 21:53:16.036476908 +0200
+Index: epiphany-browser-2.31.5/config.guess
+===================================================================
+--- epiphany-browser-2.31.5.orig/config.guess 2010-07-11 13:54:20.000000000 +0200
++++ epiphany-browser-2.31.5/config.guess 2010-07-28 12:44:08.782156375 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -175,9 +177,10 @@
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-diff -Naur epiphany-browser-2.31.2.old/config.h.in epiphany-browser-2.31.2/config.h.in
---- epiphany-browser-2.31.2.old/config.h.in 2010-05-24 14:03:37.000000000 +0200
-+++ epiphany-browser-2.31.2/config.h.in 2010-05-25 21:53:15.300373989 +0200
+Index: epiphany-browser-2.31.5/config.h.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/config.h.in 2010-07-14 12:44:28.000000000 +0200
++++ epiphany-browser-2.31.5/config.h.in 2010-07-28 12:44:08.000000000 +0200
@@ -172,6 +172,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -188,9 +191,10 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -Naur epiphany-browser-2.31.2.old/config.sub epiphany-browser-2.31.2/config.sub
---- epiphany-browser-2.31.2.old/config.sub 2010-04-27 13:58:12.000000000 +0200
-+++ epiphany-browser-2.31.2/config.sub 2010-05-25 21:53:16.049442731 +0200
+Index: epiphany-browser-2.31.5/config.sub
+===================================================================
+--- epiphany-browser-2.31.5.orig/config.sub 2010-07-11 13:54:20.000000000 +0200
++++ epiphany-browser-2.31.5/config.sub 2010-07-28 12:44:08.802627087 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -247,14 +251,15 @@
-none)
;;
*)
-diff -Naur epiphany-browser-2.31.2.old/configure epiphany-browser-2.31.2/configure
---- epiphany-browser-2.31.2.old/configure 2010-05-24 14:03:25.000000000 +0200
-+++ epiphany-browser-2.31.2/configure 2010-05-25 21:53:15.036371730 +0200
+Index: epiphany-browser-2.31.5/configure
+===================================================================
+--- epiphany-browser-2.31.5.orig/configure 2010-07-14 12:44:13.000000000 +0200
++++ epiphany-browser-2.31.5/configure 2010-07-28 12:44:07.326625780 +0200
@@ -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.31.2.
-+# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.31.2.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.31.5.
++# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.31.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -1061,8 +1066,8 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.31.2'
- PACKAGE_STRING='GNOME Web Browser 2.31.2'
+ PACKAGE_VERSION='2.31.5'
+ PACKAGE_STRING='GNOME Web Browser 2.31.5'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+PACKAGE_URL=''
@@ -1287,7 +1292,7 @@
@@ -1847,21 +1816,432 @@
if $ac_init_version; then
cat <<\_ACEOF
- GNOME Web Browser configure 2.31.2
+ GNOME Web Browser configure 2.31.5
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -1715,7 +1720,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.31.2, which was
+ It was created by GNOME Web Browser $as_me 2.31.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -2332,7 +2337,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.31.2'
+ VERSION='2.31.5'
@@ -2788,7 +3127,7 @@
@@ -9604,7 +9609,7 @@
+$as_echo "#define MAINTAINER_MODE 1" >>confdefs.h
enable_debug=yes
- DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+ DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
@@ -14405,11 +13294,11 @@
GNOME_KEYRING_REQUIRED=2.26.0
@@ -9667,7 +9672,7 @@
gmodule-2.0
gthread-2.0
@@ -14475,7 +13362,7 @@
- webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
+ webkitgtk-3.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
- \"") >&5
@@ -9696,7 +9701,7 @@
gmodule-2.0
gthread-2.0
@@ -14545,7 +13432,7 @@
- webkit-1.0 >= \$WEBKIT_GTK_REQUIRED
+ webkitgtk-3.0 >= \$WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= \$LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED
- \"") >&5
@@ -9733,8 +9738,8 @@
- gmodule-2.0
- gthread-2.0
- gio-unix-2.0 >= $GLIB_REQUIRED
-- gtk+-2.0 >= $GTK_REQUIRED
-- gtk+-unix-print-2.0 >= $GTK_REQUIRED
+- gtk+-3.0 >= $GTK_REQUIRED
+- gtk+-unix-print-3.0 >= $GTK_REQUIRED
- ice
- x11
- sm
@@ -9743,7 +9748,7 @@
- gconf-2.0
- libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
- $LIBNOTIFY_PACKAGE
-- webkit-1.0 >= $WEBKIT_GTK_REQUIRED
+- webkitgtk-3.0 >= $WEBKIT_GTK_REQUIRED
- libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
- gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
- ) were not met:
@@ -14797,7 +14802,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.31.2, which was
+ This file was extended by GNOME Web Browser $as_me 2.31.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -14833,7 +14838,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.31.2
+ GNOME Web Browser config.status 2.31.5
-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,
@@ -15309,9 +15314,10 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -Naur epiphany-browser-2.31.2.old/data/art/Makefile.in epiphany-browser-2.31.2/data/art/Makefile.in
---- epiphany-browser-2.31.2.old/data/art/Makefile.in 2010-05-24 14:03:21.000000000 +0200
-+++ epiphany-browser-2.31.2/data/art/Makefile.in 2010-05-25 21:53:16.268371736 +0200
+Index: epiphany-browser-2.31.5/data/art/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/data/art/Makefile.in 2010-07-14 12:44:09.000000000 +0200
++++ epiphany-browser-2.31.5/data/art/Makefile.in 2010-07-28 12:44:09.154625432 +0200
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15334,9 +15340,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/data/glade/Makefile.in epiphany-browser-2.31.2/data/glade/Makefile.in
---- epiphany-browser-2.31.2.old/data/glade/Makefile.in 2010-05-24 14:03:21.000000000 +0200
-+++ epiphany-browser-2.31.2/data/glade/Makefile.in 2010-05-25 21:53:16.324371872 +0200
+Index: epiphany-browser-2.31.5/data/glade/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/data/glade/Makefile.in 2010-07-14 12:44:10.000000000 +0200
++++ epiphany-browser-2.31.5/data/glade/Makefile.in 2010-07-28 12:44:09.218625111 +0200
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15359,9 +15366,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/data/icons/Makefile.in epiphany-browser-2.31.2/data/icons/Makefile.in
---- epiphany-browser-2.31.2.old/data/icons/Makefile.in 2010-05-24 14:03:21.000000000 +0200
-+++ epiphany-browser-2.31.2/data/icons/Makefile.in 2010-05-25 21:53:16.384372589 +0200
+Index: epiphany-browser-2.31.5/data/icons/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/data/icons/Makefile.in 2010-07-14 12:44:10.000000000 +0200
++++ epiphany-browser-2.31.5/data/icons/Makefile.in 2010-07-28 12:44:09.282625346 +0200
@@ -119,6 +119,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15384,9 +15392,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/data/Makefile.in epiphany-browser-2.31.2/data/Makefile.in
---- epiphany-browser-2.31.2.old/data/Makefile.in 2010-05-24 14:03:21.000000000 +0200
-+++ epiphany-browser-2.31.2/data/Makefile.in 2010-05-25 21:53:16.212371949 +0200
+Index: epiphany-browser-2.31.5/data/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/data/Makefile.in 2010-07-14 12:44:09.000000000 +0200
++++ epiphany-browser-2.31.5/data/Makefile.in 2010-07-28 12:44:09.086625431 +0200
@@ -191,6 +191,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15409,9 +15418,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/data/ui/Makefile.in epiphany-browser-2.31.2/data/ui/Makefile.in
---- epiphany-browser-2.31.2.old/data/ui/Makefile.in 2010-05-24 14:03:21.000000000 +0200
-+++ epiphany-browser-2.31.2/data/ui/Makefile.in 2010-05-25 21:53:16.436371939 +0200
+Index: epiphany-browser-2.31.5/data/ui/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/data/ui/Makefile.in 2010-07-14 12:44:10.000000000 +0200
++++ epiphany-browser-2.31.5/data/ui/Makefile.in 2010-07-28 12:44:09.346625376 +0200
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15434,9 +15444,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/doc/Makefile.in epiphany-browser-2.31.2/doc/Makefile.in
---- epiphany-browser-2.31.2.old/doc/Makefile.in 2010-05-24 14:03:22.000000000 +0200
-+++ epiphany-browser-2.31.2/doc/Makefile.in 2010-05-25 21:53:16.496371744 +0200
+Index: epiphany-browser-2.31.5/doc/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/doc/Makefile.in 2010-07-14 12:44:10.000000000 +0200
++++ epiphany-browser-2.31.5/doc/Makefile.in 2010-07-28 12:44:09.454625460 +0200
@@ -182,6 +182,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15459,9 +15470,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/doc/reference/Makefile.in epiphany-browser-2.31.2/doc/reference/Makefile.in
---- epiphany-browser-2.31.2.old/doc/reference/Makefile.in 2010-05-24 14:03:22.000000000 +0200
-+++ epiphany-browser-2.31.2/doc/reference/Makefile.in 2010-05-25 21:53:16.564372632 +0200
+Index: epiphany-browser-2.31.5/doc/reference/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/doc/reference/Makefile.in 2010-07-14 12:44:10.000000000 +0200
++++ epiphany-browser-2.31.5/doc/reference/Makefile.in 2010-07-28 12:44:09.530625140 +0200
@@ -123,6 +123,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15484,9 +15496,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/embed/Makefile.in epiphany-browser-2.31.2/embed/Makefile.in
---- epiphany-browser-2.31.2.old/embed/Makefile.in 2010-05-24 14:03:22.000000000 +0200
-+++ epiphany-browser-2.31.2/embed/Makefile.in 2010-05-25 21:53:16.752372149 +0200
+Index: epiphany-browser-2.31.5/embed/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/embed/Makefile.in 2010-07-14 12:44:10.000000000 +0200
++++ epiphany-browser-2.31.5/embed/Makefile.in 2010-07-28 12:44:09.754625465 +0200
@@ -196,6 +196,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15509,9 +15522,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/gnome-doc-utils.make epiphany-browser-2.31.2/gnome-doc-utils.make
---- epiphany-browser-2.31.2.old/gnome-doc-utils.make 2010-04-27 13:58:02.000000000 +0200
-+++ epiphany-browser-2.31.2/gnome-doc-utils.make 2010-05-25 21:53:11.325483256 +0200
+Index: epiphany-browser-2.31.5/gnome-doc-utils.make
+===================================================================
+--- epiphany-browser-2.31.5.orig/gnome-doc-utils.make 2010-07-11 13:54:11.000000000 +0200
++++ epiphany-browser-2.31.5/gnome-doc-utils.make 2010-07-28 12:43:48.062134877 +0200
@@ -266,6 +266,13 @@
.PHONY: po
po: $(_DOC_POFILES)
@@ -15569,9 +15583,10 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
-diff -Naur epiphany-browser-2.31.2.old/gtk-doc.make epiphany-browser-2.31.2/gtk-doc.make
---- epiphany-browser-2.31.2.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
-+++ epiphany-browser-2.31.2/gtk-doc.make 2010-05-25 21:53:11.256384179 +0200
+Index: epiphany-browser-2.31.5/gtk-doc.make
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ epiphany-browser-2.31.5/gtk-doc.make 2010-07-28 12:43:48.062134877 +0200
@@ -0,0 +1,230 @@
+# -*- mode: makefile -*-
+
@@ -15803,9 +15818,10 @@
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-diff -Naur epiphany-browser-2.31.2.old/help/Makefile.in epiphany-browser-2.31.2/help/Makefile.in
---- epiphany-browser-2.31.2.old/help/Makefile.in 2010-05-24 14:03:22.000000000 +0200
-+++ epiphany-browser-2.31.2/help/Makefile.in 2010-05-25 21:53:16.828371684 +0200
+Index: epiphany-browser-2.31.5/help/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/help/Makefile.in 2010-07-14 12:44:10.000000000 +0200
++++ epiphany-browser-2.31.5/help/Makefile.in 2010-07-28 12:44:09.846625144 +0200
@@ -142,6 +142,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15889,9 +15905,10 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
-diff -Naur epiphany-browser-2.31.2.old/lib/egg/Makefile.in epiphany-browser-2.31.2/lib/egg/Makefile.in
---- epiphany-browser-2.31.2.old/lib/egg/Makefile.in 2010-05-24 14:03:23.000000000 +0200
-+++ epiphany-browser-2.31.2/lib/egg/Makefile.in 2010-05-25 21:53:17.120371643 +0200
+Index: epiphany-browser-2.31.5/lib/egg/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/lib/egg/Makefile.in 2010-07-14 12:44:11.000000000 +0200
++++ epiphany-browser-2.31.5/lib/egg/Makefile.in 2010-07-28 12:44:10.190625136 +0200
@@ -165,6 +165,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15914,9 +15931,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/lib/Makefile.in epiphany-browser-2.31.2/lib/Makefile.in
---- epiphany-browser-2.31.2.old/lib/Makefile.in 2010-05-24 14:03:23.000000000 +0200
-+++ epiphany-browser-2.31.2/lib/Makefile.in 2010-05-25 21:53:17.008373899 +0200
+Index: epiphany-browser-2.31.5/lib/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/lib/Makefile.in 2010-07-14 12:44:11.000000000 +0200
++++ epiphany-browser-2.31.5/lib/Makefile.in 2010-07-28 12:44:10.058625391 +0200
@@ -275,6 +275,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15948,9 +15966,10 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-diff -Naur epiphany-browser-2.31.2.old/lib/widgets/Makefile.in epiphany-browser-2.31.2/lib/widgets/Makefile.in
---- epiphany-browser-2.31.2.old/lib/widgets/Makefile.in 2010-05-24 14:03:23.000000000 +0200
-+++ epiphany-browser-2.31.2/lib/widgets/Makefile.in 2010-05-25 21:53:17.220371640 +0200
+Index: epiphany-browser-2.31.5/lib/widgets/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/lib/widgets/Makefile.in 2010-07-14 12:44:11.000000000 +0200
++++ epiphany-browser-2.31.5/lib/widgets/Makefile.in 2010-07-28 12:44:10.306626437 +0200
@@ -160,6 +160,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15973,9 +15992,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/ltmain.sh epiphany-browser-2.31.2/ltmain.sh
---- epiphany-browser-2.31.2.old/ltmain.sh 2010-04-27 13:58:02.000000000 +0200
-+++ epiphany-browser-2.31.2/ltmain.sh 2010-05-25 21:53:10.568374536 +0200
+Index: epiphany-browser-2.31.5/ltmain.sh
+===================================================================
+--- epiphany-browser-2.31.5.orig/ltmain.sh 2010-07-11 13:54:10.000000000 +0200
++++ epiphany-browser-2.31.5/ltmain.sh 2010-07-28 12:44:03.210126466 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -16054,9 +16074,10 @@
esac
;;
no)
-diff -Naur epiphany-browser-2.31.2.old/m4/gtk-doc.m4 epiphany-browser-2.31.2/m4/gtk-doc.m4
---- epiphany-browser-2.31.2.old/m4/gtk-doc.m4 2010-04-27 13:58:02.000000000 +0200
-+++ epiphany-browser-2.31.2/m4/gtk-doc.m4 2010-05-25 21:53:11.244386634 +0200
+Index: epiphany-browser-2.31.5/m4/gtk-doc.m4
+===================================================================
+--- epiphany-browser-2.31.5.orig/m4/gtk-doc.m4 2010-07-11 13:54:11.000000000 +0200
++++ epiphany-browser-2.31.5/m4/gtk-doc.m4 2010-07-28 12:43:48.066625783 +0200
@@ -8,6 +8,12 @@
[
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -16103,9 +16124,10 @@
AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
])
-diff -Naur epiphany-browser-2.31.2.old/m4/intltool.m4 epiphany-browser-2.31.2/m4/intltool.m4
---- epiphany-browser-2.31.2.old/m4/intltool.m4 2010-04-27 13:58:02.000000000 +0200
-+++ epiphany-browser-2.31.2/m4/intltool.m4 2010-05-25 21:53:11.196384861 +0200
+Index: epiphany-browser-2.31.5/m4/intltool.m4
+===================================================================
+--- epiphany-browser-2.31.5.orig/m4/intltool.m4 2010-07-11 13:54:11.000000000 +0200
++++ epiphany-browser-2.31.5/m4/intltool.m4 2010-07-28 12:43:48.066625783 +0200
@@ -172,7 +172,7 @@
AC_DEFUN([IT_PO_SUBDIR],
[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
@@ -16115,9 +16137,10 @@
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
-diff -Naur epiphany-browser-2.31.2.old/m4/libtool.m4 epiphany-browser-2.31.2/m4/libtool.m4
---- epiphany-browser-2.31.2.old/m4/libtool.m4 2010-04-27 13:58:02.000000000 +0200
-+++ epiphany-browser-2.31.2/m4/libtool.m4 2010-05-25 21:53:10.624373756 +0200
+Index: epiphany-browser-2.31.5/m4/libtool.m4
+===================================================================
+--- epiphany-browser-2.31.5.orig/m4/libtool.m4 2010-07-11 13:54:11.000000000 +0200
++++ epiphany-browser-2.31.5/m4/libtool.m4 2010-07-28 12:44:03.278633392 +0200
@@ -2445,7 +2445,7 @@
;;
@@ -16274,9 +16297,10 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-diff -Naur epiphany-browser-2.31.2.old/Makefile.in epiphany-browser-2.31.2/Makefile.in
---- epiphany-browser-2.31.2.old/Makefile.in 2010-05-24 14:03:24.000000000 +0200
-+++ epiphany-browser-2.31.2/Makefile.in 2010-05-25 21:53:17.748372548 +0200
+Index: epiphany-browser-2.31.5/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/Makefile.in 2010-07-14 12:44:12.000000000 +0200
++++ epiphany-browser-2.31.5/Makefile.in 2010-07-28 12:44:10.942624894 +0200
@@ -178,6 +178,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16299,9 +16323,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/src/bookmarks/Makefile.in epiphany-browser-2.31.2/src/bookmarks/Makefile.in
---- epiphany-browser-2.31.2.old/src/bookmarks/Makefile.in 2010-05-24 14:03:24.000000000 +0200
-+++ epiphany-browser-2.31.2/src/bookmarks/Makefile.in 2010-05-25 21:53:17.600372106 +0200
+Index: epiphany-browser-2.31.5/src/bookmarks/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/src/bookmarks/Makefile.in 2010-07-14 12:44:12.000000000 +0200
++++ epiphany-browser-2.31.5/src/bookmarks/Makefile.in 2010-07-28 12:44:10.762624680 +0200
@@ -208,6 +208,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16324,9 +16349,10 @@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
-diff -Naur epiphany-browser-2.31.2.old/src/Makefile.in epiphany-browser-2.31.2/src/Makefile.in
---- epiphany-browser-2.31.2.old/src/Makefile.in 2010-05-24 14:03:23.000000000 +0200
-+++ epiphany-browser-2.31.2/src/Makefile.in 2010-05-25 21:53:17.452372646 +0200
+Index: epiphany-browser-2.31.5/src/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/src/Makefile.in 2010-07-14 12:44:12.000000000 +0200
++++ epiphany-browser-2.31.5/src/Makefile.in 2010-07-28 12:44:10.590625691 +0200
@@ -333,6 +333,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16360,10 +16386,11 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-diff -Naur epiphany-browser-2.31.2.old/tests/Makefile.in epiphany-browser-2.31.2/tests/Makefile.in
---- epiphany-browser-2.31.2.old/tests/Makefile.in 2010-05-24 14:03:24.000000000 +0200
-+++ epiphany-browser-2.31.2/tests/Makefile.in 2010-05-25 21:53:17.684371953 +0200
-@@ -210,6 +210,8 @@
+Index: epiphany-browser-2.31.5/tests/Makefile.in
+===================================================================
+--- epiphany-browser-2.31.5.orig/tests/Makefile.in 2010-07-14 12:44:12.000000000 +0200
++++ epiphany-browser-2.31.5/tests/Makefile.in 2010-07-28 12:44:10.866625976 +0200
+@@ -221,6 +221,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -16372,7 +16399,7 @@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
-@@ -263,9 +265,12 @@
+@@ -274,9 +276,12 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
More information about the pkg-gnome-commits
mailing list