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

[msp at users.alioth.debian.org]

Author: msp
Date: Mon Feb 27 10:23:09 2012
New Revision: 9265

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=9265
Log:
* Add Conflicts: Provides: alevt (Closes: #654818)
  - Fixes "alevt and dvb-apps: error when trying to install together"
* Add Conflicts: nmh (Closes: #654810)
  - Fixes "dvb-apps and nmh: error when trying to install together"

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=9265&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/changelog (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/changelog Mon Feb 27 10:23:09 2012
@@ -1,3 +1,12 @@
+linuxtv-dvb-apps (1.1.1+rev1457-4) unstable; urgency=low
+
+  * Add Conflicts: Provides: alevt (Closes: #654818)
+    - Fixes "alevt and dvb-apps: error when trying to install together"
+  * Add Conflicts: nmh (Closes: #654810)
+    - Fixes "dvb-apps and nmh: error when trying to install together"
+
+ -- Mark Purcell <msp at debian.org>  Mon, 27 Feb 2012 21:13:21 +1100
+
 linuxtv-dvb-apps (1.1.1+rev1457-3) unstable; urgency=low
 
   * Build-depend on libx11-dev (Closes: #655778)

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=9265&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/control (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/control Mon Feb 27 10:23:09 2012
@@ -17,7 +17,8 @@
  makedev | udev,
  ${misc:Depends}
 Replaces: dvb-utils
-Conflicts: libxbase2.0-bin, libxdb-dev
+Provides: alevt
+Conflicts: libxbase2.0-bin, libxdb-dev, alevt, nmh
 Description: Digital 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,