aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Purcell <msp@debian.org>2012-02-27 21:13:21 +1100
committeretobi <git@e-tobi.net>2013-09-03 09:48:51 +0200
commit96bce3638e9b6d3f3bac79494e11d877857de81e (patch)
tree5460f907a95375ee7c953d7a9679e163813a31ed
parent1862692bb6fa784da580772ffd1197d789d718d3 (diff)
downloadlinux-dvb-apps-debian/1.1.1+rev1457-4.tar.gz
Imported Debian patch 1.1.1+rev1457-4debian/1.1.1+rev1457-4
Diffstat (limited to '')
-rw-r--r--debian/changelog9
-rw-r--r--debian/control3
-rw-r--r--[-rwxr-xr-x]debian/patches/01_README.scan.dpatch0
-rw-r--r--[-rwxr-xr-x]debian/patches/15_stdint_include.dpatch0
4 files changed, 11 insertions, 1 deletions
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@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
index 29dbd47..29dbd47 100755..100644
--- 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 100755..100644
--- a/debian/patches/15_stdint_include.dpatch
+++ b/debian/patches/15_stdint_include.dpatch