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

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Wed Jan  2 22:21:41 2013
New Revision: 9276

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=9276
Log:
Conflict with nmh << 1.5-release-2 only, nmh changed the conflicting
manpage in newer versions (Closes: #694944)

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=9276&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/changelog (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/changelog Wed Jan  2 22:21:41 2013
@@ -1,3 +1,10 @@
+linuxtv-dvb-apps (1.1.1+rev1483-2) unstable; urgency=low
+
+  * Conflict with nmh << 1.5-release-2 only, nmh changed the conflicting
+    manpage in newer versions (Closes: #694944)
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 02 Jan 2013 23:15:24 +0100
+
 linuxtv-dvb-apps (1.1.1+rev1483-1) unstable; urgency=low
 
   * New upstream release

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=9276&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/control (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/control Wed Jan  2 22:21:41 2013
@@ -18,7 +18,8 @@
  ${misc:Depends}
 Replaces: dvb-utils
 Provides: alevt
-Conflicts: libxbase2.0-bin, libxdb-dev, alevt, nmh
+Conflicts: libxbase2.0-bin, libxdb-dev, alevt, nmh (<< 1.5-release-2)
+Replaces: nmh (<< 1.5-release-2)
 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,