r7405 - in /dvb/linuxtv-dvb-apps/trunk/debian: changelog control

[msp at users.alioth.debian.org]

Author: msp
Date: Fri Sep  5 09:53:19 2008
New Revision: 7405

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7405
Log:
* Conflicts: me-tv (<< 0.5.33-2)
  - must conflict against me-tv (<< 0.5.33-2) (Closes: #496557)

Modified:
    dvb/linuxtv-dvb-apps/trunk/debian/changelog
    dvb/linuxtv-dvb-apps/trunk/debian/control

Modified: dvb/linuxtv-dvb-apps/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/trunk/debian/changelog?rev=7405&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/changelog (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/changelog Fri Sep  5 09:53:19 2008
@@ -8,8 +8,10 @@
 
   [ Mark Purcell ]
   * dvb-utils Decsription: mention etch to lenny transitions
-
- -- Mark Purcell <msp at debian.org>  Fri, 05 Sep 2008 19:42:45 +1000
+  * Conflicts: me-tv (<< 0.5.33-2)
+    - must conflict against me-tv (<< 0.5.33-2) (Closes: #496557)
+
+ -- Mark Purcell <msp at debian.org>  Fri, 05 Sep 2008 19:49:21 +1000
 
 linuxtv-dvb-apps (1.1.1+rev1207-2) unstable; urgency=low
 

Modified: dvb/linuxtv-dvb-apps/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/trunk/debian/control?rev=7405&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/control (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/control Fri Sep  5 09:53:19 2008
@@ -13,7 +13,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, makedev (>=2.3.1-66) | udev
 Replaces: dvb-utils
-Conflicts: libxbase2.0-bin, libxdb-dev
+Conflicts: libxbase2.0-bin, libxdb-dev, me-tv (<< 0.5.33-2)
 Description: Digitial Video Broadcasting (DVB) applications
  Applications and utilities geared towards the initial setup, testing
  and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T,