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

Tobias Grimm tiber-guest at costa.debian.org
Sat Apr 29 19:43:53 UTC 2006 

Author: tiber-guest
Date: 2006-04-29 19:43:52 +0000 (Sat, 29 Apr 2006)
New Revision: 2610

Removed:
   vdr/vdr-plugin-muggle/trunk/debian/patches/01_vdr-1.3.38-fix.dpatch
   vdr/vdr-plugin-muggle/trunk/debian/patches/02_mjpegtools-1.6.2.dpatch
   vdr/vdr-plugin-muggle/trunk/debian/patches/90_APIVERSION.dpatch
Modified:
   vdr/vdr-plugin-muggle/trunk/debian/changelog
   vdr/vdr-plugin-muggle/trunk/debian/patches/00list
   vdr/vdr-plugin-muggle/trunk/debian/patches/03_image_convert.sh-path.dpatch
Log:
muggle: new release

Modified: vdr/vdr-plugin-muggle/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog	2006-04-29 19:35:50 UTC (rev 2609)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog	2006-04-29 19:43:52 UTC (rev 2610)
@@ -1,3 +1,14 @@
+vdr-plugin-muggle (0.1.10-1) unstable; urgency=low
+
+  * New upstream release
+  * Tobias Grimm <tg at e-tobi.net>
+    - Removed 90_APIVERSION.dpatch (fixed upstream)
+    - Removed 01_vdr-1.3.38-fix.dpatch (fixed upstream)
+    - Removed 02_mjpegtools-1.6.2.dpatch (fixed upstream)
+    - Updated 03_image_convert.sh-path.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 29 Apr 2006 21:43:02 +0200
+
 vdr-plugin-muggle (0.1.9-9) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-muggle/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/00list	2006-04-29 19:35:50 UTC (rev 2609)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/00list	2006-04-29 19:43:52 UTC (rev 2610)
@@ -1,5 +1 @@
-01_vdr-1.3.38-fix
-02_mjpegtools-1.6.2
 03_image_convert.sh-path
-
-90_APIVERSION.dpatch

Deleted: 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-04-29 19:35:50 UTC (rev 2609)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/01_vdr-1.3.38-fix.dpatch	2006-04-29 19:43:52 UTC (rev 2610)
@@ -1,38 +0,0 @@
-#! /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
-         {

Deleted: vdr/vdr-plugin-muggle/trunk/debian/patches/02_mjpegtools-1.6.2.dpatch
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/02_mjpegtools-1.6.2.dpatch	2006-04-29 19:35:50 UTC (rev 2609)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/02_mjpegtools-1.6.2.dpatch	2006-04-29 19:43:52 UTC (rev 2610)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_mjpegtools-1.6.2.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makes image conversion compatible with mjpegtools > 1.6.2
-
- at DPATCH@
-diff -urNad vdr-plugin-muggle-0.1.9~/scripts/image_convert.sh vdr-plugin-muggle-0.1.9/scripts/image_convert.sh
---- vdr-plugin-muggle-0.1.9~/scripts/image_convert.sh	2005-10-11 21:28:10.000000000 +0200
-+++ vdr-plugin-muggle-0.1.9/scripts/image_convert.sh	2006-04-13 17:43:25.000000000 +0200
-@@ -65,13 +65,13 @@
-   pnmscale $S $TMP | \
-     pnmpad -black -width 704 -height 480 | \
-     ppmntsc | \
--    ppmtoy4m -v 0 -n 1 -r -F 30000:1001 | \
-+    ppmtoy4m -v 0 -n 1 -r -F 30000:1001 -S 420mpeg2 | \
-     mpeg2enc -f 7 -T 90 -F 4 -nn -a 2 -v 0 -o "$MPG"
- else
-   pnmscale $S $TMP | \
-     pnmpad -black -width 704 -height 576 | \
-     ppmntsc --pal | \
--    ppmtoy4m -v 0 -n 1 -r -F 25:1 | \
-+    ppmtoy4m -v 0 -n 1 -r -F 25:1 -S 420mpeg2 | \
-     mpeg2enc -f 7 -T 90 -F 3 -np -a 2 -v 0 -o "$MPG"
- fi
- #

Modified: vdr/vdr-plugin-muggle/trunk/debian/patches/03_image_convert.sh-path.dpatch
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/03_image_convert.sh-path.dpatch	2006-04-29 19:35:50 UTC (rev 2609)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/03_image_convert.sh-path.dpatch	2006-04-29 19:43:52 UTC (rev 2610)
@@ -6,13 +6,14 @@
 ## DP: Set path of image_convert.sh script.
 
 @DPATCH@
---- muggle-0.1.9/mg_image_provider.c
-+++ muggle-0.1.9/mg_image_provider.c
-@@ -217,7 +217,7 @@
- 	  // cout << "Converting " << filename << " to " << tmpFile << endl << flush;
+diff -urNad vdr-plugin-muggle-0.1.10~/mg_image_provider.c vdr-plugin-muggle-0.1.10/mg_image_provider.c
+--- vdr-plugin-muggle-0.1.10~/mg_image_provider.c	2006-04-28 20:23:16.000000000 +0200
++++ vdr-plugin-muggle-0.1.10/mg_image_provider.c	2006-04-29 21:41:12.000000000 +0200
+@@ -342,7 +342,7 @@
  
+ 
  	  char *tmp;
--	  asprintf( &tmp, "image_convert.sh \"%s\" \"%s\"", filename.c_str(), tmpFile.c_str() );
+-	  asprintf( &tmp, "/usr/local/bin/image_convert.sh \"%s\" \"%s\"", filename.c_str(), tmpFile.c_str() );
 +	  asprintf( &tmp, "/usr/lib/vdr-plugin-muggle/image_convert.sh \"%s\" \"%s\"", filename.c_str(), tmpFile.c_str() );
  	  system( (const char*) tmp );
  	  free(tmp);

Deleted: vdr/vdr-plugin-muggle/trunk/debian/patches/90_APIVERSION.dpatch
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/90_APIVERSION.dpatch	2006-04-29 19:35:50 UTC (rev 2609)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/90_APIVERSION.dpatch	2006-04-29 19:43:52 UTC (rev 2610)
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for the APIVERSION define as introduced in VDR-1.3.47.
-
-case "$1" in
-    -patch)
-        sed -i -e s/VDRVERSION/APIVERSION/g Makefile
-        ;;
-    -unpatch)
-        sed -i -e s/APIVERSION/VDRVERSION/g Makefile
-        ;;
-     *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-        ;;
-esac
-
-exit 0

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