r994 - in vdr/vdr-plugin-xine/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2005-08-16 21:12:42 +0000 (Tue, 16 Aug 2005)
New Revision: 994

Removed:
   vdr/vdr-plugin-xine/trunk/debian/vdr-plugin-xine.postinst
Modified:
   vdr/vdr-plugin-xine/trunk/debian/changelog
   vdr/vdr-plugin-xine/trunk/debian/control
   vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
Log:
new upstream release

Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog	2005-08-16 20:24:52 UTC (rev 993)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog	2005-08-16 21:12:42 UTC (rev 994)
@@ -1,6 +1,12 @@
+vdr-plugin-xine (0.7.5-1) unstable; urgency=low
+
+  * Synced with Darren Salt's package
+  * Removed dummy postinst
+  * Depend/Build-Depend on libxine (>= 1.0.2-0vdr1)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Tue, 16 Aug 2005 23:07:23 +0200
+
 vdr-plugin-xine (0.7.4-6) unstable; urgency=low
-
-  * NOT RELEASED YET
   
   * Thomas Schmidt <tschmidt at debian.org>
     - Depend/Build-Depend on vdr (>=1.3.29-1)

Modified: vdr/vdr-plugin-xine/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/control	2005-08-16 20:24:52 UTC (rev 993)
+++ vdr/vdr-plugin-xine/trunk/debian/control	2005-08-16 21:12:42 UTC (rev 994)
@@ -3,13 +3,13 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Darren Salt <linux at youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.1-1vdr2), vdr-dev (>=1.3.29-1)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.2-0vdr1), vdr-dev (>=1.3.29-1)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-xine
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (>=1.3.29-1)
-Conflicts: libxine1 (<< 1.0.1-1vdr2), vdr (>=1.3.29.99)
+Conflicts: libxine1 (<< 1.0.2-0vdr1), vdr (>=1.3.29.99)
 Recommends: libxine1
 Suggests: y4mscaler, mjpegtools
 Description: allows xine to be a display for vdr, the Video Disk Recorder

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch	2005-08-16 20:24:52 UTC (rev 993)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch	2005-08-16 21:12:42 UTC (rev 994)
@@ -9,7 +9,8 @@
 diff -urNad vdr-plugin-xine-0.7.0/Make.config /tmp/dpep.bQLd5z/vdr-plugin-xine-0.7.0/Make.config
 --- vdr-plugin-xine-0.7.0/Make.config	2005-01-30 00:24:29.000000000 +0000
 +++ /tmp/dpep.bQLd5z/vdr-plugin-xine-0.7.0/Make.config	2005-01-30 00:24:30.000000000 +0000
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,6 @@
++INCLUDES+=-I/usr/include/freetype2
 +DVBDIR=.
 +VDRDIR=/usr/include/vdr
 +LIBDIR=$(DESTDIR)/usr/lib/vdr/plugins

Deleted: vdr/vdr-plugin-xine/trunk/debian/vdr-plugin-xine.postinst
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/vdr-plugin-xine.postinst	2005-08-16 20:24:52 UTC (rev 993)
+++ vdr/vdr-plugin-xine/trunk/debian/vdr-plugin-xine.postinst	2005-08-16 21:12:42 UTC (rev 994)
@@ -1,41 +0,0 @@
-#! /bin/sh
-# postinst script for vdr
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-    configure)
-	;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0