r14612 - in /desktop/experimental/epiphany-browser/debian: ./ patches/
samm-guest at users.alioth.debian.org
samm-guest at users.alioth.debian.org
Sat Feb 16 14:07:43 UTC 2008
Author: samm-guest
Date: Sat Feb 16 14:07:43 2008
New Revision: 14612
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14612
Log:
* New upstream development release.
* refresh 02_ac_init.patch, 05_libexecdir.patch, 06_ssl_weak_ciphers.patch,
09_download_dialog.patch, 10_url_double-click.patch
* drop 13_powered-by.patch, 15_webkit-gtk-api.patch,
16_webkit-missing-methods.patch, 17_webkit-signal-emission.patch: merged
upstream.
* drop 14_webkit-scrollbars.patch: EphyTab no longer exists.
Removed:
desktop/experimental/epiphany-browser/debian/patches/13_powered-by.patch
desktop/experimental/epiphany-browser/debian/patches/14_webkit-scrollbars.patch
desktop/experimental/epiphany-browser/debian/patches/15_webkit-gtk-api.patch
desktop/experimental/epiphany-browser/debian/patches/16_webkit-missing-methods.patch
desktop/experimental/epiphany-browser/debian/patches/17_webkit-signal-emission.patch
Modified:
desktop/experimental/epiphany-browser/debian/changelog
desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch
desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch
desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch
desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch
desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch
desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch
desktop/experimental/epiphany-browser/debian/patches/series
desktop/experimental/epiphany-browser/debian/rules
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=14612&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Sat Feb 16 14:07:43 2008
@@ -1,3 +1,15 @@
+epiphany-browser (2.21.4-1) UNRELEASED; urgency=low
+
+ * New upstream development release.
+ * refresh 02_ac_init.patch, 05_libexecdir.patch, 06_ssl_weak_ciphers.patch,
+ 09_download_dialog.patch, 10_url_double-click.patch
+ * drop 13_powered-by.patch, 15_webkit-gtk-api.patch,
+ 16_webkit-missing-methods.patch, 17_webkit-signal-emission.patch: merged
+ upstream.
+ * drop 14_webkit-scrollbars.patch: EphyTab no longer exists.
+
+ -- Sam Morris <sam at robots.org.uk> Mon, 14 Jan 2008 21:06:03 +0000
+
epiphany-browser (2.20.3-1) unstable; urgency=low
* New upstream translation and bugfix release.
Modified: desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch?rev=14612&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch Sat Feb 16 14:07:43 2008
@@ -1,13 +1,13 @@
-Index: epiphany-2.20.0/configure.ac
+Index: epiphany-browser-2.21.4/configure.ac
===================================================================
---- epiphany-2.20.0.orig/configure.ac 2007-09-10 23:22:03.000000000 +0200
-+++ epiphany-2.20.0/configure.ac 2007-09-21 14:29:47.765809378 +0200
-@@ -15,7 +15,7 @@
- # with this program; if not, write to the Free Software Foundation, Inc.,
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+--- epiphany-browser-2.21.4.orig/configure.ac 2007-12-16 13:25:57.000000000 +0000
++++ epiphany-browser-2.21.4/configure.ac 2008-01-14 21:45:09.000000000 +0000
+@@ -24,7 +24,7 @@
+ # This can be either "trunk" or "branches/gnome-x-y"
+ m4_define([epiphany_branch],["trunk"])
--AC_INIT([GNOME Web Browser],[2.20.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
-+AC_INIT([GNOME Web Browser],[2.20.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
+-AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
++AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
GNOME_COMMON_INIT
Modified: desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch?rev=14612&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch Sat Feb 16 14:07:43 2008
@@ -1,8 +1,8 @@
-Index: epiphany-2.20.3/data/epiphany.pc.in
+Index: epiphany-browser-2.21.4/data/epiphany.pc.in
===================================================================
---- epiphany-2.20.3.orig/data/epiphany.pc.in 2007-08-27 22:19:01.000000000 +0200
-+++ epiphany-2.20.3/data/epiphany.pc.in 2008-01-12 02:25:29.815203666 +0100
-@@ -2,8 +2,8 @@ prefix=@prefix@
+--- epiphany-browser-2.21.4.orig/data/epiphany.pc.in 2007-11-04 23:44:58.000000000 +0000
++++ epiphany-browser-2.21.4/data/epiphany.pc.in 2008-01-14 21:46:10.000000000 +0000
+@@ -2,8 +2,8 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@
@@ -13,11 +13,11 @@
datarootdir=@datarootdir@
datadir=@datadir@
icondir=@datadir@/@PACKAGE@/icons
-Index: epiphany-2.20.3/embed/mozilla/Makefile.am
+Index: epiphany-browser-2.21.4/embed/mozilla/Makefile.am
===================================================================
---- epiphany-2.20.3.orig/embed/mozilla/Makefile.am 2007-08-27 22:19:02.000000000 +0200
-+++ epiphany-2.20.3/embed/mozilla/Makefile.am 2008-01-12 02:25:29.815203666 +0100
-@@ -141,7 +141,7 @@ libephymozillaembed_la_CPPFLAGS = \
+--- epiphany-browser-2.21.4.orig/embed/mozilla/Makefile.am 2007-07-16 21:02:17.000000000 +0100
++++ epiphany-browser-2.21.4/embed/mozilla/Makefile.am 2008-01-14 21:46:10.000000000 +0000
+@@ -141,7 +141,7 @@
-I$(top_srcdir) \
$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -26,11 +26,11 @@
-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-Index: epiphany-2.20.3/embed/mozilla/Makefile.in
+Index: epiphany-browser-2.21.4/embed/mozilla/Makefile.in
===================================================================
---- epiphany-2.20.3.orig/embed/mozilla/Makefile.in 2008-01-07 23:48:14.000000000 +0100
-+++ epiphany-2.20.3/embed/mozilla/Makefile.in 2008-01-12 02:25:29.815203666 +0100
-@@ -458,7 +458,7 @@ libephymozillaembed_la_CPPFLAGS = \
+--- epiphany-browser-2.21.4.orig/embed/mozilla/Makefile.in 2007-12-16 13:26:20.000000000 +0000
++++ epiphany-browser-2.21.4/embed/mozilla/Makefile.in 2008-01-14 21:46:10.000000000 +0000
+@@ -489,7 +489,7 @@
-I$(top_srcdir) \
$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -39,11 +39,11 @@
-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-Index: epiphany-2.20.3/lib/Makefile.am
+Index: epiphany-browser-2.21.4/lib/Makefile.am
===================================================================
---- epiphany-2.20.3.orig/lib/Makefile.am 2007-08-27 22:19:00.000000000 +0200
-+++ epiphany-2.20.3/lib/Makefile.am 2008-01-12 02:25:29.815203666 +0100
-@@ -76,7 +76,7 @@ nodist_libephymisc_la_SOURCES = \
+--- epiphany-browser-2.21.4.orig/lib/Makefile.am 2007-11-12 10:48:23.000000000 +0000
++++ epiphany-browser-2.21.4/lib/Makefile.am 2008-01-14 21:46:10.000000000 +0000
+@@ -78,7 +78,7 @@
libephymisc_la_CPPFLAGS = \
-I$(top_builddir)/lib \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -52,11 +52,11 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = \
-Index: epiphany-2.20.3/lib/Makefile.in
+Index: epiphany-browser-2.21.4/lib/Makefile.in
===================================================================
---- epiphany-2.20.3.orig/lib/Makefile.in 2008-01-07 23:48:15.000000000 +0100
-+++ epiphany-2.20.3/lib/Makefile.in 2008-01-12 02:25:29.815203666 +0100
-@@ -406,7 +406,7 @@ nodist_libephymisc_la_SOURCES = \
+--- epiphany-browser-2.21.4.orig/lib/Makefile.in 2007-12-16 13:26:23.000000000 +0000
++++ epiphany-browser-2.21.4/lib/Makefile.in 2008-01-14 21:46:10.000000000 +0000
+@@ -441,7 +441,7 @@
libephymisc_la_CPPFLAGS = \
-I$(top_builddir)/lib \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -65,21 +65,21 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-2.20.3/plugins/desktop-file/Makefile.am
+Index: epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am
===================================================================
---- epiphany-2.20.3.orig/plugins/desktop-file/Makefile.am 2007-08-27 22:18:53.000000000 +0200
-+++ epiphany-2.20.3/plugins/desktop-file/Makefile.am 2008-01-12 02:25:29.819203893 +0100
+--- epiphany-browser-2.21.4.orig/plugins/desktop-file/Makefile.am 2007-07-16 21:02:37.000000000 +0100
++++ epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am 2008-01-14 21:46:10.000000000 +0000
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
+plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
plugin_LTLIBRARIES = libdesktopfileplugin.la
libdesktopfileplugin_la_SOURCES = \
-Index: epiphany-2.20.3/plugins/desktop-file/Makefile.in
+Index: epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in
===================================================================
---- epiphany-2.20.3.orig/plugins/desktop-file/Makefile.in 2008-01-07 23:48:16.000000000 +0100
-+++ epiphany-2.20.3/plugins/desktop-file/Makefile.in 2008-01-12 02:25:29.819203893 +0100
-@@ -292,7 +292,7 @@ target_alias = @target_alias@
+--- epiphany-browser-2.21.4.orig/plugins/desktop-file/Makefile.in 2007-12-16 13:26:23.000000000 +0000
++++ epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in 2008-01-14 21:46:10.000000000 +0000
+@@ -323,7 +323,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_engine = @with_engine@
@@ -88,11 +88,11 @@
plugin_LTLIBRARIES = libdesktopfileplugin.la
libdesktopfileplugin_la_SOURCES = \
plugin.cpp
-Index: epiphany-2.20.3/src/Makefile.am
+Index: epiphany-browser-2.21.4/src/Makefile.am
===================================================================
---- epiphany-2.20.3.orig/src/Makefile.am 2007-08-27 22:18:55.000000000 +0200
-+++ epiphany-2.20.3/src/Makefile.am 2008-01-12 02:25:29.819203893 +0100
-@@ -112,8 +112,8 @@ libephymain_la_CPPFLAGS = \
+--- epiphany-browser-2.21.4.orig/src/Makefile.am 2007-11-16 15:09:42.000000000 +0000
++++ epiphany-browser-2.21.4/src/Makefile.am 2008-01-14 21:46:10.000000000 +0000
+@@ -113,8 +113,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -103,7 +103,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -164,8 +164,8 @@ libpyphany_la_CPPFLAGS = \
+@@ -165,8 +165,8 @@
-I$(top_builddir)/src \
-I$(top_builddir)/src/bookmarks \
$(PYTHON_INCLUDES) \
@@ -114,11 +114,11 @@
-DDATADIR=\""$(datadir)"\" \
$(AM_CPPFLAGS)
-Index: epiphany-2.20.3/src/Makefile.in
+Index: epiphany-browser-2.21.4/src/Makefile.in
===================================================================
---- epiphany-2.20.3.orig/src/Makefile.in 2008-01-07 23:48:17.000000000 +0100
-+++ epiphany-2.20.3/src/Makefile.in 2008-01-12 02:25:29.819203893 +0100
-@@ -518,8 +518,8 @@ libephymain_la_CPPFLAGS = \
+--- epiphany-browser-2.21.4.orig/src/Makefile.in 2007-12-16 13:26:24.000000000 +0000
++++ epiphany-browser-2.21.4/src/Makefile.in 2008-01-14 21:46:10.000000000 +0000
+@@ -558,8 +558,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -129,7 +129,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -557,8 +557,8 @@ libephymain_la_CFLAGS = \
+@@ -597,8 +597,8 @@
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
@ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
Modified: desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch?rev=14612&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/06_ssl_weak_ciphers.patch Sat Feb 16 14:07:43 2008
@@ -1,8 +1,8 @@
-Index: epiphany-2.20.3/data/default-prefs-common.js
+Index: epiphany-browser-2.21.4/data/default-prefs-common.js
===================================================================
---- epiphany-2.20.3.orig/data/default-prefs-common.js 2008-01-07 23:47:27.000000000 +0100
-+++ epiphany-2.20.3/data/default-prefs-common.js 2008-01-12 02:25:48.144248178 +0100
-@@ -170,3 +170,6 @@ pref("dom.disable_window_flip", true);
+--- epiphany-browser-2.21.4.orig/data/default-prefs-common.js 2007-11-12 10:48:23.000000000 +0000
++++ epiphany-browser-2.21.4/data/default-prefs-common.js 2008-01-14 21:47:03.000000000 +0000
+@@ -171,3 +171,6 @@
// set to true for parity with gtk entries
pref("bidi.edit.delete_immediately", true);
Modified: desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch?rev=14612&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch Sat Feb 16 14:07:43 2008
@@ -1,7 +1,7 @@
Index: embed/mozilla/ContentHandler.cpp
===================================================================
---- embed/mozilla/ContentHandler.cpp.orig 2007-08-27 22:19:02.000000000 +0200
-+++ embed/mozilla/ContentHandler.cpp 2007-09-21 14:30:06.194859590 +0200
+--- embed/mozilla/ContentHandler.cpp.orig 2007-09-13 14:21:40.000000000 +0100
++++ embed/mozilla/ContentHandler.cpp 2008-01-14 21:47:37.000000000 +0000
@@ -336,8 +336,11 @@
gtk_dialog_add_button (GTK_DIALOG (dialog),
@@ -45,8 +45,8 @@
}
Index: data/glade/prefs-dialog.glade
===================================================================
---- data/glade/prefs-dialog.glade.orig 2007-08-27 22:19:01.000000000 +0200
-+++ data/glade/prefs-dialog.glade 2007-09-21 14:30:06.198859818 +0200
+--- data/glade/prefs-dialog.glade.orig 2007-11-12 10:48:23.000000000 +0000
++++ data/glade/prefs-dialog.glade 2008-01-14 21:47:37.000000000 +0000
@@ -303,6 +303,25 @@
<property name="spacing">6</property>
@@ -101,9 +101,9 @@
</widget>
Index: src/prefs-dialog.c
===================================================================
---- src/prefs-dialog.c.orig 2007-08-27 22:18:55.000000000 +0200
-+++ src/prefs-dialog.c 2007-09-21 14:30:06.198859818 +0200
-@@ -391,6 +391,13 @@
+--- src/prefs-dialog.c.orig 2007-11-16 15:09:42.000000000 +0000
++++ src/prefs-dialog.c 2008-01-14 21:47:37.000000000 +0000
+@@ -393,6 +393,13 @@
}
static void
@@ -117,7 +117,7 @@
setup_font_combo (EphyDialog *dialog,
const char *type,
const char *code,
-@@ -1525,6 +1532,7 @@
+@@ -1529,6 +1536,7 @@
EphyDialog *dialog = EPHY_DIALOG (pd);
EphyEncodings *encodings;
GtkWidget *window, *curr_button, *blank_button;
@@ -125,7 +125,7 @@
GtkWidget *clear_cache_button, *font_prefs_button;
GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container;
gboolean sensitive;
-@@ -1545,6 +1553,8 @@
+@@ -1549,6 +1557,8 @@
properties[WINDOW_PROP].id, &window,
properties[HOMEPAGE_CURRENT_PROP].id, &curr_button,
properties[HOMEPAGE_BLANK_PROP].id, &blank_button,
@@ -134,7 +134,7 @@
properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button,
properties[CSS_CHECKBOX_PROP].id, &css_checkbox,
properties[CSS_EDIT_BOX_PROP].id, &css_edit_box,
-@@ -1568,6 +1578,10 @@
+@@ -1572,6 +1582,10 @@
gtk_widget_set_sensitive (curr_button, sensitive);
gtk_widget_set_sensitive (blank_button, sensitive);
Modified: desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch?rev=14612&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/10_url_double-click.patch Sat Feb 16 14:07:43 2008
@@ -1,8 +1,8 @@
-Index: epiphany-2.20.0/lib/widgets/ephy-location-entry.c
+Index: epiphany-browser-2.21.4/lib/widgets/ephy-location-entry.c
===================================================================
---- epiphany-2.20.0.orig/lib/widgets/ephy-location-entry.c 2007-08-27 22:19:00.000000000 +0200
-+++ epiphany-2.20.0/lib/widgets/ephy-location-entry.c 2007-09-21 14:30:14.987360646 +0200
-@@ -353,18 +353,6 @@
+--- epiphany-browser-2.21.4.orig/lib/widgets/ephy-location-entry.c 2007-10-04 00:32:03.000000000 +0100
++++ epiphany-browser-2.21.4/lib/widgets/ephy-location-entry.c 2008-01-14 21:48:01.000000000 +0000
+@@ -368,18 +368,6 @@
}
static gboolean
@@ -21,7 +21,7 @@
entry_key_press_cb (GtkEntry *entry,
GdkEventKey *event,
EphyLocationEntry *lentry)
-@@ -923,8 +911,6 @@
+@@ -938,8 +926,6 @@
G_CALLBACK (entry_key_press_after_cb), entry);
g_signal_connect_after (priv->icon_entry->entry, "activate",
G_CALLBACK (entry_activate_after_cb), entry);
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=14612&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/99_autoreconf.patch Sat Feb 16 14:07:43 2008
@@ -2,11 +2,11 @@
aclocal-1.10 -I m4
automake-1.10
autoconf
-Index: epiphany-2.20.3/aclocal.m4
-===================================================================
---- epiphany-2.20.3.orig/aclocal.m4 2008-01-07 23:48:06.000000000 +0100
-+++ epiphany-2.20.3/aclocal.m4 2008-01-12 02:27:56.227547229 +0100
-@@ -682,7 +682,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
+Index: epiphany-browser-2.21.4/aclocal.m4
+===================================================================
+--- epiphany-browser-2.21.4.orig/aclocal.m4 2007-12-16 13:26:10.000000000 +0000
++++ epiphany-browser-2.21.4/aclocal.m4 2008-01-14 22:05:28.000000000 +0000
+@@ -682,7 +682,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -15,20 +15,20 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-Index: epiphany-2.20.3/configure
-===================================================================
---- epiphany-2.20.3.orig/configure 2008-01-07 23:48:19.000000000 +0100
-+++ epiphany-2.20.3/configure 2008-01-12 02:28:22.049018711 +0100
-@@ -727,7 +727,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
+Index: epiphany-browser-2.21.4/configure
+===================================================================
+--- epiphany-browser-2.21.4.orig/configure 2007-12-16 13:26:26.000000000 +0000
++++ epiphany-browser-2.21.4/configure 2008-01-14 22:05:55.000000000 +0000
+@@ -727,7 +727,7 @@
# Identity of this package.
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.20.3'
- PACKAGE_STRING='GNOME Web Browser 2.20.3'
+ PACKAGE_VERSION='2.21.4'
+ PACKAGE_STRING='GNOME Web Browser 2.21.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
-@@ -1606,7 +1606,7 @@ Fine tuning of the installation director
+@@ -1658,7 +1658,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -37,78 +37,19 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -2527,7 +2527,7 @@ fi
+@@ -2608,7 +2608,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.20.3'
-
-
-@@ -26353,12 +26353,12 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGdk\"") >&5
-- ($PKG_CONFIG --exists --print-errors "WebKitGdk") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGtk\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "WebKitGdk" 2>/dev/null`
-+ pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "WebKitGtk" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -26371,12 +26371,12 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGdk\"") >&5
-- ($PKG_CONFIG --exists --print-errors "WebKitGdk") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGtk\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "WebKitGdk" 2>/dev/null`
-+ pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "WebKitGtk" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -26395,14 +26395,14 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "WebKitGdk"`
-+ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "WebKitGtk"`
- else
-- WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "WebKitGdk"`
-+ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "WebKitGtk"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$WEBKIT_PKG_ERRORS" >&5
-
-- { { echo "$as_me:$LINENO: error: Package requirements (WebKitGdk) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (WebKitGtk) were not met:
-
- $WEBKIT_PKG_ERRORS
-
-@@ -26413,7 +26413,7 @@ Alternatively, you may set the environme
- and WEBKIT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--echo "$as_me: error: Package requirements (WebKitGdk) were not met:
-+echo "$as_me: error: Package requirements (WebKitGtk) were not met:
-
- $WEBKIT_PKG_ERRORS
-
-Index: epiphany-2.20.3/gtk-doc.make
+ VERSION='2.21.4'
+
+
+Index: epiphany-browser-2.21.4/gtk-doc.make
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ epiphany-2.20.3/gtk-doc.make 2008-01-12 02:27:03.808560042 +0100
++++ epiphany-browser-2.21.4/gtk-doc.make 2008-01-14 22:05:28.000000000 +0000
@@ -0,0 +1,174 @@
+# -*- mode: makefile -*-
+
@@ -284,11 +225,11 @@
+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
-Index: epiphany-2.20.3/ltmain.sh
-===================================================================
---- epiphany-2.20.3.orig/ltmain.sh 2007-08-01 16:12:57.000000000 +0200
-+++ epiphany-2.20.3/ltmain.sh 2007-11-27 21:09:41.000000000 +0100
-@@ -43,7 +43,7 @@ EXIT_FAILURE=1
+Index: epiphany-browser-2.21.4/ltmain.sh
+===================================================================
+--- epiphany-browser-2.21.4.orig/ltmain.sh 2007-08-01 15:12:57.000000000 +0100
++++ epiphany-browser-2.21.4/ltmain.sh 2007-11-27 21:23:09.000000000 +0000
+@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=14612&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series Sat Feb 16 14:07:43 2008
@@ -10,9 +10,4 @@
09_download_dialog.patch -p0
10_url_double-click.patch
11_useragent-weasel.patch
-13_powered-by.patch
-14_webkit-scrollbars.patch
-15_webkit-gtk-api.patch
-16_webkit-missing-methods.patch
-17_webkit-signal-emission.patch
99_autoreconf.patch
Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=14612&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules (original)
+++ desktop/experimental/epiphany-browser/debian/rules Sat Feb 16 14:07:43 2008
@@ -1,4 +1,6 @@
#!/usr/bin/make -f
+
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
More information about the pkg-gnome-commits
mailing list