- merged from DEVEL

Changed files:
    epiphany-desktop.patch -> 1.3
    epiphany-mozilla_includes.patch -> 1.3

diff --git a/epiphany-desktop.patch b/epiphany-desktop.patch
index f56d13fbdd1bdc6b5d0f0c27ec86c62abe6b41b4..561dea44c36515239b61a40619fd69b53acd4f60 100644 (file)
--- a/epiphany-desktop.patch
+++ b/epiphany-desktop.patch
@@ -5,7 +5,7 @@ diff -aurN epiphany-1.3.0.orig/data/bme.desktop.in epiphany-1.3.0/data/bme.deskt
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=epiphany
  X-GNOME-Bugzilla-Component=General
--Categories=Application;Network;
+-Categories=Application;Network;GNOME;GTK;
 +Categories=GNOME;GTK;Network;
 diff -aurN epiphany-1.3.0.orig/data/epiphany.desktop.in epiphany-1.3.0/data/epiphany.desktop.in
 --- epiphany-1.3.0.orig/data/epiphany.desktop.in       2003-07-02 19:56:40.000000000 +0200
@@ -25,6 +25,6 @@ diff -aurN epiphany-1.3.0.orig/data/epiphany.desktop.in epiphany-1.3.0/data/epip
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=epiphany
  X-GNOME-Bugzilla-Component=General
--Categories=Application;Network;
+-Categories=Application;Network;GNOME;GTK;WebBrowser;
 +Categories=GNOME;GTK;Network;WebBrowser;
  MimeType=text/html;text/xml;application/xhtml+xml;

diff --git a/epiphany-mozilla_includes.patch b/epiphany-mozilla_includes.patch
index 14b5b3f573d540763de8653938b3c6cfd1fa2139..af20f41b30740f394a005a6919ca177f0b823039 100644 (file)
--- a/epiphany-mozilla_includes.patch
+++ b/epiphany-mozilla_includes.patch
@@ -1,21 +1,19 @@
 diff -urN aa/epiphany-1.3.0.90/embed/mozilla/Makefile.am epiphany-1.3.0.90/embed/mozilla/Makefile.am
 --- aa/epiphany-1.3.0.90/embed/mozilla/Makefile.am     2004-06-10 21:05:52.000000000 +0200
 +++ epiphany-1.3.0.90/embed/mozilla/Makefile.am        2004-07-06 01:10:28.928288144 +0200
-@@ -11,6 +11,7 @@
-       -I$(MOZILLA_INCLUDE_ROOT)/docshell              \
-       -I$(MOZILLA_INCLUDE_ROOT)/dom                   \
-       -I$(MOZILLA_INCLUDE_ROOT)/exthandler            \
-+      -I$(MOZILLA_INCLUDE_ROOT)/find                  \
-       -I$(MOZILLA_INCLUDE_ROOT)/gfx                   \
-       -I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg          \
-       -I$(MOZILLA_INCLUDE_ROOT)/history               \
-@@ -21,7 +22,9 @@
-       -I$(MOZILLA_INCLUDE_ROOT)/nkcache               \
-       -I$(MOZILLA_INCLUDE_ROOT)/pipboot               \
-       -I$(MOZILLA_INCLUDE_ROOT)/pipnss                \
-+      -I$(MOZILLA_INCLUDE_ROOT)/pref                  \
-       -I$(MOZILLA_INCLUDE_ROOT)/shistory              \
-+      -I$(MOZILLA_INCLUDE_ROOT)/uconv                 \
-       -I$(MOZILLA_INCLUDE_ROOT)/uriloader             \
-       -I$(MOZILLA_INCLUDE_ROOT)/webbrowserpersist     \
-       -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr              \
+@@ -69,6 +69,7 @@
+       docshell                \
+       dom                     \
+       exthandler              \
++      find                    \
+       helperAppDlg            \
+       gfx                     \
+       history                 \
+@@ -81,7 +82,8 @@
+       passwordmgr             \
+       pipboot                 \
+       pipnss                  \
++      pref                    \
+       shistory                \
+       sidebar                 \
+       uriloader               \