summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Schmidt <tschmidt@debian.org>2006-08-28 23:24:20 +0200
committeretobi <git@e-tobi.net>2013-09-03 09:48:41 +0200
commit7090785e5080c6c166dee3f1583872aa66a73f33 (patch)
treeaaee60ab49a353f416bc003c6e3e12ad6451c6a6
parent43dd9e25dce3963f25444533466ad1f8faa66e47 (diff)
downloadlinux-dvb-apps-7090785e5080c6c166dee3f1583872aa66a73f33.tar.gz
Imported Debian patch 1.1.1-2debian/1.1.1-2
Diffstat (limited to '')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rw-r--r--debian/patches/00list1
-rw-r--r--debian/patches/06_scan_uk-heathfield-fix.dpatch17
4 files changed, 27 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 77f2948..ba495d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linuxtv-dvb-apps (1.1.1-2) unstable; urgency=low
+
+ * Added 06_scan_uk-heathfield-fix.dpatch to fix the uk-Heathfiels scanfile
+ as reported in Ubuntu bug #55789
+ * Bumped Standards-Version to 3.7.2
+
+ -- Thomas Schmidt <tschmidt@debian.org> Mon, 28 Aug 2006 23:24:20 +0200
+
linuxtv-dvb-apps (1.1.1-1) unstable; urgency=low
* Thomas Schmidt <tschmidt@debian.org>
diff --git a/debian/control b/debian/control
index 0a0b6ee..0c5c4f9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt@debian.org>
Build-Depends: debhelper (>> 4.0.0), dpatch (>= 2.0.9)
-Standards-Version: 3.6.2.1
+Standards-Version: 3.7.2
Package: dvb-utils
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
index 1f01a68..913faa0 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,4 +3,5 @@
03_budget_ci_loadkeys
04_scanfiles_from_cvs
05_scanfiles_not_in_cvs_yet
+06_scan_uk-heathfield-fix
09_x_zap_flush_stdout
diff --git a/debian/patches/06_scan_uk-heathfield-fix.dpatch b/debian/patches/06_scan_uk-heathfield-fix.dpatch
new file mode 100644
index 0000000..82a5b4f
--- /dev/null
+++ b/debian/patches/06_scan_uk-heathfield-fix.dpatch
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 06_scan_uk-heathfield-fix.dpatch by Thomas Schmidt <tschmidt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes uk-Heathfield scanfile as reported as Ubuntu bug #55789
+## DP: by Philip Guyton <phil@lxnet.fsnet.co.uk>
+
+@DPATCH@
+diff -urNad linuxtv-dvb-apps-1.1.1~/util/scan/dvb-t/uk-Heathfield linuxtv-dvb-apps-1.1.1/util/scan/dvb-t/uk-Heathfield
+--- linuxtv-dvb-apps-1.1.1~/util/scan/dvb-t/uk-Heathfield 2006-08-15 08:20:29.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/scan/dvb-t/uk-Heathfield 2006-08-15 08:21:28.000000000 +0200
+@@ -1,3 +1,3 @@
+ # Heathfield, South-east England
+ # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+-T 538000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
++T 538000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
/tr> 2001-03-13[lcd4linux @ 2001-03-13 08:03:41 by reinelt]reinelt3-1/+35 added missing autoheader files git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@115 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-13[lcd4linux @ 2001-03-13 07:53:00 by reinelt]reinelt2-13/+15 added several files for the distribution git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@114 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-13[lcd4linux @ 2001-03-13 07:41:22 by reinelt]reinelt3-2/+52 added NEWS file git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@113 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-12[lcd4linux @ 2001-03-12 13:44:58 by reinelt]reinelt8-58/+232 new udelay() using Time Stamp Counters git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@112 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-12[lcd4linux @ 2001-03-12 12:49:24 by reinelt]reinelt2-63/+71 even better configure handling... git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@111 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-12[lcd4linux @ 2001-03-12 12:39:36 by reinelt]reinelt14-448/+830 reworked autoconf a lot: drivers may be excluded, #define's went to config.h git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@110 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-09[lcd4linux @ 2001-03-09 16:24:30 by ltoetsch]ltoetsch2-155/+345 disable driver in configure git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@109 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-09[lcd4linux @ 2001-03-09 15:04:53 by reinelt]reinelt3-103/+109 rename 'raster' to 'Text in Text.c added TOTO item git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@108 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-09[lcd4linux @ 2001-03-09 14:30:01 by reinelt]reinelt1-0/+7 new ideas for TODO git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@107 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-09[lcd4linux @ 2001-03-09 14:24:49 by ltoetsch]ltoetsch3-7/+18 exec: Scale_x ->Min/Max_x git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@106 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-09[lcd4linux @ 2001-03-09 13:08:11 by ltoetsch]ltoetsch12-86/+384 Added Text driver git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@105 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-09[lcd4linux @ 2001-03-09 12:14:24 by reinelt]reinelt4-21/+34 minor cleanups git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@104 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-08[lcd4linux @ 2001-03-08 15:25:38 by ltoetsch]ltoetsch9-93/+214 improved exec git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@103 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-08[lcd4linux @ 2001-03-08 09:02:04 by reinelt]reinelt4-133/+21 seti client cleanup git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@102 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-08[lcd4linux @ 2001-03-08 08:39:54 by reinelt]reinelt2-4/+12 fixed two typos git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@101 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-07[lcd4linux @ 2001-03-07 18:10:21 by ltoetsch]ltoetsch10-110/+319 added e(x)ec commands git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@100 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-05[lcd4linux @ 2001-03-05 18:20:21 by reinelt]reinelt2-13/+25 TOTO list update git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@99 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-04[lcd4linux @ 2001-03-04 15:01:12 by ltoetsch]ltoetsch1-3/+3 Added PNG git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@98 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2001-03-02[lcd4linux @ 2001-03-02 20:18:12 by reinelt]reinelt3-36/+89 allow compile on systems without net/if_ppp.h git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@97 3ae390bd-cb1e-0410-b409-cd5a39f66f1f