r45399 - in /desktop/unstable/gnome-terminal/debian: changelog control control.in

[fabian at users.alioth.debian.org]

Author: fabian
Date: Mon Jun 29 14:15:32 2015
New Revision: 45399

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45399
Log:
* Team upload.
* Add Conflicts and Replaces against the nautilus-open-terminal
  package (Closes: #766919). The gnome-terminal package provides
  the exact same functionality and removal of the former package
  has been requested (see #789900).

Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/control
    desktop/unstable/gnome-terminal/debian/control.in

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=45399&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog	[utf-8] Mon Jun 29 14:15:32 2015
@@ -1,3 +1,13 @@
+gnome-terminal (3.16.2-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add Conflicts and Replaces against the nautilus-open-terminal
+    package (Closes: #766919). The gnome-terminal package provides
+    the exact same functionality and removal of the former package
+    has been requested (see #789900).
+
+ -- Fabian Greffrath <fabian at debian.org>  Thu, 25 Jun 2015 15:26:29 +0200
+
 gnome-terminal (3.16.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control?rev=45399&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control	[utf-8] Mon Jun 29 14:15:32 2015
@@ -47,6 +47,8 @@
 Recommends: yelp,
             gvfs,
             dbus-x11
+Conflicts: nautilus-open-terminal
+Replaces: nautilus-open-terminal
 Description: GNOME terminal emulator application
  GNOME Terminal is a terminal emulation application that you can use to
  perform the following actions:

Modified: desktop/unstable/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control.in?rev=45399&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control.in	[utf-8] Mon Jun 29 14:15:32 2015
@@ -43,6 +43,8 @@
 Recommends: yelp,
             gvfs,
             dbus-x11
+Conflicts: nautilus-open-terminal
+Replaces: nautilus-open-terminal
 Description: GNOME terminal emulator application
  GNOME Terminal is a terminal emulation application that you can use to
  perform the following actions: