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

[joss at users.alioth.debian.org]

Author: joss
Date: Sat May 29 11:42:52 2010
New Revision: 24431

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24431
Log:
* Relax epiphany-gecko conflict to not make the package uninstallable.
  Closes: #583347.
* Make epiphany-extensions conflict a Breaks. Bump the version since 
  the directory changed again in the meantime.

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=24431&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Sat May 29 11:42:52 2010
@@ -1,9 +1,16 @@
 epiphany-browser (2.30.2-2) unstable; urgency=low
 
+  [ David Weinehall ]
   * Restore Josselin Mouette's improved package description that
     accidentally got lost in 2.30.0-1 (Closes: #572886).
 
- -- David Weinehall <tao at debian.org>  Thu, 15 Apr 2010 20:57:44 +0300
+  [ Josselin Mouette ]
+  * Relax epiphany-gecko conflict to not make the package uninstallable.
+    Closes: #583347.
+  * Make epiphany-extensions conflict a Breaks. Bump the version since 
+    the directory changed again in the meantime.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 29 May 2010 13:42:42 +0200
 
 epiphany-browser (2.30.2-1) unstable; urgency=low
 

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=24431&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Sat May 29 11:42:52 2010
@@ -66,25 +66,33 @@
          dbus-x11,
          iso-codes,
          ${misc:Depends}
-Conflicts: epiphany-gecko,
+Conflicts: epiphany-gecko (<< 2.28),
            epiphany-webkit (<< 2.28),
            epiphany-extensions (<< 2.29.0~20092012-1),
            swfdec-mozilla
-Replaces: epiphany-gecko,
+Breaks: epiphany-extensions (<< 2.30.0-4),
+Replaces: epiphany-gecko (<< 2.28),
           epiphany-webkit (<< 2.28)
 Recommends: yelp, 
             evince,
             ca-certificates
+Suggests: epiphany-extensions
 Breaks: epiphany-extensions (<< 2.30.0-4)
 Provides: www-browser, gnome-www-browser
 Description: Intuitive GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards
- compliance. Simplicity is achieved by a well designed user interface
- and reliance on external applications for performing external tasks
- (such as reading email). Simplicity should not mean less powerful.
+ compliance.
+ .
+ Simplicity is achieved by a well designed user interface and reliance 
+ on external applications for performing external tasks (such as reading 
+ email). Simplicity does not mean less features; Epiphany has everything 
+ a modern web browser is expected to have, and can have more through 
+ its extensions.
+ .
  Standards compliance is achieved on the HTML side by using the
- WebKitGTK+ rendering engine; and on the user interface side by
+ WebKitGTK+ rendering engine (which is based on the engine used by 
+ Apple Safari and Google Chrome); and on the user interface side by
  closely following the GNOME Human Interface Guidelines (HIG) and by
  close integration with the GNOME desktop.
 

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=24431&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Sat May 29 11:42:52 2010
@@ -61,11 +61,12 @@
          dbus-x11,
          iso-codes,
          ${misc:Depends}
-Conflicts: epiphany-gecko,
+Conflicts: epiphany-gecko (<< 2.28),
            epiphany-webkit (<< 2.28),
            epiphany-extensions (<< 2.29.0~20092012-1),
            swfdec-mozilla
-Replaces: epiphany-gecko,
+Breaks: epiphany-extensions (<< 2.30.0-4),
+Replaces: epiphany-gecko (<< 2.28),
           epiphany-webkit (<< 2.28)
 Recommends: yelp, 
             evince,