vdr/vdr/debian vdr-daemon.install vdr-dev.install vdr-kbd.install vdr-lirc.install vdr-plugin-examples.install vdr-plugin-sky.install vdr-rcu.install vdr.install rules

[Tobias Grimm]

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

Modified Files:
	rules 
Added Files:
	vdr-daemon.install vdr-dev.install vdr-kbd.install 
	vdr-lirc.install vdr-plugin-examples.install 
	vdr-plugin-sky.install vdr-rcu.install vdr.install 
Log Message:
using dh_install now for installing most files

--- NEW FILE: vdr-lirc.install ---
vdr-lirc usr/bin/

--- NEW FILE: vdr-plugin-sky.install ---
PLUGINS/lib/libvdr-sky.so.* usr/lib/vdr/plugins/

--- NEW FILE: vdr-daemon.install ---
vdr-daemon usr/bin/

--- NEW FILE: vdr-kbd.install ---
vdr-kbd usr/bin/

--- NEW FILE: vdr-plugin-examples.install ---
PLUGINS/lib/libvdr-hello.so.* usr/lib/vdr/plugins/
PLUGINS/lib/libvdr-osddemo.so.* usr/lib/vdr/plugins/
PLUGINS/lib/libvdr-status.so.* usr/lib/vdr/plugins/

Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/rules,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- rules	8 May 2004 00:25:25 -0000	1.23
+++ rules	8 May 2004 20:12:42 -0000	1.24
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+export DH_COMPAT=4
 
 CFGDIR    := /var/lib/vdr
 DVBDIR    := /usr/include
@@ -79,62 +79,20 @@
 	
 	dh_clean
 
-prepare-install:
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
-install-vdr-daemon:
-	install -m 755 vdr-daemon $(CURDIR)/debian/vdr-daemon/usr/bin/	
-
-install-vdr-lirc:
-	install -m 755 vdr-lirc $(CURDIR)/debian/vdr-lirc/usr/bin/	
-
-install-vdr-kbd:
-	install -m 755 vdr-kbd $(CURDIR)/debian/vdr-kbd/usr/bin/	
-
-install-vdr-rcu:
-	install -m 755 vdr-rcu $(CURDIR)/debian/vdr-rcu/usr/bin/
-
-install-vdr-dev:
-	install -m 644 *.h $(CURDIR)/debian/vdr-dev/usr/include/vdr/
-
-install-plugins:
-	for plugin in hello osddemo status; do \
-		cp -a PLUGINS/lib/libvdr-$$plugin.so.* $(CURDIR)/debian/vdr-plugin-examples/usr/lib/vdr/plugins; \
-	done
-	cp -a PLUGINS/lib/libvdr-sky.so.* $(CURDIR)/debian/vdr-plugin-sky/usr/lib/vdr/plugins
-
-install: build prepare-install install-vdr-daemon install-vdr-lirc install-vdr-kbd install-vdr-rcu install-vdr-dev install-plugins
 	# Add here commands to install the package into debian/vdr.
 	install -m 755 $(CURDIR)/debian/vdr-message $(CURDIR)/debian/vdr/usr/bin/vdr
-	cp -a epg2html.pl svdrpsend.pl $(CURDIR)/debian/vdr/usr/lib/vdr/
 	dh_installman $(CURDIR)/vdr.1 -p vdr
 
-	# install modified runvdr script
-	cp $(CURDIR)/debian/runvdr $(CURDIR)/debian/vdr/usr/sbin/runvdr
-	chmod ugo+x $(CURDIR)/debian/vdr/usr/sbin/runvdr
-
-	# install additional conf-files
-	cp debian/order.conf $(CURDIR)/debian/vdr/etc/vdr/plugins/
-	cp debian/order.commands.conf $(CURDIR)/debian/vdr/etc/vdr/command-hooks/
-	cp debian/order.reccmds.conf $(CURDIR)/debian/vdr/etc/vdr/command-hooks/
-
-	# install custom commands files
-	cp debian/commands.custom.conf $(CURDIR)/debian/vdr/etc/vdr/command-hooks/
-	cp debian/reccmds.custom.conf $(CURDIR)/debian/vdr/etc/vdr/command-hooks/
-
-	# install helper files for vdr.init
-	cp debian/plugin-loader.sh $(CURDIR)/debian/vdr/usr/lib/vdr
-	cp debian/commands-loader.sh $(CURDIR)/debian/vdr/usr/lib/vdr
-
-	# config files
-	install -m 644 ca.conf diseqc.conf keymacros.conf sources.conf svdrphosts.conf $(CURDIR)/debian/vdr/etc/vdr/
-
 	# lintian override
 	cp $(CURDIR)/debian/vdr.override $(CURDIR)/debian/vdr/usr/share/lintian/overrides/vdr
 
+	# All other files will be installed using dh_install.
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -148,6 +106,7 @@
 	dh_installmenu -i
 	dh_installchangelogs -i HISTORY -pvdr
 	dh_installchangelogs -i HISTORY -pvdr-dev
+	dh_install -i
 	dh_link -i
 	dh_strip -i
 	dh_compress -i 
@@ -167,6 +126,7 @@
 	dh_installman -a
 	dh_installmenu -a
 	dh_installchangelogs -pvdr-plugin-sky PLUGINS/src/sky/HISTORY
+	dh_install -a
 	dh_link -a
 	dh_strip -a
 	dh_compress -a

--- NEW FILE: vdr-dev.install ---
*.h usr/include/vdr/

--- NEW FILE: vdr-rcu.install ---
vdr-rcu usr/bin/

--- NEW FILE: vdr.install ---
epg2html.pl  usr/lib/vdr/
svdrpsend.pl usr/lib/vdr/

debian/runvdr /usr/sbin/

debian/order.conf etc/vdr/plugins/

debian/order.commands.conf etc/vdr/command-hooks/
debian/order.reccmds.conf  etc/vdr/command-hooks/

debian/commands.custom.conf etc/vdr/command-hooks/
debian/reccmds.custom.conf  etc/vdr/command-hooks/

debian/plugin-loader.sh   usr/lib/vdr
debian/commands-loader.sh usr/lib/vdr

ca.conf	        etc/vdr/
diseqc.conf     etc/vdr/
keymacros.conf  etc/vdr/
sources.conf    etc/vdr/
svdrphosts.conf etc/vdr/