Imported Debian patch 1.1.1+rev1207-5debian/1.1.1+rev1207-5

5 files changed, 74 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index fc87926..3b99c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+linuxtv-dvb-apps (1.1.1+rev1207-5) unstable; urgency=low
+
+  [ Stephane Glondu ]
+  * Add a patch to explicitly include <stdint.h> and system headers
+    first to fix FTBFS (Closes: #525580)
+  * Move to new section `video'
+  * Add myself to Uploaders and DM-Upload-Allowed
+  * Remove versioned dependencies available in oldstable, add
+    ${misc:Depends} as complained by Lintian
+
+  [ Tobias Grimm ]
+  * Increased standards version to 3.8.1
+  * Fixed license references in debian/coypright
+
+ -- Tobias Grimm <etobi@debian.org>  Fri, 01 May 2009 23:00:37 +0200
+
 linuxtv-dvb-apps (1.1.1+rev1207-4) unstable; urgency=low
 
   * Switch postinst to check for /dev/MAKEDEV
diff --git a/debian/control b/debian/control
index 792995c..0a1e926 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,25 @@
 Source: linuxtv-dvb-apps
-Section: misc
+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 <tg@e-tobi.net>
-Build-Depends: debhelper (>> 4.0.0), cdbs, dpatch (>= 2.0.9)
-Standards-Version: 3.7.3
+Uploaders:
+ Thomas Schmidt <tschmidt@debian.org>,
+ Mark Purcell <msp@debian.org>,
+ Tobias Grimm <etobi@debian.org>,
+ Stephane Glondu <steph@glondu.net>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7), cdbs, dpatch
+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/ 
 
 Package: dvb-apps
 Architecture: any
-Depends: ${shlibs:Depends}, makedev (>=2.3.1-66) | udev
+Depends:
+ ${shlibs: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
@@ -46,8 +54,7 @@ Description: Digitial Video Broadcasting (DVB) applications
 
 Package: dvb-utils
 Architecture: all
-Depends: dvb-apps
+Depends: dvb-apps, ${misc:Depends}
 Description: transitional dummy package for Debian etch
  This package is provided to smooth upgrades from Debian 4.0 ("etch") to Debian
  lenny. It may be safely removed from your system.
-
diff --git a/debian/copyright b/debian/copyright
index ed77b63..95de3b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,7 +30,7 @@ License:
         Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 
         This library is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ Public License can be found in `/usr/share/common-licenses/GPL'.
         Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 
 Other Portions:
diff --git a/debian/patches/00list b/debian/patches/00list
index 8b8a191..daa0d13 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 01_README.scan
 09_x_zap_flush_stdout
+15_stdint_include
diff --git a/debian/patches/15_stdint_include.dpatch b/debian/patches/15_stdint_include.dpatch
new file mode 100644
index 0000000..125be4d
--- /dev/null
+++ b/debian/patches/15_stdint_include.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_README.scan.dpatch by Stephane Glondu <steph@glondu.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Explicitly include <stdint.h> and include system headers first
+## DP: to fix FTBFS (Closes: #525580)
+
+@DPATCH@
+diff -Nru linuxtv-dvb-apps-1.1.1+rev1207/lib/libdvbapi/dvbaudio.c linuxtv-dvb-apps-1.1.1+rev1207/lib/libdvbapi/dvbaudio.c
+--- linuxtv-dvb-apps-1.1.1+rev1207/lib/libdvbapi/dvbaudio.c	2008-06-16 15:44:38.000000000 +0000
++++ linuxtv-dvb-apps-1.1.1+rev1207/lib/libdvbapi/dvbaudio.c	2009-04-29 13:10:19.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <sys/param.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+diff -Nru linuxtv-dvb-apps-1.1.1+rev1207/test/test_av.c linuxtv-dvb-apps-1.1.1+rev1207/test/test_av.c
+--- linuxtv-dvb-apps-1.1.1+rev1207/test/test_av.c	2008-06-16 15:44:38.000000000 +0000
++++ linuxtv-dvb-apps-1.1.1+rev1207/test/test_av.c	2009-04-29 13:10:19.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include <sys/ioctl.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -Nru linuxtv-dvb-apps-1.1.1+rev1207/util/scan/diseqc.c linuxtv-dvb-apps-1.1.1+rev1207/util/scan/diseqc.c
+--- linuxtv-dvb-apps-1.1.1+rev1207/util/scan/diseqc.c	2008-06-16 15:44:38.000000000 +0000
++++ linuxtv-dvb-apps-1.1.1+rev1207/util/scan/diseqc.c	2009-04-29 13:10:19.000000000 +0000
+@@ -1,6 +1,6 @@
+-#include <linux/dvb/frontend.h>
+ #include <sys/ioctl.h>
+ #include <time.h>
++#include <linux/dvb/frontend.h>
+ 
+ #include "scan.h"
+ #include "diseqc.h"