r15903 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Mon May 12 13:16:49 2008
New Revision: 15903

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15903
Log:
Conflict against seahorse < 2.22.1-3.

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

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=15903&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Mon May 12 13:16:49 2008
@@ -1,3 +1,9 @@
+epiphany-browser (2.22.1.1-4) UNRELEASED; urgency=low
+
+  * Conflict against seahorse < 2.22.1-3.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 12 May 2008 15:16:01 +0200
+
 epiphany-browser (2.22.1.1-3) experimental; urgency=low
 
   * epiphany-gecko conflicts against python-xpcom, because of 

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=15903&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control (original)
+++ desktop/experimental/epiphany-browser/debian/control Mon May 12 13:16:49 2008
@@ -61,6 +61,7 @@
          ${misc:Depends}
 Conflicts: epiphany-browser (<< 2.20),
            epiphany-extensions (<< 2.22.1-3),
+           seahorse (<< 2.22.1-3),
            python-xpcom
 Recommends: yelp, epiphany-extensions
 Suggests: mozplugger

Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=15903&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in (original)
+++ desktop/experimental/epiphany-browser/debian/control.in Mon May 12 13:16:49 2008
@@ -61,6 +61,7 @@
          ${misc:Depends}
 Conflicts: epiphany-browser (<< 2.20),
            epiphany-extensions (<< 2.22.1-3),
+           seahorse (<< 2.22.1-3),
            python-xpcom
 Recommends: yelp, epiphany-extensions
 Suggests: mozplugger