Imported Debian patch 1.1.0-6debian/1.1.0-6

6 files changed, 21 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 87a4514..36f01db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+linuxtv-dvb-apps (1.1.0-6) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt@debian.org>
+    - Added dvbnet and dvbtraffic bins to dvb-utils (closes: #298707)
+    - Changed debian/watch and all other references to the new 
+      download-directory on www.linuxtv.org
+    - Removed Andreas Müller from uploaders - he does not intend 
+      to do uploads anymore
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Wed, 23 Feb 2005 12:09:16 +0100
+
 linuxtv-dvb-apps (1.1.0-5) unstable; urgency=low
 
   * The "This is my first upload." release
diff --git a/debian/control b/debian/control
index ff0d3a7..6e9b509 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: linuxtv-dvb-apps
 Section: misc
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> 
-Uploaders: Andreas Mueller <amu@tr.debian.net>, Thomas Schmidt <tschmidt@debian.org>
+Uploaders: Thomas Schmidt <tschmidt@debian.org>
 Build-Depends: debhelper (>> 4.0.0), dpatch (>= 2.0.9)
 Standards-Version: 3.6.1
 
diff --git a/debian/copyright b/debian/copyright
index 1a8e0db..5f3dbdf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Eduard Bloch <blade@debian.org> on
 Fri, 21 Sep 2001 17:31:06 +0200.
 
-It was downloaded from http://www.linuxtv.org/download/dvb/
+It was downloaded from http://www.linuxtv.org/download/
 
 Upstream Authors: 
 
diff --git a/debian/dvb-utils.install b/debian/dvb-utils.install
index ecef384..3fbc3de 100644
--- a/debian/dvb-utils.install
+++ b/debian/dvb-utils.install
@@ -1,13 +1,15 @@
 util/av7110_loadkeys/av7110_loadkeys 		usr/bin
 util/av7110_loadkeys/budget_ci_loadkeys 	usr/bin
-util/av7110_loadkeys/evtest 					usr/bin
+util/av7110_loadkeys/evtest 			usr/bin
 	
-util/dvbdate/dvbdate 	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/dvb-*	usr/share/doc/dvb-utils/examples/scan/
 	
 util/szap/czap 	usr/bin
-util/szap/femon 	usr/bin
+util/szap/femon usr/bin
 util/szap/szap 	usr/bin
 util/szap/tzap 	usr/bin
diff --git a/debian/rules b/debian/rules
index 8c68ccb..67ac748 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ clean1:
 	rm -f *-stamp
 
 	# Add here commands to clean up after the build process.
-	make clean
+	-make clean
 
 	dh_clean
 
diff --git a/debian/watch b/debian/watch
index 5b1f722..61f88aa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=2
-http://www.linuxtv.org/download/dvb/ linuxtv-dvb-apps.*-([\d+\.]+|\d+)\.tar(\.gz|\.bz2) debian uupdate
+http://www.linuxtv.org/download/ linuxtv-dvb-apps.*-([\d+\.]+|\d+)\.tar(\.gz|\.bz2) debian uupdate