Imported Debian patch 1.1.1+rev1483-2debian/1.1.1+rev1483-2

4 files changed, 9 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 93d6452..b581c2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@debian.org>  Wed, 02 Jan 2013 23:15:24 +0100
+
 linuxtv-dvb-apps (1.1.1+rev1483-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 1f1d934..b1603a6 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,9 @@ Depends:
  ${shlibs:Depends},
  makedev | udev,
  ${misc:Depends}
-Replaces: dvb-utils
+Replaces: dvb-utils, nmh (<< 1.5-release-2)
 Provides: alevt
-Conflicts: libxbase2.0-bin, libxdb-dev, alevt, nmh
+Conflicts: libxbase2.0-bin, libxdb-dev, alevt, 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,
diff --git a/debian/patches/01_README.scan.dpatch b/debian/patches/01_README.scan.dpatch
index 29dbd47..29dbd47 100644..100755
--- a/debian/patches/01_README.scan.dpatch
+++ b/debian/patches/01_README.scan.dpatch
diff --git a/debian/patches/15_stdint_include.dpatch b/debian/patches/15_stdint_include.dpatch
index 125be4d..125be4d 100644..100755
--- a/debian/patches/15_stdint_include.dpatch
+++ b/debian/patches/15_stdint_include.dpatch