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

[slomo at users.alioth.debian.org]

Author: slomo
Date: Thu Jan 14 07:29:31 2010
New Revision: 22779

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22779
Log:
* debian/control.in:
  + Add Conflicts with pre-2.29.0 epiphany-extensions (Closes: #565245).

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=22779&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Thu Jan 14 07:29:31 2010
@@ -1,3 +1,10 @@
+epiphany-browser (2.29.5-2) unstable; urgency=low
+
+  * debian/control.in:
+    + Add Conflicts with pre-2.29.0 epiphany-extensions (Closes: #565245).
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 14 Jan 2010 08:28:36 +0100
+
 epiphany-browser (2.29.5-1) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=22779&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Thu Jan 14 07:29:31 2010
@@ -68,7 +68,7 @@
          ${misc:Depends}
 Conflicts: epiphany-gecko,
            epiphany-webkit (<< 2.28),
-           epiphany-extensions (<< 2.22.1-3),
+           epiphany-extensions (<< 2.29.0~20092012-1),
            swfdec-mozilla
 Replaces: epiphany-gecko,
           epiphany-webkit (<< 2.28)

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=22779&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Thu Jan 14 07:29:31 2010
@@ -63,7 +63,7 @@
          ${misc:Depends}
 Conflicts: epiphany-gecko,
            epiphany-webkit (<< 2.28),
-           epiphany-extensions (<< 2.22.1-3),
+           epiphany-extensions (<< 2.29.0~20092012-1),
            swfdec-mozilla
 Replaces: epiphany-gecko,
           epiphany-webkit (<< 2.28)