r997 - in vdr/vdr-plugin-xine/branches/network/debian: . patches

Tobias Grimm tiber-guest at costa.debian.org
Tue Aug 16 21:25:06 UTC 2005 

Author: tiber-guest
Date: 2005-08-16 21:25:05 +0000 (Tue, 16 Aug 2005)
New Revision: 997

Removed:
   vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.postinst
Modified:
   vdr/vdr-plugin-xine/branches/network/debian/changelog
   vdr/vdr-plugin-xine/branches/network/debian/control
   vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch
   vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch
Log:
synced with 0.7.5-1

Modified: vdr/vdr-plugin-xine/branches/network/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/changelog	2005-08-16 21:18:35 UTC (rev 996)
+++ vdr/vdr-plugin-xine/branches/network/debian/changelog	2005-08-16 21:25:05 UTC (rev 997)
@@ -1,3 +1,19 @@
+vdr-plugin-xine (0.7.5-1net1) unstable; urgency=low
+
+  * Tobias Grimm <tg at e-tobi.net>
+    - Synced with 0.7.5-1
+    - Updated network patch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 16 Aug 2005 23:07:23 +0200
+
+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)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 16 Aug 2005 23:07:23 +0200
+
 vdr-plugin-xine (0.7.4-6net1) unstable; urgency=low
  
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-xine/branches/network/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/control	2005-08-16 21:18:35 UTC (rev 996)
+++ vdr/vdr-plugin-xine/branches/network/debian/control	2005-08-16 21:25:05 UTC (rev 997)
@@ -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/branches/network/debian/patches/01_debian.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch	2005-08-16 21:18:35 UTC (rev 996)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch	2005-08-16 21:25:05 UTC (rev 997)
@@ -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

Modified: vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch	2005-08-16 21:18:35 UTC (rev 996)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch	2005-08-16 21:25:05 UTC (rev 997)
@@ -7,16 +7,16 @@
 ## DP: xine-0-7-4-network. 
 
 @DPATCH@
-diff -urNad vdr-plugin-xine-0.7.4/xine.c /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xine.c
---- vdr-plugin-xine-0.7.4/xine.c	2005-07-03 15:36:57.000000000 +0200
-+++ /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xine.c	2005-07-03 15:37:18.000000000 +0200
+diff -urNad --exclude=CVS --exclude=.svn ./xine.c /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xine.c
+--- ./xine.c	2005-08-16 23:26:11.000000000 +0200
++++ /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xine.c	2005-08-16 23:27:39.000000000 +0200
 @@ -17,8 +17,8 @@
  
  
  
--static const char *VERSION        = "0.7.4";
+-static const char *VERSION        = "0.7.5";
 -static const char *DESCRIPTION    = "Software based playback using xine";
-+static const char *VERSION        = "0.7.4-net";
++static const char *VERSION        = "0.7.5-net";
 +static const char *DESCRIPTION    = "Software based playback using xine over network";
  //static const char *MAINMENUENTRY  = "xine - Toggle prebuffer setting";
  
@@ -49,10 +49,10 @@
      default:
        return false;
      }
-diff -urNad vdr-plugin-xine-0.7.4/xineLib.c /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xineLib.c
---- vdr-plugin-xine-0.7.4/xineLib.c	2005-07-03 15:37:01.000000000 +0200
-+++ /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xineLib.c	2005-07-03 15:37:01.000000000 +0200
-@@ -1834,6 +1834,10 @@
+diff -urNad --exclude=CVS --exclude=.svn ./xineLib.c /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xineLib.c
+--- ./xineLib.c	2005-08-16 23:26:48.000000000 +0200
++++ /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xineLib.c	2005-08-16 23:26:49.000000000 +0200
+@@ -1855,6 +1855,10 @@
        , m_plugin(plugin)
        , m_settings(settings)
        , m_osdFlushRequired(false)
@@ -63,7 +63,7 @@
        , fd_fifo0(-1)
        , fd_result(-1)
        , fd_control(-1)
-@@ -1918,6 +1922,34 @@
+@@ -1941,6 +1945,34 @@
      m_eventSink = eventSink;
    }
  
@@ -98,7 +98,7 @@
    bool cXineLib::Open()
    {
      ::unlink(m_fifoNameExtControl.c_str());
-@@ -1928,73 +1960,101 @@
+@@ -1951,73 +1983,101 @@
      ::unlink(m_fifoNameStream.c_str());
      ::rmdir(m_fifoDir.c_str());
  
@@ -249,7 +249,7 @@
      if (!Start())
        return false;
  
-@@ -2026,6 +2086,11 @@
+@@ -2049,6 +2109,11 @@
      ::unlink(m_fifoNameRemote.c_str());
      ::unlink(m_fifoNameStream.c_str());
      ::rmdir(m_fifoDir.c_str());
@@ -261,7 +261,7 @@
    }
  
    void cXineLib::internalPaused(const bool paused)
-@@ -2087,7 +2152,13 @@
+@@ -2110,7 +2175,13 @@
        int myErrno = errno;
        
        ::signal(SIGPIPE, sigPipeHandler);
@@ -276,7 +276,7 @@
        if (r <= 0)
        {
          if (EAGAIN == myErrno || EINTR == myErrno)
-@@ -2095,7 +2166,7 @@
+@@ -2118,7 +2189,7 @@
  
          xfprintf(stderr, "read(%d) returned %d, error %d: ", n, r, myErrno);
          errno = myErrno;
@@ -285,7 +285,7 @@
            perror("");
  
          disconnect();
-@@ -2277,27 +2348,74 @@
+@@ -2300,27 +2371,74 @@
  //    fprintf(stderr, "Action done\n");
    }
    
@@ -370,10 +370,10 @@
        
        internalPaused(false);
        
-diff -urNad vdr-plugin-xine-0.7.4/xineLib.h /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xineLib.h
---- vdr-plugin-xine-0.7.4/xineLib.h	2005-07-03 15:36:57.000000000 +0200
-+++ /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xineLib.h	2005-07-03 15:37:01.000000000 +0200
-@@ -132,8 +132,15 @@
+diff -urNad --exclude=CVS --exclude=.svn ./xineLib.h /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xineLib.h
+--- ./xineLib.h	2005-08-16 23:26:11.000000000 +0200
++++ /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xineLib.h	2005-08-16 23:26:49.000000000 +0200
+@@ -136,8 +136,15 @@
        return fd_remote;
      }
      
@@ -390,9 +390,9 @@
      cMutex m_ioMutex, m_dataMutex, m_disconnectMutex;
      cMutex &m_osdMutex;
  
-diff -urNad vdr-plugin-xine-0.7.4/xineSettings.c /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xineSettings.c
---- vdr-plugin-xine-0.7.4/xineSettings.c	2005-07-03 15:36:57.000000000 +0200
-+++ /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xineSettings.c	2005-07-03 15:37:01.000000000 +0200
+diff -urNad --exclude=CVS --exclude=.svn ./xineSettings.c /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xineSettings.c
+--- ./xineSettings.c	2005-08-16 23:26:11.000000000 +0200
++++ /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xineSettings.c	2005-08-16 23:26:49.000000000 +0200
 @@ -57,6 +57,7 @@
    cXineSettings::cXineSettings()
      : m_switchSkin(false)
@@ -416,9 +416,9 @@
 +  }
 +  
  };
-diff -urNad vdr-plugin-xine-0.7.4/xineSettings.h /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xineSettings.h
---- vdr-plugin-xine-0.7.4/xineSettings.h	2005-07-03 15:36:57.000000000 +0200
-+++ /tmp/dpep.y7amrL/vdr-plugin-xine-0.7.4/xineSettings.h	2005-07-03 15:37:01.000000000 +0200
+diff -urNad --exclude=CVS --exclude=.svn ./xineSettings.h /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xineSettings.h
+--- ./xineSettings.h	2005-08-16 23:26:11.000000000 +0200
++++ /tmp/dpep-work.a0MZff/vdr-plugin-xine-0.7.5/xineSettings.h	2005-08-16 23:26:49.000000000 +0200
 @@ -74,6 +74,7 @@
    private:
      bool m_switchSkin;

Deleted: vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.postinst
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.postinst	2005-08-16 21:18:35 UTC (rev 996)
+++ vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.postinst	2005-08-16 21:25:05 UTC (rev 997)
@@ -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

More information about the pkg-vdr-dvb-changes mailing list