r22323 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Nov 13 15:36:35 2009
New Revision: 22323

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22323
Log:
Add a conflict with swfdec-mozilla, the plugin makes the browser 
completely unusable on any website with Flash content.

Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/control
    desktop/unstable/epiphany-browser/debian/control.in

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=22323&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Fri Nov 13 15:36:35 2009
@@ -1,8 +1,13 @@
 epiphany-browser (2.29.1-2) UNRELEASED; urgency=low
 
+  [ Gustavo Noronha Silva ]
   * debian/patches/04_set_prgname.patch:
   - New patch, to make sure GNOME Shell is able to match the application
     windows to the .desktop file, and app well favourite.
+
+  [ Josselin Mouette ]
+  * Add a conflict with swfdec-mozilla, the plugin makes the browser 
+    completely unusable on any website with Flash content.
 
  -- Gustavo Noronha Silva <kov at debian.org>  Tue, 03 Nov 2009 12:38:03 -0200
 

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=22323&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Fri Nov 13 15:36:35 2009
@@ -61,7 +61,8 @@
          ${misc:Depends}
 Conflicts: epiphany-gecko,
            epiphany-webkit (<< 2.28),
-           epiphany-extensions (<< 2.22.1-3)
+           epiphany-extensions (<< 2.22.1-3),
+           swfdec-mozilla
 Replaces: epiphany-gecko,
           epiphany-webkit (<< 2.28)
 Recommends: yelp

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=22323&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Fri Nov 13 15:36:35 2009
@@ -61,7 +61,8 @@
          ${misc:Depends}
 Conflicts: epiphany-gecko,
            epiphany-webkit (<< 2.28),
-           epiphany-extensions (<< 2.22.1-3)
+           epiphany-extensions (<< 2.22.1-3),
+           swfdec-mozilla
 Replaces: epiphany-gecko,
           epiphany-webkit (<< 2.28)
 Recommends: yelp