Imported Debian patch 1.1.1-1debian/1.1.1-1

6 files changed, 26 insertions, 213 deletions

diff --git a/debian/changelog b/debian/changelog
index b2b6b7d..77f2948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+linuxtv-dvb-apps (1.1.1-1) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt@debian.org>
+    - New upstream release, supports ATSC now (closes: #345413, #368763)
+      + Removed 06_freeview_channel_numbers.dpatch
+      + Removed 07_vdr_output.dpatch
+      + Removed 08_debug_minor_fixes.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sat,  3 Jun 2006 13:12:54 +0200
+
 linuxtv-dvb-apps (1.1.0-11) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt@debian.org>
diff --git a/debian/dvb-utils.install b/debian/dvb-utils.install
index 3fbc3de..4e4dfdb 100644
--- a/debian/dvb-utils.install
+++ b/debian/dvb-utils.install
@@ -1,15 +1,17 @@
-util/av7110_loadkeys/av7110_loadkeys 		usr/bin
-util/av7110_loadkeys/budget_ci_loadkeys 	usr/bin
-util/av7110_loadkeys/evtest 			usr/bin
-	
-util/dvbdate/dvbdate 		usr/bin
-util/dvbnet/dvbnet 		usr/bin
-util/dvbtraffic/dvbtraffic 	usr/bin
-	
-util/scan/scan 	usr/bin
-util/scan/dvb-*	usr/share/doc/dvb-utils/examples/scan/
-	
-util/szap/czap 	usr/bin
+util/av7110_loadkeys/av7110_loadkeys            usr/bin
+util/av7110_loadkeys/budget_ci_loadkeys         usr/bin
+util/av7110_loadkeys/evtest                     usr/bin
+        
+util/dvbdate/dvbdate            usr/bin
+util/dvbnet/dvbnet              usr/bin
+util/dvbtraffic/dvbtraffic      usr/bin
+        
+util/scan/scan  usr/bin
+util/scan/dvb-* usr/share/doc/dvb-utils/examples/scan/
+util/scan/atsc  usr/share/doc/dvb-utils/examples/scan/
+        
+util/szap/azap  usr/bin
+util/szap/czap  usr/bin
 util/szap/femon usr/bin
-util/szap/szap 	usr/bin
-util/szap/tzap 	usr/bin
+util/szap/szap  usr/bin
+util/szap/tzap  usr/bin
diff --git a/debian/patches/00list b/debian/patches/00list
index 1b11212..1f01a68 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,7 +3,4 @@
 03_budget_ci_loadkeys
 04_scanfiles_from_cvs
 05_scanfiles_not_in_cvs_yet
-06_freeview_channel_numbers
-07_vdr_output
-08_debug_minor_fixes
 09_x_zap_flush_stdout
diff --git a/debian/patches/06_freeview_channel_numbers.dpatch b/debian/patches/06_freeview_channel_numbers.dpatch
deleted file mode 100644
index 7991e18..0000000
--- a/debian/patches/06_freeview_channel_numbers.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_vdr.dpatch by  <ds@flibble.youmustbejoking.demon.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/scan.c linuxtv-dvb-apps-1.1.0/util/scan/scan.c
---- linuxtv-dvb-apps-1.1.0~/util/scan/scan.c	2004-04-22 12:09:09.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.0/util/scan/scan.c	2005-10-22 16:51:01.161112392 +0100
-@@ -323,7 +323,7 @@
- 	buf += 2;
- 	for (i = 0; i < n; i++) {
- 		service_id = (buf[0]<<8)|(buf[1]&0xff);
--		channel_num = (buf[2]&0x03<<8)|(buf[3]&0xff);
-+		channel_num = (buf[2]&0x03)<<8|(buf[3]&0xff);
- 		debug("Service ID 0x%x has channel number %d ", service_id, channel_num);
- 		list_for_each(p1, &scanned_transponders) {
- 			t = list_entry(p1, struct transponder, list);
diff --git a/debian/patches/07_vdr_output.dpatch b/debian/patches/07_vdr_output.dpatch
deleted file mode 100644
index b8ad800..0000000
--- a/debian/patches/07_vdr_output.dpatch
+++ /dev/null
@@ -1,140 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_vdr_output.dpatch by Darren Salt <linux@youmustbejoking.demon.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a few problems in the VDR output.
-## DP: * Provider names formatting was wrong
-## DP: * Output audio language information
-## DP: * Ensure that the services' TS IDs are always correctly set
-
-@DPATCH@
-diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/dump-vdr.c linuxtv-dvb-apps-1.1.0/util/scan/dump-vdr.c
---- linuxtv-dvb-apps-1.1.0~/util/scan/dump-vdr.c	2005-10-22 19:51:02.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.0/util/scan/dump-vdr.c	2005-10-22 19:51:03.058914014 +0100
-@@ -115,9 +115,11 @@
- 				 int video_pid,
- 				 int pcr_pid,
- 				 uint16_t *audio_pid,
-+				 char audio_lang[][4],
-                                  int audio_num,
- 				 int teletext_pid,
- 				 int scrambled,
-+				 int subtitling_pid,
- 				 int ac3_pid,
-                                  int service_id,
- 				 int network_id,
-@@ -133,26 +135,42 @@
-         int i;
- 
- 	if ((video_pid || audio_pid[0]) && ((ca_select > 0) || ((ca_select == 0) && (scrambled == 0)))) {
-+		if (vdr_version <= 2) {
-+			audio_lang = NULL;
-+			network_id = 0;
-+			transport_stream_id = 0;
-+		}
- 		if ((dump_channum == 1) && (channel_num > 0))
- 			fprintf(f, ":@%i\n", channel_num);
--		if (dump_provider == 1)
--			fprintf (f, "%s - ", provider_name);
--		fprintf (f, "%s:", service_name);
-+		if (vdr_version >= 3)
-+			fprintf (f, "%s;%s:", service_name, provider_name);
-+		else
-+		  {
-+		    if (dump_provider == 1)
-+		      fprintf (f, "%s - ", provider_name);
-+		    fprintf (f, "%s:", service_name);
-+		  }
- 		vdr_dump_dvb_parameters (f, type, p, polarity, orbital_pos, we_flag);
- 		if ((pcr_pid != video_pid) && (video_pid > 0))
- 			fprintf (f, "%i+%i:", video_pid, pcr_pid);
- 		else
- 			fprintf (f, "%i:", video_pid);
- 		fprintf (f, "%i", audio_pid[0]);
-+		if (audio_lang && audio_lang[0][0])
-+			fprintf (f, "=%.4s", audio_lang[0]);
- 	        for (i = 1; i < audio_num; i++)
-+	        {
- 			fprintf (f, ",%i", audio_pid[i]);
-+			if (audio_lang && audio_lang[i][0])
-+				fprintf (f, "=%.4s", audio_lang[i]);
-+		}
- 		if (ac3_pid)
-+		{
- 			fprintf (f, ";%i", ac3_pid);
-+			if (audio_lang && audio_lang[0][0])
-+				fprintf (f, "=%.4s", audio_lang[0]);
-+		}
- 		if (scrambled == 1) scrambled = ca_select;
--		if (vdr_version == 2) {
--			network_id = 0;
--			transport_stream_id = 0;
--		} 
- 		fprintf (f, ":%d:%d:%d:%d:%d:0", teletext_pid, scrambled,
- 				service_id, network_id, transport_stream_id);
- 		fprintf (f, "\n");
-diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/dump-vdr.h linuxtv-dvb-apps-1.1.0/util/scan/dump-vdr.h
---- linuxtv-dvb-apps-1.1.0~/util/scan/dump-vdr.h	2005-10-22 19:51:02.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.0/util/scan/dump-vdr.h	2005-10-22 19:51:03.058914014 +0100
-@@ -19,9 +19,11 @@
- 				 int video_pid,
- 				 int pcr_pid,
- 				 uint16_t *audio_pid,
-+				 char audio_lang[][4],
-                                  int audio_num,
- 				 int teletext_pid,
- 				 int scrambled,
-+				 int subtitling_pid,
- 				 int ac3_pid,
-                                  int service_id,
- 				 int network_id,
-diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/scan.c linuxtv-dvb-apps-1.1.0/util/scan/scan.c
---- linuxtv-dvb-apps-1.1.0~/util/scan/scan.c	2005-10-22 19:51:02.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.0/util/scan/scan.c	2005-10-22 19:53:29.088734079 +0100
-@@ -237,11 +237,13 @@
-  * (the DVB standards say theay should be unique within one
-  * network, but in real life...)
-  */
--static struct service *alloc_service(struct transponder *tp, int service_id)
-+static struct service *alloc_service(struct transponder *tp, int service_id,
-+				     int transport_stream_id)
- {
- 	struct service *s = calloc(1, sizeof(*s));
- 	INIT_LIST_HEAD(&s->list);
- 	s->service_id = service_id;
-+	s->transport_stream_id = transport_stream_id;
- 	list_add_tail(&s->list, &tp->services);
- 	return s;
- }
-@@ -684,7 +686,7 @@
- 		/* SDT might have been parsed first... */
- 		s = find_service(current_tp, service_id);
- 		if (!s)
--			s = alloc_service(current_tp, service_id);
-+			s = alloc_service(current_tp, service_id, transport_stream_id);
- 		s->pmt_pid = ((buf[2] & 0x1f) << 8) | buf[3];
- 		if (!s->priv && s->pmt_pid) {
- 			s->priv = malloc(sizeof(struct section_buf));
-@@ -872,7 +874,7 @@
- 		s = find_service(current_tp, service_id);
- 		if (!s)
- 			/* maybe PAT has not yet been parsed... */
--			s = alloc_service(current_tp, service_id);
-+			s = alloc_service(current_tp, service_id, transport_stream_id);
- 
- 		s->running = (buf[3] >> 5) & 0x7;
- 		s->scrambled = (buf[3] >> 4) & 1;
-@@ -1677,11 +1679,11 @@
- 						    s->video_pid,
- 						    s->pcr_pid,
- 						    s->audio_pid,
--						    //FIXME: s->audio_lang
-+						    s->audio_lang,
- 						    s->audio_num,
- 						    s->teletext_pid,
- 						    s->scrambled,
--						    //FIXME: s->subtitling_pid
-+						    s->subtitling_pid,
- 						    s->ac3_pid,
- 						    s->service_id,
- 						    t->network_id,
diff --git a/debian/patches/08_debug_minor_fixes.dpatch b/debian/patches/08_debug_minor_fixes.dpatch
deleted file mode 100644
index a85ef13..0000000
--- a/debian/patches/08_debug_minor_fixes.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_debug_minor_fixes.dpatch by Darren Salt <linux@youmustbejoking.demon.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debug output included "0x0x" in a few places.
-
-@DPATCH@
-diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/scan.c linuxtv-dvb-apps-1.1.0/util/scan/scan.c
---- linuxtv-dvb-apps-1.1.0~/util/scan/scan.c	2004-04-22 12:09:09.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.0/util/scan/scan.c	2005-10-22 18:32:32.427298462 +0100
-@@ -381,7 +383,7 @@
- 	t->param.inversion = spectral_inversion;
- 
- 	if (verbosity >= 5) {
--		debug("0x%#04x/0x%#04x ", t->network_id, t->transport_stream_id);
-+		debug("%#04x/%#04x ", t->network_id, t->transport_stream_id);
- 		dump_dvb_parameters (stderr, t);
- 		if (t->scan_done)
- 			dprintf(5, " (done)");
-@@ -413,7 +415,7 @@
- 	t->we_flag = buf[8] >> 7;
- 
- 	if (verbosity >= 5) {
--		debug("0x%#04x/0x%#04x ", t->network_id, t->transport_stream_id);
-+		debug("%#04x/%#04x ", t->network_id, t->transport_stream_id);
- 		dump_dvb_parameters (stderr, t);
- 		if (t->scan_done)
- 			dprintf(5, " (done)");
-@@ -467,7 +469,7 @@
- 	t->other_frequency_flag = (buf[8] & 0x01);
- 
- 	if (verbosity >= 5) {
--		debug("0x%#04x/0x%#04x ", t->network_id, t->transport_stream_id);
-+		debug("%#04x/%#04x ", t->network_id, t->transport_stream_id);
- 		dump_dvb_parameters (stderr, t);
- 		if (t->scan_done)
- 			dprintf(5, " (done)");