r1242 - in vdr/vdr-plugin-xine/branches/network/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Wed Sep 14 21:51:50 UTC 2005
Author: tiber-guest
Date: 2005-09-14 21:51:44 +0000 (Wed, 14 Sep 2005)
New Revision: 1242
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/03_network.dpatch
Log:
- Synced with 0.7.6-1
- Adapted network patch
Modified: vdr/vdr-plugin-xine/branches/network/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/changelog 2005-09-13 18:09:11 UTC (rev 1241)
+++ vdr/vdr-plugin-xine/branches/network/debian/changelog 2005-09-14 21:51:44 UTC (rev 1242)
@@ -1,3 +1,19 @@
+vdr-plugin-xine (0.7.6-1net1) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Synced with 0.7.6-1
+ - Adapted network patch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sat, 3 Sep 2005 00:55:45 +0200
+
+vdr-plugin-xine (0.7.6-1) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - New upstream release
+ - Build-Depend on vdr (>=1.3.32-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 11 Sep 2005 22:20:37 +0200
+
vdr-plugin-xine (0.7.5-2net1) unstable; urgency=low
* Tobias Grimm <tg at e-tobi.net>
Modified: vdr/vdr-plugin-xine/branches/network/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/control 2005-09-13 18:09:11 UTC (rev 1241)
+++ vdr/vdr-plugin-xine/branches/network/debian/control 2005-09-14 21:51:44 UTC (rev 1242)
@@ -3,7 +3,7 @@
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.2-0vdr1), vdr-dev (>=1.3.31-1)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.2-0vdr1), vdr-dev (>=1.3.32-1)
Standards-Version: 3.6.2
Package: vdr-plugin-xine
Modified: vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch 2005-09-13 18:09:11 UTC (rev 1241)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/03_network.dpatch 2005-09-14 21:51:44 UTC (rev 1242)
@@ -7,16 +7,16 @@
## DP: xine-0-7-4-network.
@DPATCH@
-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
+diff -urNad --exclude=CVS --exclude=.svn ./xine.c /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xine.c
+--- ./xine.c 2005-08-24 00:01:55.000000000 +0200
++++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xine.c 2005-09-14 23:59:01.000000000 +0200
@@ -17,8 +17,8 @@
--static const char *VERSION = "0.7.5";
+-static const char *VERSION = "0.7.6";
-static const char *DESCRIPTION = "Software based playback using xine";
-+static const char *VERSION = "0.7.5-net";
++static const char *VERSION = "0.7.6-net";
+static const char *DESCRIPTION = "Software based playback using xine over network";
//static const char *MAINMENUENTRY = "xine - Toggle prebuffer setting";
@@ -49,9 +49,9 @@
default:
return false;
}
-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
+diff -urNad --exclude=CVS --exclude=.svn ./xineLib.c /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineLib.c
+--- ./xineLib.c 2005-09-14 23:58:06.000000000 +0200
++++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineLib.c 2005-09-14 23:58:06.000000000 +0200
@@ -1855,6 +1855,10 @@
, m_plugin(plugin)
, m_settings(settings)
@@ -370,9 +370,9 @@
internalPaused(false);
-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
+diff -urNad --exclude=CVS --exclude=.svn ./xineLib.h /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineLib.h
+--- ./xineLib.h 2005-08-14 12:55:10.000000000 +0200
++++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineLib.h 2005-09-14 23:58:06.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 --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
+diff -urNad --exclude=CVS --exclude=.svn ./xineSettings.c /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineSettings.c
+--- ./xineSettings.c 2005-03-28 20:33:02.000000000 +0200
++++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineSettings.c 2005-09-14 23:58:06.000000000 +0200
@@ -57,6 +57,7 @@
cXineSettings::cXineSettings()
: m_switchSkin(false)
@@ -416,9 +416,9 @@
+ }
+
};
-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
+diff -urNad --exclude=CVS --exclude=.svn ./xineSettings.h /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineSettings.h
+--- ./xineSettings.h 2005-03-28 20:25:27.000000000 +0200
++++ /tmp/dpep-work.PQfF3b/vdr-plugin-xine-0.7.6/xineSettings.h 2005-09-14 23:58:06.000000000 +0200
@@ -74,6 +74,7 @@
private:
bool m_switchSkin;
More information about the pkg-vdr-dvb-changes
mailing list