vdr/vdr-plugin-bitstreamout/debian install changelog control rules control.template

[Thomas Schmidt]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/debian
In directory haydn:/tmp/cvs-serv3018/vdr/vdr-plugin-bitstreamout/debian

Modified Files:
	changelog control rules 
Added Files:
	install 
Removed Files:
	control.template 
Log Message:
dh_install, maintainer-change, cleanup

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/debian/changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- changelog	18 Jun 2004 18:58:20 -0000	1.2
+++ changelog	2 Jul 2004 16:52:25 -0000	1.3
@@ -1,9 +1,14 @@
 vdr-plugin-bitstreamout (0.61-1) unstable; urgency=low
+  
+  * Thomas Schmidt:
+    - New upstream release
+    - Build-depend on libmad0-dev
+    - Use dh_install
+    - Changed maintainer to Debian VDR and DVB Packaging Team 
+      <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 
-  * New upstream release
-  * Build-depend on libmad0-dev
-
- -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri, 18 Jun 2004 20:56:37 +0200
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri, 02 Jul 2004
+ 18:50:37 +0200
 
 vdr-plugin-bitstreamout (0.50b-2) unstable; urgency=low
 

--- NEW FILE: install ---
bitstreamout/libvdr-bitstreamout.so.* usr/lib/vdr/plugins

--- control.template DELETED ---

Index: control
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- control	18 Jun 2004 18:58:20 -0000	1.2
+++ control	2 Jul 2004 16:52:25 -0000	1.3
@@ -1,13 +1,15 @@
 Source: vdr-plugin-bitstreamout
 Section: misc
 Priority: extra
-Maintainer: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+Maintainer: Debian VDR and DVB Packaging Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
 Build-Depends: debhelper (>> 3.0.0), vdr-dev (>=1.2.6), libasound2-dev, libmad0-dev
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-bitstreamout
 Architecture: any
 Depends: ${shlibs:Depends}, vdr (>=1.2.6)
+Conflicts: vdr (>=1.2.7)
 Description: Plugin to vdr for playing AC3-Sound via your Soundcard
  This plugin(s) for vdr allows you to play the AC3-Audio from 
  the DVB-Card via the SPDIF-Port of your Soundcard.

Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/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 10:57:08 -0000	1.1.1.1
+++ rules	2 Jul 2004 16:52:25 -0000	1.2
@@ -8,10 +8,6 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
-VDRVERSION := $(shell LC_ALL=C apt-cache policy vdr-dev | grep Installed: | cut -d: -f2 | cut -d" " -f2 | cut -d- -f1)
-
-PLUGINDIR := /usr/lib/vdr/plugins
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -23,9 +19,6 @@
 configure-stamp:
 	dh_testdir
 
-	# Make the plugin depend on the vdr-dev-package's vdr-version
-	cat debian/control.template | sed s/##vdr-version-placeholder##/$(VDRVERSION)/ > debian/control
-
 	touch configure-stamp
 
 build: build-stamp
@@ -34,7 +27,6 @@
 	dh_testdir
 
 	cd bitstreamout; $(MAKE) CXXARCH= DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. all
-	#$(MAKE) CXXARCH= DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. all
 
 	touch build-stamp
 
@@ -47,9 +39,6 @@
 	cd bitstreamout; rm -f libvdr-*.so*
 	cd bitstreamout; make clean
 	
-	#rm -f libvdr-*.so*
-	#make clean
-
 	dh_clean
 
 install: build
@@ -58,9 +47,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	cp bitstreamout/libvdr-bitstreamout.so.* \
-	$(CURDIR)/debian/vdr-plugin-bitstreamout$(PLUGINDIR)/
-	#cp libvdr-bitstreamout.so.* $(CURDIR)/debian/vdr-plugin-bitstreamout$(PLUGINDIR)/
+	dh_install
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -75,11 +62,9 @@
 	dh_installmenu
 	dh_installcron
 	dh_installman bitstreamout/vdr-bitstreamout.5
-	#dh_installman vdr-bitstreamout.5
 	dh_installinfo
 	dh_installchangelogs 
 	dh_installchangelogs bitstreamout/ChangeLog 
-	#dh_installchangelogs ChangeLog 
 	dh_link
 	dh_strip
 	dh_compress