r21298 - in /desktop/experimental/epiphany-webkit/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Sep  9 14:33:05 2009
New Revision: 21298

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21298
Log:
Drop conflict on python-xpcom. Closes: #545787.

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

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=21298&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog [utf-8] Wed Sep  9 14:33:05 2009
@@ -1,3 +1,9 @@
+epiphany-webkit (2.27.91-3) UNRELEASED; urgency=low
+
+  * Drop conflict on python-xpcom. Closes: #545787.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 09 Sep 2009 16:21:04 +0200
+
 epiphany-webkit (2.27.91-2) experimental; urgency=low
 
   * debian/patches/16_reimplement_search_on_locationbar.patch:

Modified: desktop/experimental/epiphany-webkit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/control?rev=21298&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/control [utf-8] Wed Sep  9 14:33:05 2009
@@ -51,8 +51,7 @@
          iso-codes,
          ${misc:Depends}
 Conflicts: epiphany-browser (<< 2.20),
-           epiphany-extensions (<< 2.22.1-3),
-           python-xpcom
+           epiphany-extensions (<< 2.22.1-3)
 Recommends: yelp
 Suggests: mozplugger
 Provides: www-browser, gnome-www-browser

Modified: desktop/experimental/epiphany-webkit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/control.in?rev=21298&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/control.in [utf-8] Wed Sep  9 14:33:05 2009
@@ -51,8 +51,7 @@
          iso-codes,
          ${misc:Depends}
 Conflicts: epiphany-browser (<< 2.20),
-           epiphany-extensions (<< 2.22.1-3),
-           python-xpcom
+           epiphany-extensions (<< 2.22.1-3)
 Recommends: yelp
 Suggests: mozplugger
 Provides: www-browser, gnome-www-browser