dvb/linuxtv-dvb-apps/debian dvb-utils.examples dvb-utils.install changelog control copyright dvb-utils.postinst rules copyright.reason dirs dvb.conf.d dvb-dev.dirs dvb-driver-source.dirs dvb.symlinks.d README.modulespackage

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 02 Jun 2004 16:18:24 +0000


Update of /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/debian
In directory haydn:/tmp/cvs-serv25629/dvb/linuxtv-dvb-apps/debian

Modified Files:
	changelog control copyright dvb-utils.postinst rules 
Added Files:
	dvb-utils.examples dvb-utils.install 
Removed Files:
	copyright.reason dirs dvb.conf.d dvb-dev.dirs 
	dvb-driver-source.dirs dvb.symlinks.d README.modulespackage 
Log Message:
cleanup of debian-dir; use dh_install

--- README.modulespackage DELETED ---

--- dvb.conf.d DELETED ---

--- copyright.reason DELETED ---

--- NEW FILE: dvb-utils.install ---
util/av7110_loadkeys/av7110_loadkeys 	usr/bin
util/av7110_loadkeys/evtest 				usr/bin
	
util/dvbdate/dvbdate 	usr/bin
	
util/scan/scan 	usr/bin
util/scan/dvb-* 	usr/share/doc/dvb-utils/examples/scan/
	
util/szap/czap 	usr/bin
util/szap/femon 	usr/bin
util/szap/szap 	usr/bin
util/szap/tzap 	usr/bin

--- dvb-driver-source.dirs DELETED ---

Index: control
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control	27 May 2004 14:26:54 -0000	1.3
+++ control	2 Jun 2004 16:18:22 -0000	1.4
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
 Uploaders: Andreas Mueller <amu@tr.debian.net>
-Build-Depends: debhelper (>> 3.0.0), transfig, tetex-bin, automake1.7 | automake, libncurses5-dev, liblircclient-dev, gs-common, dpatch
+Build-Depends: debhelper (>> 4.0.0), transfig, tetex-bin, automake1.7 | automake, libncurses5-dev, liblircclient-dev, gs-common, dpatch
 Standards-Version: 3.6.1
 
 Package: dvb-utils

--- dvb-dev.dirs DELETED ---

--- dvb.symlinks.d DELETED ---

Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/debian/rules,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- rules	22 Apr 2004 11:09:13 -0000	1.1.1.1
+++ rules	2 Jun 2004 16:18:22 -0000	1.2
@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=3
+export DH_COMPAT=4
 
 # include dpatch stuff
 include /usr/share/dpatch/dpatch.make
@@ -51,43 +51,24 @@
 
 	dh_clean
 
-install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	# apparently bug in debhelper
-	DH_COMPAT=1; dh_installdirs
 
 	# install stuff into debian/dvb-utils.
-	cp -a util/av7110_loadkeys/av7110_loadkeys debian/dvb-utils/usr/bin
-	cp -a util/av7110_loadkeys/evtest debian/dvb-utils/usr/bin
 	cp -a util/av7110_loadkeys/README debian/dvb-utils/usr/share/doc/dvb-utils/README.av7110_loadkeys
-	
-	cp -a util/dvbdate/dvbdate debian/dvb-utils/usr/bin
-	
-	cp -a util/scan/scan debian/dvb-utils/usr/bin
 	cp -a util/scan/README debian/dvb-utils/usr/share/doc/dvb-utils/README.scan
-	cp -a util/scan/dvb-* debian/dvb-utils/usr/share/doc/dvb-utils/examples/scan/
-	
-	cp -a util/szap/czap debian/dvb-utils/usr/bin
-	cp -a util/szap/femon debian/dvb-utils/usr/bin
-	cp -a util/szap/szap debian/dvb-utils/usr/bin
-	cp -a util/szap/tzap debian/dvb-utils/usr/bin
-
-	dh_movefiles
 
-	find debian | grep -i CVS | xargs rm -rf
+	dh_install
 
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdocs -a
-	dh_installexamples -p dvb-utils util/szap/channels.conf*
-	dh_installexamples -p dvb-utils util/av7110_loadkeys/*.rcmm
-	dh_installexamples -p dvb-utils util/av7110_loadkeys/*.rc5
+	dh_installexamples -a
 	dh_installmenu -a
 	dh_installcron -a
 	dh_installinfo -a

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- changelog	27 May 2004 14:25:44 -0000	1.4
+++ changelog	2 Jun 2004 16:18:22 -0000	1.5
@@ -1,4 +1,12 @@
-linuxtv-dvb-apps (1.1.0-1) unstable; urgency=low
+linuxtv-dvb-apps (1.1.0-2) experimental; urgency=low
+
+  * Thomas Schmidt:
+    + Cleanup of complete debian-directory
+    + Use dh_install
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Wed,  2 Jun 2004 18:12:22 +0200
+
+linuxtv-dvb-apps (1.1.0-1) experimental; urgency=low
 
   * Thomas Schmidt:
     + New upstream version (closes: Bug#242701)

--- NEW FILE: dvb-utils.examples ---
util/szap/channels.conf*
util/av7110_loadkeys/*.rcmm
util/av7110_loadkeys/*.rc5

Index: copyright
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/debian/copyright,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- copyright	22 Apr 2004 11:09:13 -0000	1.1.1.1
+++ copyright	2 Jun 2004 16:18:22 -0000	1.2
@@ -18,14 +18,3 @@
 
 It may be redistributed under the terms of the GNU GPL, Version 2
 found on Debian systems in the file /usr/share/common-licenses/GPL .
-
-NOTE about the included firmware dump:
-
-The files Root and Dpram are distributed with the source package. Even if
-they contain binary code, it cannot be executed as part of any other software
-under GPL because of its technical nature. GPL covers these files as prepared
-data accompanying the GPL program.  Their content is to be treated as source
-code.  You may use and distribute it UNDER THE TERMS OF GNU GENERAL PUBLIC
-LICENSE. Contact 'convergence integrated media GmbH'
-<http://www.convergence.de> for any further questions about the creation of
-the firmware files.

Index: dvb-utils.postinst
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/debian/dvb-utils.postinst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dvb-utils.postinst	8 May 2004 23:06:42 -0000	1.1
+++ dvb-utils.postinst	2 Jun 2004 16:18:22 -0000	1.2
@@ -6,4 +6,6 @@
 cd /dev && /sbin/MAKEDEV dvb
 fi
 
+#DEBHELPER#
+
 exit 0

--- dirs DELETED ---