r7476 - in /vdr/vdr-plugin-muggle/trunk/debian: changelog install patches/00list patches/01_compile-fixes.dpatch patches/03_debian-paths.dpatch patches/03_image_convert.sh-path.dpatch rules
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Sat Nov 15 20:19:50 UTC 2008
Author: tiber-guest
Date: Sat Nov 15 20:19:50 2008
New Revision: 7476
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7476
Log:
* New upstream release
* Added 01_compile-fixes.dpatch
* Removed 01_flac++-6.dpatch (fixed upstream)
* Replaced 03_image_convert.sh-path.dpatch with 03_debian-paths.dpatch
* Removed 04_kernel-headers-workaround.dpatch (fixed upstream)
* Removed 90_muggle-0.1.11_include-getopt.dpatch (fixed upstream)
* Removed 91_gcc43.dpatch
Added:
vdr/vdr-plugin-muggle/trunk/debian/patches/01_compile-fixes.dpatch
vdr/vdr-plugin-muggle/trunk/debian/patches/03_debian-paths.dpatch
Removed:
vdr/vdr-plugin-muggle/trunk/debian/patches/03_image_convert.sh-path.dpatch
Modified:
vdr/vdr-plugin-muggle/trunk/debian/changelog
vdr/vdr-plugin-muggle/trunk/debian/install
vdr/vdr-plugin-muggle/trunk/debian/patches/00list
vdr/vdr-plugin-muggle/trunk/debian/rules
Modified: vdr/vdr-plugin-muggle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/changelog?rev=7476&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog Sat Nov 15 20:19:50 2008
@@ -1,8 +1,15 @@
-vdr-plugin-muggle (0.1.11-23) UNRELEASED; urgency=low
-
+vdr-plugin-muggle (0.2.1-1) UNRELEASED; urgency=low
+
+ * New upstream release
* Changed my maintainer/uploader email address
* Fixed debian/watch
* Updated upstream homepage
+ * Added 01_compile-fixes.dpatch
+ * Removed 01_flac++-6.dpatch (fixed upstream)
+ * Replaced 03_image_convert.sh-path.dpatch with 03_debian-paths.dpatch
+ * Removed 04_kernel-headers-workaround.dpatch (fixed upstream)
+ * Removed 90_muggle-0.1.11_include-getopt.dpatch (fixed upstream)
+ * Removed 91_gcc43.dpatch
-- Tobias Grimm <etobi at debian.org> Fri, 14 Nov 2008 23:04:23 +0100
Modified: vdr/vdr-plugin-muggle/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/install?rev=7476&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/install (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/install Sat Nov 15 20:19:50 2008
@@ -1,4 +1,6 @@
libvdr-muggle.so.* usr/lib/vdr/plugins/
debian/plugin.muggle.conf etc/vdr/plugins/
-scripts/image_convert.sh usr/lib/vdr-plugin-muggle/
+scripts/muggle-image-convert usr/lib/vdr-plugin-muggle/scripts/
+scripts/muggle_getlyrics usr/lib/vdr-plugin-muggle/scripts/
mugglei usr/lib/vdr-plugin-muggle/
+debian/tmp/usr/share/locale
Modified: vdr/vdr-plugin-muggle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/patches/00list?rev=7476&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/00list Sat Nov 15 20:19:50 2008
@@ -1,5 +1,2 @@
-01_flac++-6
-03_image_convert.sh-path
-04_kernel-headers-workaround.dpatch
-90_muggle-0.1.11_include-getopt
-91_gcc43
+01_compile-fixes
+03_debian-paths
Added: vdr/vdr-plugin-muggle/trunk/debian/patches/01_compile-fixes.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/patches/01_compile-fixes.dpatch?rev=7476&op=file
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/01_compile-fixes.dpatch (added)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/01_compile-fixes.dpatch Sat Nov 15 20:19:50 2008
@@ -1,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_compile-fixes.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compilation fixes (most of them gcc 4.3 related).
+
+ at DPATCH@
+diff -urNad vdr-plugin-muggle-0.2.1~/imagecache.h vdr-plugin-muggle-0.2.1/imagecache.h
+--- vdr-plugin-muggle-0.2.1~/imagecache.h 2008-04-18 15:10:49.000000000 +0200
++++ vdr-plugin-muggle-0.2.1/imagecache.h 2008-11-15 20:43:55.000000000 +0100
+@@ -8,6 +8,7 @@
+ #include <map>
+ #include <vector>
+ #include <string>
++#include <cstdlib>
+
+ template<class key_type, class data_type>
+ class cxCache {
+diff -urNad vdr-plugin-muggle-0.2.1~/mg_db_gd_mysql.c vdr-plugin-muggle-0.2.1/mg_db_gd_mysql.c
+--- vdr-plugin-muggle-0.2.1~/mg_db_gd_mysql.c 2008-04-18 15:10:49.000000000 +0200
++++ vdr-plugin-muggle-0.2.1/mg_db_gd_mysql.c 2008-11-15 20:44:10.000000000 +0100
+@@ -15,6 +15,7 @@
+ #include <sys/time.h>
+ #include <time.h>
+ #include <assert.h>
++#include <string.h>
+
+ #include "mg_setup.h"
+ #include "mg_item_gd.h"
+diff -urNad vdr-plugin-muggle-0.2.1~/mg_selection.c vdr-plugin-muggle-0.2.1/mg_selection.c
+--- vdr-plugin-muggle-0.2.1~/mg_selection.c 2008-04-18 15:10:49.000000000 +0200
++++ vdr-plugin-muggle-0.2.1/mg_selection.c 2008-11-15 20:43:55.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <cstring>
++#include <libintl.h>
+
+ #include "mg_selection.h"
+ #include "mg_setup.h"
Added: vdr/vdr-plugin-muggle/trunk/debian/patches/03_debian-paths.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/patches/03_debian-paths.dpatch?rev=7476&op=file
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/03_debian-paths.dpatch (added)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/03_debian-paths.dpatch Sat Nov 15 20:19:50 2008
@@ -1,0 +1,32 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 03_debian-paths.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Set path of image_convert.sh script.
+
+ at DPATCH@
+diff -urNad vdr-plugin-muggle-0.2.1~/lyrics.c vdr-plugin-muggle-0.2.1/lyrics.c
+--- vdr-plugin-muggle-0.2.1~/lyrics.c 2008-04-18 15:10:49.000000000 +0200
++++ vdr-plugin-muggle-0.2.1/lyrics.c 2008-11-15 21:00:23.000000000 +0100
+@@ -33,7 +33,7 @@
+ mgLyrics::LoadExternal() {
+ mgLog("LoadExternal");
+ osd()->Message1(tr("Loading lyrics from internet..."));
+- string script=the_setup.ConfigDirectory + "/scripts/muggle_getlyrics";
++ string script="/usr/share/vdr-plugin-muggle/scripts/muggle_getlyrics";
+ if (RunCommand(script)==0) {
+ state=lyricsLoading;
+ playItem->setCheckedForTmpLyrics(time(0));
+diff -urNad vdr-plugin-muggle-0.2.1~/mg_image_provider.c vdr-plugin-muggle-0.2.1/mg_image_provider.c
+--- vdr-plugin-muggle-0.2.1~/mg_image_provider.c 2008-04-18 15:10:49.000000000 +0200
++++ vdr-plugin-muggle-0.2.1/mg_image_provider.c 2008-11-15 20:57:23.000000000 +0100
+@@ -356,7 +356,7 @@
+ usleep(1000*1000);
+ string cachedFile = getCachedMPGFile(cnvItem,images[i]);
+ char *cmd;
+- msprintf( &cmd, "%s/scripts/muggle-image-convert \"%s\" \"%s\" %d %d %d %d &",
++ msprintf( &cmd, "/usr/share/vdr-plugin-muggle/scripts/muggle-image-convert \"%s\" \"%s\" %d %d %d %d &",
+ the_setup.ConfigDirectory.c_str(),
+ images[i].c_str(), cachedFile.c_str(),
+ coverarea.x1,coverarea.y1,coverarea.Width(),coverarea.Height() );
Modified: vdr/vdr-plugin-muggle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/rules?rev=7476&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/rules (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/rules Sat Nov 15 20:19:50 2008
@@ -5,10 +5,15 @@
DEB_INSTALL_CHANGELOGS_ALL = HISTORY
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
+MAKE_OPTIONS = DVBDIR=/usr \
+ VDRDIR=/usr/include/vdr \
+ LIBDIR=. \
LOCALEDIR=debian/tmp/usr/share/locale \
- HAVE_VORBISFILE=1 HAVE_FLAC=1 HAVE_SNDFILE=1 \
- HAVE_MYSQL=1 HAVE_ONLY_SERVER=1
+ HAVE_VORBISFILE=1 \
+ HAVE_FLAC=1 \
+ HAVE_SNDFILE=1 \
+ HAVE_MYSQL=1 \
+ HAVE_ONLY_SERVER=1
common-build-arch::
# Fix changed timestamps from cvs update to prevent running of gentables
More information about the pkg-vdr-dvb-changes
mailing list