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

[kov at users.alioth.debian.org]

Author: kov
Date: Wed Dec 12 17:54:00 2012
New Revision: 36458

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36458
Log:
Add appropriate Conflicts/Replaces on gir1.2-epiphany-3.4

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=36458&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Wed Dec 12 17:54:00 2012
@@ -1,9 +1,13 @@
-epiphany-browser (3.6.1-2) UNRELEASED; urgency=low
-
+epiphany-browser (3.6.1-2) experimental; urgency=low
+
+  [ Jeremy Bicha ]
   * Rename gir1.2-epiphany-3.4 -> gir1.2-epiphany-3.6
   * Restore accidentally dropped changes from 3.4.2-2
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 11 Dec 2012 22:13:41 -0500
+  [ Gustavo Noronha Silva ]
+  * Upload to experimental
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Wed, 12 Dec 2012 18:43:55 +0100
 
 epiphany-browser (3.6.1-1) experimental; urgency=low
 

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=36458&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Wed Dec 12 17:54:00 2012
@@ -2,11 +2,12 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
+
 Source: epiphany-browser
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.90),
                dh-autoreconf,
@@ -133,6 +134,8 @@
          ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: gir1.2-epiphany-3.4 (>= 3.6)
+Replaces: gir1.2-epiphany-3.4 (>= 3.6)
 Description: GObject introspection data for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards

Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=36458&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Wed Dec 12 17:54:00 2012
@@ -129,6 +129,8 @@
          ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: gir1.2-epiphany-3.4 (>= 3.6)
+Replaces: gir1.2-epiphany-3.4 (>= 3.6)
 Description: GObject introspection data for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards