r481 - vdr/vdr-plugin-xine/branches/sarge/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2005-04-19 22:07:56 +0000 (Tue, 19 Apr 2005)
New Revision: 481

Modified:
   vdr/vdr-plugin-xine/branches/sarge/debian/changelog
   vdr/vdr-plugin-xine/branches/sarge/debian/control
   vdr/vdr-plugin-xine/branches/sarge/debian/rules
Log:
vdr-plugin-xine (sarge) - backported from trunk

Modified: vdr/vdr-plugin-xine/branches/sarge/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/sarge/debian/changelog	2005-04-18 22:53:51 UTC (rev 480)
+++ vdr/vdr-plugin-xine/branches/sarge/debian/changelog	2005-04-19 22:07:56 UTC (rev 481)
@@ -1,3 +1,25 @@
+vdr-plugin-xine (0.7.3-0.sarge.1) experimental; urgency=low
+
+  * Thomas Schmidt <tschmidt@debian.org> 
+    - New upstream release
+    - Build-Depend on libxine-dev (>=1.0.1-1vdr7)
+    - Conflict with libxine1 (<< 1.0.1-vdr7)
+  * Tobias Grimm <tg@e-tobi.net>
+    - Backported unreleased 0.7.3-1 to Sarge
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 17 Apr 2005 14:42:02 +0200
+
+vdr-plugin-xine (0.7.2-2) experimental; urgency=low
+
+  * Thomas Schmidt <tschmidt@debian.org>
+    - Depend/Build-Depend on vdr (>=1.3.23-1)
+    - Conflict with vdr (>=1.3.24)
+    - debian/rules: some cleanups
+    - Changed Maintainer to Debian VDR Team
+    - Added Darren Salt and myself to Uploaders
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 10 Apr 2005 12:44:55 +0200
+
 vdr-plugin-xine (0.7.2-1) unstable; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-xine/branches/sarge/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/sarge/debian/control	2005-04-18 22:53:51 UTC (rev 480)
+++ vdr/vdr-plugin-xine/branches/sarge/debian/control	2005-04-19 22:07:56 UTC (rev 481)
@@ -1,14 +1,15 @@
 Source: vdr-plugin-xine
 Section: misc
 Priority: extra
-Maintainer: Darren Salt <linux@youmustbejoking.demon.co.uk>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0-1vdr2), vdr-dev
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Darren Salt <linux@youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt@debian.org>
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0-1vdr7), vdr-dev (>=1.2.6)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-xine
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
-Conflicts: libxine1 (<< 1.0-1vdr2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, vdr-dev (>=1.2.6)
+Conflicts: libxine1 (<< 1.0-1vdr7)
 Recommends: libxine1
 Suggests: y4mscaler, mjpegtools
 Description: allows xine to be a display for vdr, the Video Disk Recorder

Modified: vdr/vdr-plugin-xine/branches/sarge/debian/rules
===================================================================
--- vdr/vdr-plugin-xine/branches/sarge/debian/rules	2005-04-18 22:53:51 UTC (rev 480)
+++ vdr/vdr-plugin-xine/branches/sarge/debian/rules	2005-04-19 22:07:56 UTC (rev 481)
@@ -68,18 +68,6 @@
 	dh_testroot
 	dh_installchangelogs HISTORY
 	dh_installdocs
-#	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-#	dh_installman
 	dh_install
 	dh_link
 	$(DH_STRIP)
@@ -90,15 +78,9 @@
 	  done
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-# Replace next line with the two after. Needs vdr package support first.
-#	echo "vdr:Depends=vdr (>= $(VDRVERSION)$(VDRDEBVERSION)), vdr (<= $(VDRVERSION)-9999)" >>debian/vdr-plugin-xine.substvars
-	[ -r $(VDRDIR)/patchlevel ] || echo 'patchlevel=' >> debian/$(PACKAGE).substvars
-	[ ! -r $(VDRDIR)/patchlevel ] || cat $(VDRDIR)/patchlevel >> debian/$(PACKAGE).substvars
+	/usr/lib/$(VDR)-dev/patchlevel.sh subst
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb