vdr/vdr/debian changelog rules vdr-dev.install vdr.install vdr.manpages vdr.override

[Thomas Schmidt]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian
In directory haydn:/tmp/cvs-serv15997/vdr/vdr/debian

Modified Files:
	changelog rules vdr-dev.install vdr.install vdr.manpages 
Removed Files:
	vdr.override 
Log Message:
* moved lintian-overrides to debian/lintian/
* added overrides for vdr-dev
* now install all manpages via dh_install
* cleaned up debian/rules a little bit

--- vdr.override DELETED ---

Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/rules,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- rules	6 Nov 2004 15:54:38 -0000	1.32
+++ rules	6 Nov 2004 18:25:29 -0000	1.33
@@ -93,12 +93,6 @@
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/vdr.
-	dh_installman $(CURDIR)/vdr.1 -p vdr
-
-	# lintian override
-	cp $(CURDIR)/debian/vdr.override $(CURDIR)/debian/vdr/usr/share/lintian/overrides/vdr
-
 	# patchlevel file:
 	install -D -m644 debian/patchlevel debian/vdr-dev/usr/include/vdr/patchlevel || true
 	
@@ -111,11 +105,10 @@
 	dh_installdebconf -i -pvdr
 	dh_installdocs -i 
 	dh_installexamples -i -pvdr *.conf channels.conf.*
-	dh_installman -i $(CURDIR)/vdr.5 -p vdr
+	dh_installman -i 
 	dh_installinit -i -pvdr
 	dh_installmenu -i
-	dh_installchangelogs -i HISTORY -pvdr
-	dh_installchangelogs -i HISTORY -pvdr-dev
+	dh_installchangelogs -i
 	dh_install -i
 	chmod ugo+x $(CURDIR)/debian/vdr/usr/lib/vdr/vdr-*
 	dh_link -i

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- changelog	6 Nov 2004 15:54:38 -0000	1.59
+++ changelog	6 Nov 2004 18:25:29 -0000	1.60
@@ -25,8 +25,12 @@
       normal vdr-source-tree
     - Added debianize-vdrplugin-script and the plugin-template-dir from 
       c't-vdr
+    - Moved lintian-override-file to debian/lintian/vdr
+    - Added lintian-override to avoid the lintian-warnings for the
+      plugin-template-scripts
+    - Cleaned up debin/rules a little bit
 
- -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sat, 06 Nov 2004 16:48:46 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sat, 06 Nov 2004 19:16:11 +0100
 
 vdr (1.2.6-5) unstable; urgency=low
 

Index: vdr-dev.install
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr-dev.install,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vdr-dev.install	6 Nov 2004 15:54:38 -0000	1.3
+++ vdr-dev.install	6 Nov 2004 18:25:29 -0000	1.4
@@ -4,3 +4,5 @@
 debian/plugin-template/     	usr/share/vdr-dev/
 
 vdr-newplugin			usr/bin/
+
+debian/lintian/vdr-dev		usr/share/lintian/overrides/

Index: vdr.install
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.install,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- vdr.install	1 Jun 2004 11:04:12 -0000	1.7
+++ vdr.install	6 Nov 2004 18:25:29 -0000	1.8
@@ -1,7 +1,7 @@
 epg2html.pl  usr/lib/vdr/
 svdrpsend.pl usr/lib/vdr/
 
-debian/runvdr /usr/sbin/
+debian/runvdr usr/sbin/
 
 debian/order.conf etc/vdr/plugins/
 
@@ -14,14 +14,17 @@
 debian/plugin-loader.sh   usr/lib/vdr
 debian/commands-loader.sh usr/lib/vdr
 
-ca.conf	       etc/vdr/
+ca.conf		etc/vdr/
 diseqc.conf     etc/vdr/
 keymacros.conf  etc/vdr/
 sources.conf    etc/vdr/
 svdrphosts.conf etc/vdr/
 
-debian/vdr-recordingaction /usr/lib/vdr/
-debian/R90.custom          /etc/vdr/recording-hooks/
+debian/vdr-recordingaction usr/lib/vdr/
+debian/R90.custom          etc/vdr/recording-hooks/
+
+debian/vdr-shutdown usr/lib/vdr/
+debian/S90.custom   etc/vdr/shutdown-hooks/
+
+debian/lintian/vdr usr/share/lintian/overrides/
 
-debian/vdr-shutdown /usr/lib/vdr/
-debian/S90.custom   /etc/vdr/shutdown-hooks/

Index: vdr.manpages
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.manpages,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vdr.manpages	1 Jun 2004 11:04:12 -0000	1.4
+++ vdr.manpages	6 Nov 2004 18:25:29 -0000	1.5
@@ -1 +1,4 @@
+vdr.1
+vdr.5
+
 debian/runvdr.8