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

[Thomas Schmidt]

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

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

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-dvd/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:13:23 -0000	1.1.1.1
+++ changelog	2 Jul 2004 17:01:28 -0000	1.2
@@ -1,14 +1,13 @@
 vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-3) unstable; urgency=low
 
-  * Changed architecture in debian/control to any
-
- -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Mon, 19 Apr 2004 00:55:33 +0200
-
-vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-2) unstable; urgency=low
-
-  * First upload to official Debian-archive (closes: Bug#229221)
+  * Thomas Schmidt:
+    - Changed architecture to any
+    - Changed maintainer to Debian VDR and DVB Packaging Team 
+      <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+    - Cleanup debian/rules
+    - First upload to official Debian-archive (closes: Bug#229221)
 
- -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri,  5 Mar 2004 23:18:02 +0100
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri, 02 Jul 2004 18:57:33 +0200
 
 vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-1) unstable; urgency=low
 

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

--- control.template DELETED ---

Index: control
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-dvd/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:13:23 -0000	1.1.1.1
+++ control	2 Jul 2004 17:01:28 -0000	1.2
@@ -1,13 +1,15 @@
 Source: vdr-plugin-dvd
 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), liba52-0.7.4-dev, vdr-dev (>=1.2.6), libdvdnav-dev (>=0.1.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-dvd
 Architecture: i386
 Depends: ${shlibs:Depends}, vdr (>=1.2.6)
+Conflicts: vdr (>=1.2.7)
 Suggests: libdvdcss2
 Description: Plugin to vdr for playing DVD's
  This plugin(s) for vdr allows you to play your DVD's from

Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-dvd/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:13:23 -0000	1.1.1.1
+++ rules	2 Jul 2004 17:01:28 -0000	1.2
@@ -8,8 +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)))
@@ -23,9 +21,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
 
 
@@ -34,27 +29,15 @@
 build-stamp: configure-stamp 
 	dh_testdir
 	
-	#cd $(CURDIR)/libdvdnav-cvs-as/ && /bin/sh ./configure --prefix=$(CURDIR)/libdvdnav \
-	#--enable-static && $(MAKE) install
-	
 	$(MAKE) NEWSTRUCT=1 VDRDIR=/usr/include/vdr VDRINC=/usr/include/vdr \
 	LIBDIR=. NAVDIR=/usr/include/dvdnav all
 
-	#cd $(CURDIR)/libdvdnav-cvs-as/ && make clean
-
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 
-	#cd $(CURDIR)/libdvdnav-cvs-as/ && make clean
-
-	#rm -rf $(CURDIR)/libdvdnav-cvs-as/config.log
-	#rm -rf $(CURDIR)/libdvdnav-cvs-as/config.status
-
-	#rm -rf $(CURDIR)/libdvdnav/
-
 	rm -f build-stamp configure-stamp
 	rm -f libvdr-*.so*
 	make clean
@@ -67,7 +50,7 @@
 	dh_clean -k
 	dh_installdirs
 
-	cp libvdr-dvd*.so.* $(CURDIR)/debian/vdr-plugin-dvd$(PLUGINDIR)/
+	dh_install
 
 # Build architecture-independent files here.
 binary-indep: build install