[linuxtv-dvb-apps] 27/30: Imported Debian patch 1.1.1+rev1457-4

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository linuxtv-dvb-apps.

commit 96bce3638e9b6d3f3bac79494e11d877857de81e
Author: Mark Purcell <msp at debian.org>
Date:   Mon Feb 27 21:13:21 2012 +1100

    Imported Debian patch 1.1.1+rev1457-4
---
 debian/changelog |    9 +++++++++
 debian/control   |    3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3524e73..1de1929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/control b/debian/control
index bdc089e..1f1d934 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,8 @@ Depends:
  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,
diff --git a/debian/patches/01_README.scan.dpatch b/debian/patches/01_README.scan.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/15_stdint_include.dpatch b/debian/patches/15_stdint_include.dpatch
old mode 100755
new mode 100644

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/linuxtv-dvb-apps.git