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

6 files changed, 69 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 1de1929..93d6452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+linuxtv-dvb-apps (1.1.1+rev1483-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixes "updated DVB-T frequencies for Italy" (Closes: #613097)
+  * Fix "dvbscan: Infinite loop parsing arguments"
+    - patch from Vincent Pelletier (Closes: #606728)
+  * Added uk-CrystalPalace.diff
+    - Fixes "Channel/frequency/etc. updating for London" (Closes: #669715)
+
+ -- Mark Purcell <msp@debian.org>  Sun, 13 May 2012 19:42:13 +1000
+
 linuxtv-dvb-apps (1.1.1+rev1457-4) unstable; urgency=low
 
   * Add Conflicts: Provides: alevt (Closes: #654818)
diff --git a/debian/patches/09_x_zap_flush_stdout.dpatch b/debian/patches/09_x_zap_flush_stdout.dpatch
index 82fac8d..8aa740d 100755
--- a/debian/patches/09_x_zap_flush_stdout.dpatch
+++ b/debian/patches/09_x_zap_flush_stdout.dpatch
@@ -6,10 +6,11 @@
 ## DP: Make [stc]zap flush stdout after writing status line
 
 @DPATCH@
-diff -urNad linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/czap.c linuxtv-dvb-apps-1.1.1+rev1207/util/szap/czap.c
---- linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/czap.c	2008-06-17 01:44:38.000000000 +1000
-+++ linuxtv-dvb-apps-1.1.1+rev1207/util/szap/czap.c	2008-06-17 20:44:19.000000000 +1000
-@@ -252,9 +252,10 @@
+Index: linuxtv-dvb-apps-1.1.1+rev1483/util/szap/czap.c
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/szap/czap.c	2012-04-11 00:44:06.000000000 +1000
++++ linuxtv-dvb-apps-1.1.1+rev1483/util/szap/czap.c	2012-05-13 20:28:36.000000000 +1000
+@@ -229,9 +229,10 @@
  		if (status & FE_HAS_LOCK)
  			printf("FE_HAS_LOCK");
  
@@ -21,14 +22,15 @@ diff -urNad linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/czap.c linuxtv-dvb-apps-1.
  
  		if (exit_after_tuning && (status & FE_HAS_LOCK))
  			break;
-diff -urNad linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/szap.c linuxtv-dvb-apps-1.1.1+rev1207/util/szap/szap.c
---- linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/szap.c	2008-06-17 01:44:38.000000000 +1000
-+++ linuxtv-dvb-apps-1.1.1+rev1207/util/szap/szap.c	2008-06-17 20:44:19.000000000 +1000
-@@ -287,6 +287,7 @@
-       if (status & FE_HAS_LOCK)
- 	 printf("FE_HAS_LOCK");
-       printf("\n");
-+      fflush(stdout);
+Index: linuxtv-dvb-apps-1.1.1+rev1483/util/szap/szap.c
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/szap/szap.c	2012-04-11 00:44:06.000000000 +1000
++++ linuxtv-dvb-apps-1.1.1+rev1483/util/szap/szap.c	2012-05-13 20:28:51.000000000 +1000
+@@ -204,6 +204,7 @@
+ 		if (exit_after_tuning && ((status & FE_HAS_LOCK) || (++timeout >= 10)))
+ 			break;
+ 
++		fflush(stdout);
+ 		usleep(1000000);
+ 	} while (1);
  
-       if (exit_after_tuning && ((status & FE_HAS_LOCK) || (++timeout >= 10)))
-          break;
diff --git a/debian/patches/dbug606728.diff b/debian/patches/dbug606728.diff
new file mode 100644
index 0000000..6704acc
--- /dev/null
+++ b/debian/patches/dbug606728.diff
@@ -0,0 +1,12 @@
+Index: linuxtv-dvb-apps-1.1.1+rev1483/util/dvbscan/dvbscan.c
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/dvbscan/dvbscan.c	2012-04-11 00:44:06.000000000 +1000
++++ linuxtv-dvb-apps-1.1.1+rev1483/util/dvbscan/dvbscan.c	2012-05-13 20:14:41.000000000 +1000
+@@ -225,6 +225,7 @@
+ 			output_filename = argv[argpos+2];
+ 			if (!strcmp(output_filename, "-"))
+ 				output_filename = NULL;
++			argpos+=3;
+ 		} else {
+ 			if ((argc - argpos) != 1)
+ 				usage();
diff --git a/debian/patches/series b/debian/patches/series
index 305bd2c..f96b9e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,7 @@
+uk-CrystalPalace.diff
 01_README.scan.dpatch
 09_x_zap_flush_stdout.dpatch
 15_stdint_include.dpatch
 apps_manpages.patch
 alevt.patch
+dbug606728.diff
diff --git a/debian/patches/uk-CrystalPalace.diff b/debian/patches/uk-CrystalPalace.diff
new file mode 100644
index 0000000..b67aafb
--- /dev/null
+++ b/debian/patches/uk-CrystalPalace.diff
@@ -0,0 +1,28 @@
+Index: linuxtv-dvb-apps-1.1.1+rev1483/util/scan/dvb-t/uk-CrystalPalace
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/scan/dvb-t/uk-CrystalPalace	2012-04-11 00:44:06.000000000 +1000
++++ linuxtv-dvb-apps-1.1.1+rev1483/util/scan/dvb-t/uk-CrystalPalace	2012-05-13 20:38:53.000000000 +1000
+@@ -4,14 +4,14 @@
+ #! <w_scan> 20120112 1 0 TERRESTRIAL GB </w_scan>
+ #------------------------------------------------------------------------------
+ # location and provider: Crystal Palace, UK
+-# date (yyyy-mm-dd)    : 2012-02-12
++# date (yyyy-mm-dd)    : 2012-04-18
+ #
+-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
++# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> 
++<guard> <hi> [# comment]
+ #------------------------------------------------------------------------------
+-T 481833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
+-T 537833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
+-T 505833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
+-T 561833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
+-T 529833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
+-T 578166670 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
+-T2 0 16435 554000000 8MHz AUTO AUTO     AUTO AUTO AUTO AUTO    # London.
++T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # London .
++T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # London .
++T 545833330 8MHz 2/3 NONE QAM256 AUTO AUTO AUTO # London .
++T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # London .
++T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # London .
++T 529833330 8MHz 3/4 NONE QAM64 8k 1/32 NONE # London .
diff --git a/debian/rules b/debian/rules
index 87f25e5..5bbad86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,5 +9,4 @@ override_dh_installdocs:
 	cp -a util/av7110_loadkeys/README debian/dvb-apps/usr/share/doc/dvb-apps/README.av7110_loadkeys
 	cp -a util/scan/README debian/dvb-apps/usr/share/doc/dvb-apps/README.scan
 	cp -a util/szap/README debian/dvb-apps/usr/share/doc/dvb-apps/README.szap
-	cp -a util/scan/dvb-h/README debian/dvb-apps/usr/share/doc/dvb-apps/README.dvb-h
 	cp -a util/ttusb_dec_reset/README debian/dvb-apps/usr/share/doc/dvb-apps/README.ttusb_dec_reset