r23626 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in patches/05_libexecdir.patch patches/99_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Fri Apr 9 05:23:37 UTC 2010
Author: slomo
Date: Fri Apr 9 05:23:36 2010
New Revision: 23626
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23626
Log:
* update patches
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/05_libexecdir.patch
desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=23626&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Fri Apr 9 05:23:36 2010
@@ -5,11 +5,14 @@
- Updated to apply cleanly again.
+ debian/patches/99_autoreconf.patch:
- Refreshed.
+ + debian/control.in:
+ - Break epiphany-extensions << 2.30.0-4 because of
+ new, finally correct extensions directory.
* debian/patches/13_gtk-2.18.patch,
debian/control.in:
+ Drop GTK+ 2.18 patch and build depend on GTK+ >= 2.20.
- -- Sebastian Dröge <slomo at debian.org> Thu, 08 Apr 2010 16:42:16 +0200
+ -- Sebastian Dröge <slomo at debian.org> Fri, 09 Apr 2010 06:28:27 +0200
epiphany-browser (2.30.0-1) 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=23626&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Fri Apr 9 05:23:36 2010
@@ -75,6 +75,7 @@
Recommends: yelp,
evince,
ca-certificates
+Breaks: epiphany-extensions (<< 2.30.0-4)
Provides: www-browser, gnome-www-browser
Description: Intuitive GNOME web browser
Epiphany is a simple yet powerful GNOME web browser targeted at
Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=23626&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Fri Apr 9 05:23:36 2010
@@ -70,6 +70,7 @@
Recommends: yelp,
evince,
ca-certificates
+Breaks: epiphany-extensions (<< 2.30.0-4)
Provides: www-browser, gnome-www-browser
Description: Intuitive GNOME web browser
Epiphany is a simple yet powerful GNOME web browser targeted at
Modified: desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch?rev=23626&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch [utf-8] Fri Apr 9 05:23:36 2010
@@ -21,8 +21,8 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
-+ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" \
++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_API_VERSION)/extensions"\" \
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = \
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=23626&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] Fri Apr 9 05:23:36 2010
@@ -1,6 +1,6 @@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/aclocal.m4 epiphany-browser-2.30.1/aclocal.m4
---- epiphany-browser-2.30.1.old/aclocal.m4 2010-04-08 16:21:21.000000000 +0200
-+++ epiphany-browser-2.30.1/aclocal.m4 2010-04-08 16:50:04.927333786 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/aclocal.m4 epiphany-browser-2.30.2/aclocal.m4
+--- epiphany-browser-2.30.2.old/aclocal.m4 2010-04-08 16:57:10.000000000 +0200
++++ epiphany-browser-2.30.2/aclocal.m4 2010-04-09 07:22:21.292340027 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -49,9 +49,9 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/config.h.in epiphany-browser-2.30.1/config.h.in
---- epiphany-browser-2.30.1.old/config.h.in 2010-04-08 16:21:35.000000000 +0200
-+++ epiphany-browser-2.30.1/config.h.in 2010-04-08 16:50:06.286306163 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/config.h.in epiphany-browser-2.30.2/config.h.in
+--- epiphany-browser-2.30.2.old/config.h.in 2010-04-08 16:57:24.000000000 +0200
++++ epiphany-browser-2.30.2/config.h.in 2010-04-09 07:22:22.600320244 +0200
@@ -172,6 +172,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -62,14 +62,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/configure epiphany-browser-2.30.1/configure
---- epiphany-browser-2.30.1.old/configure 2010-04-08 16:21:26.000000000 +0200
-+++ epiphany-browser-2.30.1/configure 2010-04-08 16:50:05.915305020 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/configure epiphany-browser-2.30.2/configure
+--- epiphany-browser-2.30.2.old/configure 2010-04-08 16:57:15.000000000 +0200
++++ epiphany-browser-2.30.2/configure 2010-04-09 07:22:22.329312257 +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.30.1.
-+# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.30.1.
+-# Generated by GNU Autoconf 2.63 for GNOME Web Browser 2.30.2.
++# Generated by GNU Autoconf 2.65 for GNOME Web Browser 2.30.2.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -876,8 +876,8 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.30.1'
- PACKAGE_STRING='GNOME Web Browser 2.30.1'
+ PACKAGE_VERSION='2.30.2'
+ PACKAGE_STRING='GNOME Web Browser 2.30.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+PACKAGE_URL=''
@@ -1077,7 +1077,7 @@
@@ -1847,21 +1808,432 @@
if $ac_init_version; then
cat <<\_ACEOF
- GNOME Web Browser configure 2.30.1
+ GNOME Web Browser configure 2.30.2
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -1505,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.30.1, which was
+ It was created by GNOME Web Browser $as_me 2.30.2, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -2122,7 +2122,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.30.1'
+ VERSION='2.30.2'
@@ -2788,7 +3119,7 @@
@@ -14636,7 +14636,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.30.1, which was
+ This file was extended by GNOME Web Browser $as_me 2.30.2, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -14672,7 +14672,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.30.1
+ GNOME Web Browser config.status 2.30.2
-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,
@@ -15148,9 +15148,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/data/art/Makefile.in epiphany-browser-2.30.1/data/art/Makefile.in
---- epiphany-browser-2.30.1.old/data/art/Makefile.in 2010-04-08 16:21:23.000000000 +0200
-+++ epiphany-browser-2.30.1/data/art/Makefile.in 2010-04-08 16:50:07.195304307 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/art/Makefile.in epiphany-browser-2.30.2/data/art/Makefile.in
+--- epiphany-browser-2.30.2.old/data/art/Makefile.in 2010-04-08 16:57:12.000000000 +0200
++++ epiphany-browser-2.30.2/data/art/Makefile.in 2010-04-09 07:22:23.429311631 +0200
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15168,9 +15168,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/data/glade/Makefile.in epiphany-browser-2.30.1/data/glade/Makefile.in
---- epiphany-browser-2.30.1.old/data/glade/Makefile.in 2010-04-08 16:21:23.000000000 +0200
-+++ epiphany-browser-2.30.1/data/glade/Makefile.in 2010-04-08 16:50:07.251304860 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/glade/Makefile.in epiphany-browser-2.30.2/data/glade/Makefile.in
+--- epiphany-browser-2.30.2.old/data/glade/Makefile.in 2010-04-08 16:57:12.000000000 +0200
++++ epiphany-browser-2.30.2/data/glade/Makefile.in 2010-04-09 07:22:23.485311072 +0200
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15188,9 +15188,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/data/icons/Makefile.in epiphany-browser-2.30.1/data/icons/Makefile.in
---- epiphany-browser-2.30.1.old/data/icons/Makefile.in 2010-04-08 16:21:23.000000000 +0200
-+++ epiphany-browser-2.30.1/data/icons/Makefile.in 2010-04-08 16:50:07.311304241 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/icons/Makefile.in epiphany-browser-2.30.2/data/icons/Makefile.in
+--- epiphany-browser-2.30.2.old/data/icons/Makefile.in 2010-04-08 16:57:12.000000000 +0200
++++ epiphany-browser-2.30.2/data/icons/Makefile.in 2010-04-09 07:22:23.545311298 +0200
@@ -119,6 +119,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15208,9 +15208,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/data/Makefile.in epiphany-browser-2.30.1/data/Makefile.in
---- epiphany-browser-2.30.1.old/data/Makefile.in 2010-04-08 16:21:23.000000000 +0200
-+++ epiphany-browser-2.30.1/data/Makefile.in 2010-04-08 16:50:07.135304640 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/Makefile.in epiphany-browser-2.30.2/data/Makefile.in
+--- epiphany-browser-2.30.2.old/data/Makefile.in 2010-04-08 16:57:12.000000000 +0200
++++ epiphany-browser-2.30.2/data/Makefile.in 2010-04-09 07:22:23.369312314 +0200
@@ -191,6 +191,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15228,9 +15228,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/data/ui/Makefile.in epiphany-browser-2.30.1/data/ui/Makefile.in
---- epiphany-browser-2.30.1.old/data/ui/Makefile.in 2010-04-08 16:21:23.000000000 +0200
-+++ epiphany-browser-2.30.1/data/ui/Makefile.in 2010-04-08 16:50:07.367304160 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/data/ui/Makefile.in epiphany-browser-2.30.2/data/ui/Makefile.in
+--- epiphany-browser-2.30.2.old/data/ui/Makefile.in 2010-04-08 16:57:12.000000000 +0200
++++ epiphany-browser-2.30.2/data/ui/Makefile.in 2010-04-09 07:22:23.605311660 +0200
@@ -141,6 +141,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15248,9 +15248,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/doc/Makefile.in epiphany-browser-2.30.1/doc/Makefile.in
---- epiphany-browser-2.30.1.old/doc/Makefile.in 2010-04-08 16:21:23.000000000 +0200
-+++ epiphany-browser-2.30.1/doc/Makefile.in 2010-04-08 16:50:07.431304194 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/doc/Makefile.in epiphany-browser-2.30.2/doc/Makefile.in
+--- epiphany-browser-2.30.2.old/doc/Makefile.in 2010-04-08 16:57:12.000000000 +0200
++++ epiphany-browser-2.30.2/doc/Makefile.in 2010-04-09 07:22:23.717311498 +0200
@@ -182,6 +182,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15268,9 +15268,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/doc/reference/Makefile.in epiphany-browser-2.30.1/doc/reference/Makefile.in
---- epiphany-browser-2.30.1.old/doc/reference/Makefile.in 2010-04-08 16:21:23.000000000 +0200
-+++ epiphany-browser-2.30.1/doc/reference/Makefile.in 2010-04-08 16:50:07.495304021 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/doc/reference/Makefile.in epiphany-browser-2.30.2/doc/reference/Makefile.in
+--- epiphany-browser-2.30.2.old/doc/reference/Makefile.in 2010-04-08 16:57:12.000000000 +0200
++++ epiphany-browser-2.30.2/doc/reference/Makefile.in 2010-04-09 07:22:23.781311322 +0200
@@ -123,6 +123,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15288,9 +15288,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/embed/Makefile.in epiphany-browser-2.30.1/embed/Makefile.in
---- epiphany-browser-2.30.1.old/embed/Makefile.in 2010-04-08 16:21:23.000000000 +0200
-+++ epiphany-browser-2.30.1/embed/Makefile.in 2010-04-08 16:50:07.695304308 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/embed/Makefile.in epiphany-browser-2.30.2/embed/Makefile.in
+--- epiphany-browser-2.30.2.old/embed/Makefile.in 2010-04-08 16:57:13.000000000 +0200
++++ epiphany-browser-2.30.2/embed/Makefile.in 2010-04-09 07:22:23.936310496 +0200
@@ -196,6 +196,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15308,9 +15308,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/gnome-doc-utils.make epiphany-browser-2.30.1/gnome-doc-utils.make
---- epiphany-browser-2.30.1.old/gnome-doc-utils.make 2010-04-08 16:11:38.000000000 +0200
-+++ epiphany-browser-2.30.1/gnome-doc-utils.make 2010-04-08 16:50:01.870408186 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/gnome-doc-utils.make epiphany-browser-2.30.2/gnome-doc-utils.make
+--- epiphany-browser-2.30.2.old/gnome-doc-utils.make 2010-04-08 16:11:38.000000000 +0200
++++ epiphany-browser-2.30.2/gnome-doc-utils.make 2010-04-09 07:22:18.564720048 +0200
@@ -266,6 +266,13 @@
.PHONY: po
po: $(_DOC_POFILES)
@@ -15368,9 +15368,9 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/gtk-doc.make epiphany-browser-2.30.1/gtk-doc.make
---- epiphany-browser-2.30.1.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
-+++ epiphany-browser-2.30.1/gtk-doc.make 2010-04-08 16:50:01.806311777 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/gtk-doc.make epiphany-browser-2.30.2/gtk-doc.make
+--- epiphany-browser-2.30.2.old/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100
++++ epiphany-browser-2.30.2/gtk-doc.make 2010-04-09 07:22:18.489312627 +0200
@@ -0,0 +1,224 @@
+# -*- mode: makefile -*-
+
@@ -15596,9 +15596,9 @@
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/help/Makefile.in epiphany-browser-2.30.1/help/Makefile.in
---- epiphany-browser-2.30.1.old/help/Makefile.in 2010-04-08 16:21:24.000000000 +0200
-+++ epiphany-browser-2.30.1/help/Makefile.in 2010-04-08 16:50:07.775304348 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/help/Makefile.in epiphany-browser-2.30.2/help/Makefile.in
+--- epiphany-browser-2.30.2.old/help/Makefile.in 2010-04-08 16:57:13.000000000 +0200
++++ epiphany-browser-2.30.2/help/Makefile.in 2010-04-09 07:22:24.033313893 +0200
@@ -142,6 +142,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15677,9 +15677,9 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/lib/egg/Makefile.in epiphany-browser-2.30.1/lib/egg/Makefile.in
---- epiphany-browser-2.30.1.old/lib/egg/Makefile.in 2010-04-08 16:21:24.000000000 +0200
-+++ epiphany-browser-2.30.1/lib/egg/Makefile.in 2010-04-08 16:50:08.071304601 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/lib/egg/Makefile.in epiphany-browser-2.30.2/lib/egg/Makefile.in
+--- epiphany-browser-2.30.2.old/lib/egg/Makefile.in 2010-04-08 16:57:13.000000000 +0200
++++ epiphany-browser-2.30.2/lib/egg/Makefile.in 2010-04-09 07:22:24.337311318 +0200
@@ -165,6 +165,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15697,9 +15697,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/lib/Makefile.in epiphany-browser-2.30.1/lib/Makefile.in
---- epiphany-browser-2.30.1.old/lib/Makefile.in 2010-04-08 16:21:24.000000000 +0200
-+++ epiphany-browser-2.30.1/lib/Makefile.in 2010-04-08 16:50:07.959305726 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/lib/Makefile.in epiphany-browser-2.30.2/lib/Makefile.in
+--- epiphany-browser-2.30.2.old/lib/Makefile.in 2010-04-08 16:57:13.000000000 +0200
++++ epiphany-browser-2.30.2/lib/Makefile.in 2010-04-09 07:22:24.229311207 +0200
@@ -275,6 +275,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15721,14 +15721,14 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" \
+ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_API_VERSION)/extensions"\" \
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/lib/widgets/Makefile.in epiphany-browser-2.30.1/lib/widgets/Makefile.in
---- epiphany-browser-2.30.1.old/lib/widgets/Makefile.in 2010-04-08 16:21:24.000000000 +0200
-+++ epiphany-browser-2.30.1/lib/widgets/Makefile.in 2010-04-08 16:50:08.175304978 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/lib/widgets/Makefile.in epiphany-browser-2.30.2/lib/widgets/Makefile.in
+--- epiphany-browser-2.30.2.old/lib/widgets/Makefile.in 2010-04-08 16:57:13.000000000 +0200
++++ epiphany-browser-2.30.2/lib/widgets/Makefile.in 2010-04-09 07:22:24.441311621 +0200
@@ -160,6 +160,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -15746,9 +15746,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/ltmain.sh epiphany-browser-2.30.1/ltmain.sh
---- epiphany-browser-2.30.1.old/ltmain.sh 2010-04-08 16:11:37.000000000 +0200
-+++ epiphany-browser-2.30.1/ltmain.sh 2010-04-08 16:50:01.095308632 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/ltmain.sh epiphany-browser-2.30.2/ltmain.sh
+--- epiphany-browser-2.30.2.old/ltmain.sh 2010-04-08 16:11:37.000000000 +0200
++++ epiphany-browser-2.30.2/ltmain.sh 2010-04-09 07:22:17.965312926 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -15827,9 +15827,9 @@
esac
;;
no)
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/m4/gtk-doc.m4 epiphany-browser-2.30.1/m4/gtk-doc.m4
---- epiphany-browser-2.30.1.old/m4/gtk-doc.m4 2010-04-08 16:11:38.000000000 +0200
-+++ epiphany-browser-2.30.1/m4/gtk-doc.m4 2010-04-08 16:50:01.790306881 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/m4/gtk-doc.m4 epiphany-browser-2.30.2/m4/gtk-doc.m4
+--- epiphany-browser-2.30.2.old/m4/gtk-doc.m4 2010-04-08 16:11:38.000000000 +0200
++++ epiphany-browser-2.30.2/m4/gtk-doc.m4 2010-04-09 07:22:18.489312627 +0200
@@ -8,6 +8,12 @@
[
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -15876,9 +15876,9 @@
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.30.1.old/m4/intltool.m4 epiphany-browser-2.30.1/m4/intltool.m4
---- epiphany-browser-2.30.1.old/m4/intltool.m4 2010-04-08 16:11:38.000000000 +0200
-+++ epiphany-browser-2.30.1/m4/intltool.m4 2010-04-08 16:50:01.746307018 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/m4/intltool.m4 epiphany-browser-2.30.2/m4/intltool.m4
+--- epiphany-browser-2.30.2.old/m4/intltool.m4 2010-04-08 16:11:38.000000000 +0200
++++ epiphany-browser-2.30.2/m4/intltool.m4 2010-04-09 07:22:18.441313575 +0200
@@ -172,7 +172,7 @@
AC_DEFUN([IT_PO_SUBDIR],
[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
@@ -15888,9 +15888,9 @@
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/m4/libtool.m4 epiphany-browser-2.30.1/m4/libtool.m4
---- epiphany-browser-2.30.1.old/m4/libtool.m4 2010-04-08 16:11:37.000000000 +0200
-+++ epiphany-browser-2.30.1/m4/libtool.m4 2010-04-08 16:50:01.211309555 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/m4/libtool.m4 epiphany-browser-2.30.2/m4/libtool.m4
+--- epiphany-browser-2.30.2.old/m4/libtool.m4 2010-04-08 16:11:37.000000000 +0200
++++ epiphany-browser-2.30.2/m4/libtool.m4 2010-04-09 07:22:18.045313601 +0200
@@ -2445,7 +2445,7 @@
;;
@@ -16047,9 +16047,9 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/Makefile.in epiphany-browser-2.30.1/Makefile.in
---- epiphany-browser-2.30.1.old/Makefile.in 2010-04-08 16:21:25.000000000 +0200
-+++ epiphany-browser-2.30.1/Makefile.in 2010-04-08 16:50:08.719304356 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/Makefile.in epiphany-browser-2.30.2/Makefile.in
+--- epiphany-browser-2.30.2.old/Makefile.in 2010-04-08 16:57:14.000000000 +0200
++++ epiphany-browser-2.30.2/Makefile.in 2010-04-09 07:22:25.028311721 +0200
@@ -178,6 +178,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16067,9 +16067,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/src/bookmarks/Makefile.in epiphany-browser-2.30.1/src/bookmarks/Makefile.in
---- epiphany-browser-2.30.1.old/src/bookmarks/Makefile.in 2010-04-08 16:21:25.000000000 +0200
-+++ epiphany-browser-2.30.1/src/bookmarks/Makefile.in 2010-04-08 16:50:08.555304173 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/src/bookmarks/Makefile.in epiphany-browser-2.30.2/src/bookmarks/Makefile.in
+--- epiphany-browser-2.30.2.old/src/bookmarks/Makefile.in 2010-04-08 16:57:14.000000000 +0200
++++ epiphany-browser-2.30.2/src/bookmarks/Makefile.in 2010-04-09 07:22:24.852315810 +0200
@@ -208,6 +208,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16087,9 +16087,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/src/Makefile.in epiphany-browser-2.30.1/src/Makefile.in
---- epiphany-browser-2.30.1.old/src/Makefile.in 2010-04-08 16:21:25.000000000 +0200
-+++ epiphany-browser-2.30.1/src/Makefile.in 2010-04-08 16:50:08.407304283 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/src/Makefile.in epiphany-browser-2.30.2/src/Makefile.in
+--- epiphany-browser-2.30.2.old/src/Makefile.in 2010-04-08 16:57:14.000000000 +0200
++++ epiphany-browser-2.30.2/src/Makefile.in 2010-04-09 07:22:24.704310824 +0200
@@ -329,6 +329,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -16118,9 +16118,9 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-diff '-x*config.sub' '-x*config.guess' -Naur epiphany-browser-2.30.1.old/tests/Makefile.in epiphany-browser-2.30.1/tests/Makefile.in
---- epiphany-browser-2.30.1.old/tests/Makefile.in 2010-04-08 16:21:25.000000000 +0200
-+++ epiphany-browser-2.30.1/tests/Makefile.in 2010-04-08 16:50:08.651304371 +0200
+diff '-x*config.guess' '-x*config.sub' -Naur epiphany-browser-2.30.2.old/tests/Makefile.in epiphany-browser-2.30.2/tests/Makefile.in
+--- epiphany-browser-2.30.2.old/tests/Makefile.in 2010-04-08 16:57:14.000000000 +0200
++++ epiphany-browser-2.30.2/tests/Makefile.in 2010-04-09 07:22:24.936311194 +0200
@@ -198,6 +198,8 @@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
More information about the pkg-gnome-commits
mailing list