r16042 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in patches/14_contenthandler_api.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue May 27 12:14:24 2008
New Revision: 16042

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16042
Log:
* Depend on epiphany-browser-data 2.22.1.1-3. Closes: #481153.
* Rebuild against xulrunner 1.9 rc1. Closes: #483122.
* 14_contenthandler_api.patch: new patch, needed because of a change 
  in the Gecko 1.9 ContentHandler API. Thanks Mike Hommey.
  Closes: #482756.

Added:
    desktop/experimental/epiphany-browser/debian/patches/14_contenthandler_api.patch
Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/control
    desktop/experimental/epiphany-browser/debian/control.in
    desktop/experimental/epiphany-browser/debian/patches/series

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=16042&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Tue May 27 12:14:24 2008
@@ -1,8 +1,13 @@
-epiphany-browser (2.22.1.1-4) UNRELEASED; urgency=low
+epiphany-browser (2.22.1.1-4) experimental; urgency=low
 
   * Conflict against seahorse < 2.22.1-3.
-
- -- Josselin Mouette <joss at debian.org>  Mon, 12 May 2008 15:16:01 +0200
+  * Depend on epiphany-browser-data 2.22.1.1-3. Closes: #481153.
+  * Rebuild against xulrunner 1.9 rc1. Closes: #483122.
+  * 14_contenthandler_api.patch: new patch, needed because of a change 
+    in the Gecko 1.9 ContentHandler API. Thanks Mike Hommey.
+    Closes: #482756.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 27 May 2008 14:14:39 +0200
 
 epiphany-browser (2.22.1.1-3) experimental; urgency=low
 

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=16042&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control (original)
+++ desktop/experimental/epiphany-browser/debian/control Tue May 27 12:14:24 2008
@@ -20,7 +20,7 @@
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
                libxml-parser-perl,
-               xulrunner-dev (>= 1.9~b5-3),
+               xulrunner-dev (>= 1.9~rc1),
                iso-codes (>= 0.35),
                python-dev (>= 2.3),
                python-gtk2-dev (>= 2.7.1),
@@ -50,7 +50,7 @@
 
 Package: epiphany-gecko
 Architecture: any
-Depends: epiphany-browser-data (>= ${gnome:Version}),
+Depends: epiphany-browser-data (>= ${2.22.1.1-3}),
          epiphany-browser-data (<< ${gnome:NextVersion}),
          ${shlibs:Depends},
          gnome-icon-theme (>= 2.9.90),

Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=16042&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in (original)
+++ desktop/experimental/epiphany-browser/debian/control.in Tue May 27 12:14:24 2008
@@ -20,7 +20,7 @@
                scrollkeeper,
                gnome-pkg-tools (>= 0.10),
                libxml-parser-perl,
-               xulrunner-dev (>= 1.9~b5-3),
+               xulrunner-dev (>= 1.9~rc1),
                iso-codes (>= 0.35),
                python-dev (>= 2.3),
                python-gtk2-dev (>= 2.7.1),
@@ -50,7 +50,7 @@
 
 Package: epiphany-gecko
 Architecture: any
-Depends: epiphany-browser-data (>= ${gnome:Version}),
+Depends: epiphany-browser-data (>= ${2.22.1.1-3}),
          epiphany-browser-data (<< ${gnome:NextVersion}),
          ${shlibs:Depends},
          gnome-icon-theme (>= 2.9.90),

Added: desktop/experimental/epiphany-browser/debian/patches/14_contenthandler_api.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/14_contenthandler_api.patch?rev=16042&op=file
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/14_contenthandler_api.patch (added)
+++ desktop/experimental/epiphany-browser/debian/patches/14_contenthandler_api.patch Tue May 27 12:14:24 2008
@@ -1,0 +1,14 @@
+Index: epiphany-2.22.1.1/embed/mozilla/ContentHandler.cpp
+===================================================================
+--- epiphany-2.22.1.1.orig/embed/mozilla/ContentHandler.cpp	2008-05-27 14:11:15.201154615 +0200
++++ epiphany-2.22.1.1/embed/mozilla/ContentHandler.cpp	2008-05-27 14:12:56.705651906 +0200
+@@ -129,6 +129,9 @@ NS_IMETHODIMP GContentHandler::PromptFor
+ 				    nsISupports *aWindowContext,
+ 				    const PRUnichar *aDefaultFile,
+ 				    const PRUnichar *aSuggestedFileExtension,
++#ifdef HAVE_GECKO_1_9
++				    PRBool aForcePrompt,
++#endif
+ 				    nsILocalFile **_retval)
+ {
+ 	EphyFileChooser *dialog;

Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=16042&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series Tue May 27 12:14:24 2008
@@ -12,4 +12,5 @@
 11_useragent-weasel.patch
 12_safetypes_rss.patch
 13_extensions_need_xpcom.patch
+14_contenthandler_api.patch
 99_autoreconf.patch