[Pkg-xfce-commits] r2797 - desktop/trunk/xfce4-terminal/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2009-02-28 10:26:11 +0000 (Sat, 28 Feb 2009)
New Revision: 2797

Modified:
   desktop/trunk/xfce4-terminal/debian/changelog
   desktop/trunk/xfce4-terminal/debian/control
Log:
drop obsolete conflict against terminal.

Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog	2009-02-27 07:01:15 UTC (rev 2796)
+++ desktop/trunk/xfce4-terminal/debian/changelog	2009-02-28 10:26:11 UTC (rev 2797)
@@ -9,10 +9,11 @@
     - bump build-dep for Xfce 4.6.0.
     - drop Rudy Godoy and Martin Loschwitz from Uploaders. Thanks to them!
     - add ${misc:Depends} to depends.
+    - drop obsolete conflict against terminal.
   * debian/patches:
     - 03_background-activity dropped, merged upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 26 Feb 2009 07:55:08 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 28 Feb 2009 11:25:56 +0100
 
 xfce4-terminal (0.2.8-5) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-terminal/debian/control
===================================================================
--- desktop/trunk/xfce4-terminal/debian/control	2009-02-27 07:01:15 UTC (rev 2796)
+++ desktop/trunk/xfce4-terminal/debian/control	2009-02-28 10:26:11 UTC (rev 2797)
@@ -14,7 +14,6 @@
 
 Package: xfce4-terminal
 Architecture: any
-Conflicts: terminal
 Depends: ${shlibs:Depends},  ${misc:Depends}, exo-utils
 Provides: x-terminal-emulator
 Recommends: dbus-x11