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

[Thomas Schmidt]

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

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

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-mp3/debian/changelog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- changelog	22 Apr 2004 11:17:34 -0000	1.1.1.1
+++ changelog	2 Jul 2004 17:09:16 -0000	1.2
@@ -1,14 +1,13 @@
-vdr-plugin-mp3 (0.8.3-3.autopie) unstable; urgency=low
-
-  * Changed architecture to any 
-
- -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Mon, 19 Apr 2004 18:57:53 +0200
-
-vdr-plugin-mp3 (0.8.3-3.autopid) unstable; urgency=low
+vdr-plugin-mp3 (0.8.3-3) unstable; urgency=low
 
-  * First upload to official Debian-archive (closes: Bug#229219)
+  * Thomas Schmidt:
+    - Changed architecture to any
+    - First upload to official Debian-archive (closes: Bug#229219)
+    - Use dh_install
+    - Changed maintainer to Debian VDR and DVB Packaging Team 
+      <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 
- -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri,  5 Mar 2004 23:14:56 +0100
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri, 02 Jul 2004 19:05:53 +0200
 
 vdr-plugin-mp3 (0.8.3-2) unstable; urgency=low
 

--- control.template DELETED ---

Index: control
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-mp3/debian/control,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- control	22 Apr 2004 11:17:34 -0000	1.1.1.1
+++ control	2 Jul 2004 17:09:16 -0000	1.2
@@ -1,13 +1,15 @@
 Source: vdr-plugin-mp3
 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), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, vdr-dev (>=1.1.25)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-mp3
 Architecture: any
 Depends: ${shlibs:Depends}, vdr (>=1.2.6)
+Conflicts: vdr (>=1.2.7)
 Description: Plugin to vdr for playing mp3's
  This plugin for vdr allows you to play mp3's, ogg-files and 
  audio-cds.

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

Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-mp3/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:17:34 -0000	1.1.1.1
+++ rules	2 Jul 2004 17:09:16 -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
@@ -33,7 +26,7 @@
 build-stamp: configure-stamp 
 	dh_testdir
 
-	$(MAKE) all DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=.
+	$(MAKE) libvdr-mp3 DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=.
 
 	touch build-stamp
 
@@ -53,7 +46,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	cp libvdr-mp3*.so.* $(CURDIR)/debian/vdr-plugin-mp3$(PLUGINDIR)/
+	dh_install
 
 # Build architecture-independent files here.
 binary-indep: build install