- merged from DEVEL

Changed files:
    epiphany-extensions-locale-names.patch -> 1.7
    epiphany-extensions-mozilla_includes.patch -> 1.3

diff --git a/epiphany-extensions-locale-names.patch b/epiphany-extensions-locale-names.patch
index ddd0bc7aff4f743a6a04fc1d2c1b6303ad22e1dc..263a073cb768b8de6ce8564c5f0456f88756ca93 100644 (file)
--- a/epiphany-extensions-locale-names.patch
+++ b/epiphany-extensions-locale-names.patch
@@ -1,12 +1,8 @@
-diff -urN epiphany-extensions-1.1.3.orig/configure.ac epiphany-extensions-1.1.3/configure.ac
---- epiphany-extensions-1.1.3.orig/configure.ac        2004-08-16 21:08:00.479820800 +0200
-+++ epiphany-extensions-1.1.3/configure.ac     2004-08-16 21:08:14.410702984 +0200
-@@ -60,7 +60,7 @@
- dnl Internationalisation
- dnl ********************************
- 
--ALL_LINGUAS="bg ca cs da de el en_CA en_GB es fr hr hu it ja ko lt nl no pa pl pt pt_BR ru sk sq sr sr@Latn sv uk wa zh_CN"
-+ALL_LINGUAS="bg ca cs da de el en_CA en_GB es fr hr hu it ja ko lt nb nl pa pl pt pt_BR ru sk sq sr sr@Latn sv uk wa zh_CN"
- 
- GETTEXT_PACKAGE=epiphany-extensions-1.2
- AC_SUBST(GETTEXT_PACKAGE)
+diff -urN epiphany-extensions-1.5.8.orig/po/LINGUAS epiphany-extensions-1.5.8/po/LINGUAS
+--- epiphany-extensions-1.5.8.orig/po/LINGUAS  2005-02-28 03:00:19.263782224 +0100
++++ epiphany-extensions-1.5.8/po/LINGUAS       2005-02-28 03:00:42.415262664 +0100
+@@ -1,3 +1,3 @@
+ # please keep this list sorted alphabetically
+ #
+-bg ca cs da de el en_CA en_GB es fr hr hu it ja ko lt nl no pa pl pt pt_BR ru sk sq sr sr@Latn sv uk wa zh_CN
++bg ca cs da de el en_CA en_GB es fr hr hu it ja ko lt nb nl pa pl pt pt_BR ru sk sq sr sr@Latn sv uk wa zh_CN

diff --git a/epiphany-extensions-mozilla_includes.patch b/epiphany-extensions-mozilla_includes.patch
new file mode 100644 (file)
index 0000000..59badec
--- /dev/null
+++ b/epiphany-extensions-mozilla_includes.patch
@@ -0,0 +1,35 @@
+diff -urN aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am
+--- aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am   2004-12-08 16:33:52.000000000 +0100
++++ epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am      2005-02-08 17:20:49.260647760 +0100
+@@ -16,7 +16,8 @@
+       .               \
+       dom             \
+       jsconsole       \
+-      necko
++      necko \
++      webbrwsr
+ 
+ liberrorviewermozilla_la_CPPFLAGS = \
+       -I..                                            \
+diff -urN aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am
+--- aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am      2004-12-08 16:33:52.000000000 +0100
++++ epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am 2005-02-08 17:25:38.975604392 +0100
+@@ -12,6 +12,7 @@
+       layout          \
+       nkcache         \
+       necko           \
++      pref            \
+       uconv           \
+       webbrwsr
+ 
+diff -urN aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am
+--- aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am      2004-12-08 16:33:53.000000000 +0100
++++ epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am 2005-02-08 17:28:31.583364024 +0100
+@@ -6,6 +6,7 @@
+ 
+ mozilla_include_subdirs = \
+       .               \
++      dom                     \
+       necko           \
+       nkcache         \
+       webbrwsr