vdr/vdr-plugin-mp3/debian vdr-plugin-mp3.links watch changelog control rules vdr-plugin-mp3.dirs

[Thomas Schmidt]

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

Modified Files:
	changelog control rules 
Added Files:
	vdr-plugin-mp3.links watch 
Removed Files:
	vdr-plugin-mp3.dirs 
Log Message:
patchlevel, watchfile, link to mp3sources.conf...

--- NEW FILE: watch ---
version=2
http://www.muempf.de/down/vdr-mp3-(.*)\.tar\.gz

--- vdr-plugin-mp3.dirs DELETED ---

Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-mp3/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rules	2 Jul 2004 17:31:27 -0000	1.3
+++ rules	3 Jul 2004 12:25:00 -0000	1.4
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+export DH_COMPAT=4
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -15,6 +15,11 @@
 	INSTALL_PROGRAM += -s
 endif
 
+VDR=vdr
+PACKAGE=$(VDR)-plugin-mp3
+VDRDIR=/usr/include/$(VDR)
+DVBDIR=/usr/include
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -26,7 +31,7 @@
 build-stamp: configure-stamp 
 	dh_testdir
 
-	$(MAKE) libvdr-mp3.so DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=.
+	$(MAKE) libvdr-mp3.so DVBDIR=$(DVBDIR) VDRDIR=$(VDRDIR) LIBDIR=.
 
 	touch build-stamp
 
@@ -48,6 +53,11 @@
 
 	dh_install
 
+	# install mount.sh and mp3sources.conf
+	cp $(CURDIR)/examples/mp3sources.conf.example $(CURDIR)/debian/$(PACKAGE)/etc/vdr/plugins/
+	cp $(CURDIR)/examples/mount.sh.example $(CURDIR)/debian/$(PACKAGE)/usr/sbin/
+
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -69,6 +79,16 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
+
+	# VDR can be customized with quite a lot of different patches, which can make
+	# the plugins binary incompatible.
+	# Although Debian will not provide different binary packages for VDR, we
+	# will include a patchlevel info, which is created at compile time and can
+	# be checked before a plugin is loaded.
+   
+	[ -r $(VDRDIR)/patchlevel ] || echo 'patchlevel=' >> debian/$(PACKAGE).substvars
+	[ ! -r $(VDRDIR)/patchlevel ] || cat $(VDRDIR)/patchlevel >> debian/$(PACKAGE).substvars
+
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-mp3/debian/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- changelog	2 Jul 2004 17:36:29 -0000	1.3
+++ changelog	3 Jul 2004 12:25:00 -0000	1.4
@@ -6,6 +6,10 @@
     - Use dh_install
     - Changed maintainer to Debian VDR and DVB Packaging Team 
       <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+    - Added patchlevel-mechanism, to be compatible with c't-vdr		
+    - Added watch-file
+    - Added /etc/vdr/plugins/mp3sources.conf and link to 
+      /var/lib/vdr/plugins
 
  -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri,  2 Jul 2004 19:05:53 +0200
 

--- NEW FILE: vdr-plugin-mp3.links ---
etc/vdr/plugins/mp3sources.conf var/lib/vdr/plugins/mp3sources.conf

Index: control
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-mp3/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- control	2 Jul 2004 17:09:16 -0000	1.2
+++ control	3 Jul 2004 12:25:00 -0000	1.3
@@ -3,7 +3,7 @@
 Priority: extra
 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)
+Build-Depends: debhelper (>> 4.1.16), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, vdr-dev (>=1.1.25)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-mp3
@@ -13,3 +13,4 @@
 Description: Plugin to vdr for playing mp3's
  This plugin for vdr allows you to play mp3's, ogg-files and 
  audio-cds.
+XB-VDR-Patchlevel: ${patchlevel}