r1724 - in vdr/vdr-plugin-muggle/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-01-12 16:58:02 +0000 (Thu, 12 Jan 2006)
New Revision: 1724

Added:
   vdr/vdr-plugin-muggle/trunk/debian/patches/01_vdr-1.3.38-fix.dpatch
Modified:
   vdr/vdr-plugin-muggle/trunk/debian/changelog
   vdr/vdr-plugin-muggle/trunk/debian/control
   vdr/vdr-plugin-muggle/trunk/debian/patches/00list
Log:
vdr-plugin-vdr-plugin-muggle: Updated for vdr 1.3.38

Modified: vdr/vdr-plugin-muggle/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog	2006-01-12 16:47:26 UTC (rev 1723)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog	2006-01-12 16:58:02 UTC (rev 1724)
@@ -1,3 +1,13 @@
+vdr-plugin-muggle (0.1.9-3) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - Build-Depend on vdr (>=1.3.38-1)
+    - Added 01_vdr-1.3.38-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu, 12 Jan 2006 16:54:24 +0100
+
 vdr-plugin-muggle (0.1.9-2) unstable; urgency=low
  
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-muggle/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/control	2006-01-12 16:47:26 UTC (rev 1723)
+++ vdr/vdr-plugin-muggle/trunk/debian/control	2006-01-12 16:58:02 UTC (rev 1724)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders:  Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.3.37-1), dpatch (>= 2.0.9), libtag1-dev, libmysqlclient-dev, libmad0-dev, libvorbis-dev, libflac++-dev, libsndfile1-dev
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.3.38-1), dpatch (>= 2.0.9), libtag1-dev, libmysqlclient-dev, libmad0-dev, libvorbis-dev, libflac++-dev, libsndfile1-dev
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-muggle

Modified: vdr/vdr-plugin-muggle/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/00list	2006-01-12 16:47:26 UTC (rev 1723)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/00list	2006-01-12 16:58:02 UTC (rev 1724)
@@ -1 +1,2 @@
+01_vdr-1.3.38-fix
 03_image_convert.sh-path

Added: vdr/vdr-plugin-muggle/trunk/debian/patches/01_vdr-1.3.38-fix.dpatch
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/01_vdr-1.3.38-fix.dpatch	2006-01-12 16:47:26 UTC (rev 1723)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/01_vdr-1.3.38-fix.dpatch	2006-01-12 16:58:02 UTC (rev 1724)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_vdr-1.3.38-fix.dpatch by Hulk at vdr-portal.de
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes compilation with vdr 1.3.38
+
+ at DPATCH@
+diff -urNad vdr-plugin-muggle-0.1.9/vdr_player.c /tmp/dpep.fjjNpO/vdr-plugin-muggle-0.1.9/vdr_player.c
+--- vdr-plugin-muggle-0.1.9/vdr_player.c	2005-10-11 21:28:11.000000000 +0200
++++ /tmp/dpep.fjjNpO/vdr-plugin-muggle-0.1.9/vdr_player.c	2006-01-12 17:51:16.047958750 +0100
+@@ -1174,7 +1174,7 @@
+ {
+ //      Stop();
+ // Notify cleanup all cStatusMonitor
+-    cStatus::MsgReplaying (this, NULL);
++    cStatus::MsgReplaying (this, "MUGGLE", NULL, false);
+     if (m_szLastShowStatusMsg)
+     {
+         free (m_szLastShowStatusMsg);
+@@ -1201,7 +1201,7 @@
+ void
+ mgPlayerControl::Stop (void)
+ {
+-  cStatus::MsgReplaying( this, NULL );
++  cStatus::MsgReplaying( this, "MUGGLE", NULL, false );
+     if (player)
+     {
+         delete player;
+@@ -1852,7 +1852,7 @@
+                 free (m_szLastShowStatusMsg);
+             }
+             m_szLastShowStatusMsg = szBuf;
+-            cStatus::MsgReplaying (this, m_szLastShowStatusMsg);
++            cStatus::MsgReplaying (this, "MUGGLE", m_szLastShowStatusMsg, true);
+         }
+         else
+         {


Property changes on: vdr/vdr-plugin-muggle/trunk/debian/patches/01_vdr-1.3.38-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *