aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/02_dtv-scan-tables.patch28
-rw-r--r--debian/patches/series1
3 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f39ea6b..1c8c7c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ linuxtv-dvb-apps (1.1.1+rev1500-1) UNRELEASED; urgency=low
* d/control: Add myself to Uploaders
* d/control: Drop obsolete DM-Upload-Allowed
* d/control: Update Vcs tags to reflect move SVN to Git
+ * d/patches/: Add 02_dtv-scan-tables.patch to remove scan tables from
+ dvb-apps package (Closes: #722661)
-- Jonathan McCrohan <jmccrohan@gmail.com> Tue, 17 Sep 2013 00:39:18 +0100
diff --git a/debian/patches/02_dtv-scan-tables.patch b/debian/patches/02_dtv-scan-tables.patch
new file mode 100644
index 0000000..210668b
--- /dev/null
+++ b/debian/patches/02_dtv-scan-tables.patch
@@ -0,0 +1,28 @@
+Description: Remove scan files from dvb-apps package
+ The scan files included in the linux-dvb-apps tarball are redundant
+ and out of date since Jan 2013, when the scan files were split into a
+ separate upstream dtv-scan-tables tarball. Debian has followed
+ upstream's lead, and split these packages in Debian too.
+ .
+ Remove the linux-dvb-apps scan files from dvb-apps package until
+ such time as upstream removes them from tarball.
+Author: Jonathan McCrohan <jmccrohan@gmail.com>
+Date: Thu, 19 Sep 2013 00:33:37 +0100
+---
+--- a/util/scan/Makefile
++++ b/util/scan/Makefile
+@@ -30,12 +30,5 @@ atsc_psip_section.c atsc_psip_section.h:
+ include ../../Make.rules
+
+ install::
+- @echo installing scan files
+- @mkdir -p $(DESTDIR)$(sharedir)/dvb/atsc
+- @mkdir -p $(DESTDIR)$(sharedir)/dvb/dvb-c
+- @mkdir -p $(DESTDIR)$(sharedir)/dvb/dvb-s
+- @mkdir -p $(DESTDIR)$(sharedir)/dvb/dvb-t
+- @install -m 664 atsc/* $(DESTDIR)$(sharedir)/dvb/atsc/
+- @install -m 664 dvb-c/* $(DESTDIR)$(sharedir)/dvb/dvb-c/
+- @install -m 664 dvb-s/* $(DESTDIR)$(sharedir)/dvb/dvb-s/
+- @install -m 664 dvb-t/* $(DESTDIR)$(sharedir)/dvb/dvb-t/
++ @echo not installing scan files
++ @echo please see dtv-scan-tables package instead
diff --git a/debian/patches/series b/debian/patches/series
index f96b9e5..b1ba85c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
uk-CrystalPalace.diff
01_README.scan.dpatch
+02_dtv-scan-tables.patch
09_x_zap_flush_stdout.dpatch
15_stdint_include.dpatch
apps_manpages.patch