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

10 files changed, 45 insertions, 235 deletions

diff --git a/debian/changelog b/debian/changelog
index b488282..119bf7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+linuxtv-dvb-apps (1.1.1+rev1457-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixes "dvb-apps: missing channel for es-Sevilla" (Closes: #569077)
+    - Fixes "Missing muxes" (Closes: #540660)
+    - Fixes "fr-Nantes should have offset of 167000" (Closes: #564204)
+  * "Typo in the synopsis" amended (Closes: #651812)
+  * Switch to dh - build-depends-on-obsolete-package
+  * Drop obsolete Uploaders
+  * Drop me-tv obsolete Conflicts
+  * source/format 3.0 (quilt) - patch-system-but-no-source-readme build-
+    depends-on-obsolete-package
+  * Minor update Description
+  * ACK NMU - Thks Simon
+  * bug-presubj - redirect frequency updates upstream
+
+ -- Mark Purcell <msp@debian.org>  Thu, 05 Jan 2012 18:02:19 +1100
+
 linuxtv-dvb-apps (1.1.1+rev1355-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 3e94b70..c1e988f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,13 @@ Source: linuxtv-dvb-apps
 Section: video
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> 
-Uploaders:
- Thomas Schmidt <tschmidt@debian.org>,
- Mark Purcell <msp@debian.org>,
- Tobias Grimm <etobi@debian.org>,
- Stephane Glondu <steph@glondu.net>
+Uploaders: Mark Purcell <msp@debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), cdbs, dpatch
+Build-Depends: debhelper (>= 8)
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/trunk/
-Homepage: http://www.linuxtv.org/ 
+Homepage: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps
 
 Package: dvb-apps
 Architecture: any
@@ -21,15 +17,18 @@ Depends:
  makedev | udev,
  ${misc:Depends}
 Replaces: dvb-utils
-Conflicts: libxbase2.0-bin, libxdb-dev, me-tv (<< 0.5.33-2)
-Description: Digitial Video Broadcasting (DVB) applications
+Conflicts: libxbase2.0-bin, libxdb-dev
+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,
  and ATSC standards.
  . 
  Main User Applications:
-  . util/scan       - Scan for channels on your digital TV device
-  . util/gnutv      - Tune, watch and stream your TV
+  . scan               - Scan for channels on your digital TV device
+  . dvbscan            - Another frequency scanning tool 
+  . czap, szap, tzap   - Tuning utilities for DVB-C, DVB-S, DVB-T
+  . azap               - Tuning utility for ATSC
+  . gnutv              - Tune, watch and stream your TV
  .
  General Utilities:
   . util/dvbdate    - Set your clock from digital TV
@@ -37,6 +36,7 @@ Description: Digitial Video Broadcasting (DVB) applications
   . util/dvbtraffic - Monitor traffic on a digital device
   . util/femon      - Monitor the tuning on a digital TV device
   . util/zap        - *Just* tunes a digital device
+  . util/atsc_epg   - Display ATSC Electronic Program Guide (next programs)
  .
  Hardware Specific Utilities:
   . util/av7110_loadkeys    - Load remote keys into an av7110 based card
diff --git a/debian/dvb-apps.bug-presubj b/debian/dvb-apps.bug-presubj
new file mode 100644
index 0000000..9ad9393
--- /dev/null
+++ b/debian/dvb-apps.bug-presubj
@@ -0,0 +1,7 @@
+DVB frequency updates should include upstream <linux-media@vger.kernel.org>
+as an additional addresses the report should be sent to.
+
+http://linuxtv.org/news.php?entry=2011-09-18.mchehab
+
+Thanks,
+Mark
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 2becd35..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_README.scan
-09_x_zap_flush_stdout
-15_stdint_include
-17_ftbfs_drop_V4L1
diff --git a/debian/patches/09_x_zap_flush_stdout.dpatch b/debian/patches/09_x_zap_flush_stdout.dpatch
index 82fac8d..82fac8d 100644..100755
--- a/debian/patches/09_x_zap_flush_stdout.dpatch
+++ b/debian/patches/09_x_zap_flush_stdout.dpatch
diff --git a/debian/patches/17_ftbfs_drop_V4L1 b/debian/patches/17_ftbfs_drop_V4L1
deleted file mode 100644
index 62a319a..0000000
--- a/debian/patches/17_ftbfs_drop_V4L1
+++ /dev/null
@@ -1,206 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_ftbfs_drop_V4L1 by Daniel T Chen <crimsun@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream removed the legacy test app in hg changeset 1424.
-## DP: http://linuxtv.org/hg/dvb-apps/rev/e5745959ca83
-## DP: Follow suit to fix FTBFS (Closes: #621964)
-
-@DPATCH@
-diff -r 3c14666ebdcc -r e5745959ca83 test/Makefile
---- a/test/Makefile	Sun Apr 03 10:57:58 2011 -0300
-+++ b/test/Makefile	Sun Apr 03 11:05:32 2011 -0300
-@@ -20,7 +20,6 @@
-            test_vevent     \
-            test_video      \
- 	   evtest	   \
--	   video	   \
- 	   szap2
- 
- .PHONY: all
-diff -r 3c14666ebdcc -r e5745959ca83 test/video.c
---- a/test/video.c	Sun Apr 03 10:57:58 2011 -0300
-+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-@@ -1,182 +0,0 @@
--#define USAGE \
--"\n" \
--"\n A tiny video watching application, just starts capturing /dev/video" \
--"\n into /dev/fb0." \
--"\n Be shure to have >8Bit/pixel color resolution and r/w access for " \
--"\n /dev/video0, /dev/fb0 and /dev/tty0 to let this work..." \
--"\n" \
--"\n  compile with" \
--"\n" \
--"\n  $ gcc -g -Wall -O2 -o video video.c -I../../ost/include" \
--"\n"
--
--#include <sys/mman.h>
--#include <sys/ioctl.h>
--#include <sys/types.h>
--#include <sys/time.h>
--#include <unistd.h>
--#include <fcntl.h>
--#include <signal.h>
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--
--#include <linux/fb.h>
--#include <linux/videodev.h>
--
--#define VIDEO_DEV "/dev/video0"
--#define FB_DEV "/dev/fb0"
--#define VT_DEV "/dev/tty0"
--
--static char *video_devname = VIDEO_DEV;
--
--#define min(a,b)	(a) < (b) ? (a) : (b)
--
--static int zero = 0;
--static int one = 1;
--
--static struct fb_var_screeninfo fb_var;
--static struct fb_fix_screeninfo fb_fix;
--
--
--int init_fb (void)
--{
--	const char blankoff_str[] = "\033[9;0]";
--	int fd, vt_fd;
--
--	fd = open (FB_DEV, O_RDWR);
--	if (fd < 0) {
--		perror("Could not open " FB_DEV ", please check permissions\n");
--		return 1;
--	}
--
--	if ((vt_fd = open( VT_DEV, O_RDWR )) < 0) {
--		perror("Could not open " VT_DEV ", please check permissions\n");
--		return 1;
--	}
--
--	write( vt_fd, blankoff_str, strlen(blankoff_str) );
--
--	if (ioctl (fd, FBIOGET_VSCREENINFO, &fb_var) < 0) {
--		perror("Could not get variable screen information (fb_var)\n");
--		return 1;
--	}
--
--	if (ioctl (fd, FBIOGET_FSCREENINFO, &fb_fix) < 0) {
--		perror("Could not get fixed screen information (fb_fix)\n");
--		return 1;
--	}
--
--	close (fd);
--	return 0;
--}
--
--
--int init_video (int stop)
--{
--	int fd;
--	struct video_capability vcap;
--
--	if ((fd = open (video_devname, O_RDWR)) < 0) {
--		fprintf (stderr,
--			 "%s: Could not open %s, please check permissions\n",
--			 __FUNCTION__, video_devname);
--		return -1;
--	}
--
--	ioctl(fd, VIDIOCGCAP, &vcap);
--
--	if (ioctl(fd, VIDIOCCAPTURE, &zero) < 0) {
--		perror("Could not stop capturing (VIDIOCCAPTURE failed)\n");
--		return -2;
--	}
--
--	if (stop)
--		return 0;
--
--	{
--		struct video_buffer b;
--		b.base = (void*) fb_fix.smem_start;
--		b.width = fb_var.xres;
--		b.height = fb_var.yres;
--		b.depth = fb_var.bits_per_pixel;
--		b.bytesperline = fb_var.xres*((fb_var.bits_per_pixel+7)/8);
--		if (ioctl(fd, VIDIOCSFBUF, &b) < 0) {
--			fprintf(stderr, "VIDIOCSFBUF failed, must run as root?\n");
--			return -3;
--		}
--	}
--
--	{
--		struct video_picture p;
--		if (ioctl(fd, VIDIOCGPICT, &p) < 0) {
--			perror("VIDIOCGPICT failed\n");
--			return -4;
--		}
--		p.depth = fb_var.bits_per_pixel;
--		switch (fb_var.bits_per_pixel) {
--			case 16:
--				p.palette = VIDEO_PALETTE_RGB565;
--				break;
--			case 24:
--				p.palette = VIDEO_PALETTE_RGB24;
--				break;
--			case 32:
--				p.palette = VIDEO_PALETTE_RGB32;
--				break;
--		}
--		//p.contrast = 0x8000;
--		//p.colour = 0x6000;
--		if (ioctl(fd, VIDIOCSPICT, &p) < 0) {
--			perror("VIDIOCSPICT failed\n");
--			return -5;
--		}
--	}
--
--	{
--		struct video_window win;
--		win.width = min((__u32) vcap.maxwidth, fb_var.xres);
--		win.height = min((__u32) vcap.maxheight, fb_var.yres);
--		win.x = 0;
--		win.y = 0;
--		win.flags = 0;
--		win.clips = NULL;
--		win.clipcount = 0;
--		win.chromakey = 0;
--		if (ioctl(fd, VIDIOCSWIN, &win) < 0) {
--			perror("VIDIOCSWIN failed\n");
--			return -6;
--		}
--	}
--
--	if (ioctl(fd, VIDIOCCAPTURE, &one) < 0) {
--		perror("Could not start capturing (VIDIOCCAPTURE failed)\n");
--		return -7;
--	}
--
--	close (fd);
--
--	return 0;
--}
--
--int main (int argc, char **argv)
--{
--	int err = 0, stop = 0;
--
--	if ((err = init_fb()))
--		return err;
--
--	if ((argc == 2 && strcmp(argv[1], "stop") == 0) ||
--	    (argc == 3 && strcmp(argv[2], "stop") == 0))
--		stop = 1;
--
--	if ((argc == 2 && !stop) || argc == 3)
--		video_devname = argv[1];
--
--	if (argc != 1 && argc != 2 && !(argc == 3 && stop)) {
--		fprintf(stderr, "usage: %s <devname> <stop>\n" USAGE, argv[0]);
--		exit (-1);
--	}
--
--	return init_video (stop);
--}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b225301
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_README.scan.dpatch
+09_x_zap_flush_stdout.dpatch
+15_stdint_include.dpatch
diff --git a/debian/rules b/debian/rules
index 65fc6cc..87f25e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/makefile.mk
+%:
+	dh $@
 
-DEB_MAKE_BUILD_TARGET    := util
-DEB_MAKE_INSTALL_TARGET  := install DESTDIR=$(CURDIR)/debian/dvb-apps/
-
-common-build-arch::
-	$(MAKE)
-
-clean::
-	[ ! -f Makefile ] || make clean
-
-binary-install/dvb-apps::
+override_dh_installdocs:
+	dh_installdocs
 	# install READMEs into doc/dvb-apps
 	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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)