r7838 - in /vdr/vdr-plugin-muggle/trunk/debian: TODO changelog control copyright patches/00list patches/01_compile-fixes.dpatch patches/04_makefile.dpatch patches/05_gcc44.dpatch postinst postrm watch

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Tue Jun 2 20:19:32 UTC 2009


Author: tiber-guest
Date: Tue Jun  2 20:19:31 2009
New Revision: 7838

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7838
Log:
* New upstream release
* Added 04_makefile.dpatch
* Added 05_gcc44.dpatch
* Removed 01_compile-fixes.dpatch
* Updated debian/watch and debian/copyright to new upstream location
* Bumped standards version to 3.8.1
* Added ${misc:Depends}
* Depend on python for the muggle_getlyrics script

Added:
    vdr/vdr-plugin-muggle/trunk/debian/patches/04_makefile.dpatch
    vdr/vdr-plugin-muggle/trunk/debian/patches/05_gcc44.dpatch
Removed:
    vdr/vdr-plugin-muggle/trunk/debian/TODO
    vdr/vdr-plugin-muggle/trunk/debian/patches/01_compile-fixes.dpatch
Modified:
    vdr/vdr-plugin-muggle/trunk/debian/changelog
    vdr/vdr-plugin-muggle/trunk/debian/control
    vdr/vdr-plugin-muggle/trunk/debian/copyright
    vdr/vdr-plugin-muggle/trunk/debian/patches/00list
    vdr/vdr-plugin-muggle/trunk/debian/postinst
    vdr/vdr-plugin-muggle/trunk/debian/postrm
    vdr/vdr-plugin-muggle/trunk/debian/watch

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=7838&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog Tue Jun  2 20:19:31 2009
@@ -1,3 +1,19 @@
+vdr-plugin-muggle (0.2.3-1) experimental; urgency=low
+
+  [ Holger Schvestka ]
+  * New upstream release
+  * Added 04_makefile.dpatch
+  * Added 05_gcc44.dpatch
+  * Removed 01_compile-fixes.dpatch
+
+  [ Tobias Grimm ]
+  * Updated debian/watch and debian/copyright to new upstream location
+  * Bumped standards version to 3.8.1
+  * Added ${misc:Depends}
+  * Depend on python for the muggle_getlyrics script
+
+ -- Tobias Grimm <etobi at debian.org>  Tue, 02 Jun 2009 22:06:41 +0200
+
 vdr-plugin-muggle (0.2.1-1) experimental; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-muggle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/control?rev=7838&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/control (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/control Tue Jun  2 20:19:31 2009
@@ -6,13 +6,13 @@
 Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), libtag1-dev,
   libmysqlclient-dev, libmad0-dev, libvorbis-dev, libflac++-dev, libsndfile1-dev,
   libimlib2-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/
 
 Package: vdr-plugin-muggle
 Architecture: any
-Depends: ${shlibs:Depends}, ${vdr:Depends}, mjpegtools (>=1:1.8.0), netpbm
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, mjpegtools (>=1:1.8.0), netpbm, python
 Suggests: mysql-server, mysql-client
 Description: Media juggle plugin for VDR
  This plugin allows the management of arbitrary media files via a database

Modified: vdr/vdr-plugin-muggle/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/copyright?rev=7838&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/copyright Tue Jun  2 20:19:31 2009
@@ -1,4 +1,5 @@
 Upstream Homepage:
+    http://projects.vdr-developer.org/projects/show/plg-muggle
     http://sourceforge.net/projects/vdr-muggle/
 
 Upstream Authors:
@@ -14,11 +15,11 @@
     Holger Schvestka <hotzenplotz5 at gmx.de>
 
 Copyright:
-    (C) 2004 - 2006 Andi Kellner, Lars von Wedel, Ralf Klueber,
+    (C) 2004 - 2009 Andi Kellner, Lars von Wedel, Ralf Klueber,
                     Wolfgang Rohdewald
 
 Copyright (Debian packaging):
-    (C) 2004 - 2008 Holger Schvestka, Tobias Grimm, Thomas Günther,
+    (C) 2004 - 2009 Holger Schvestka, Tobias Grimm, Thomas Günther,
                     Thomas Schmidt
 
 License:

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=7838&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/00list Tue Jun  2 20:19:31 2009
@@ -1,3 +1,4 @@
-01_compile-fixes
 02_bashisms
 03_debian-paths
+04_makefile
+05_gcc44

Added: vdr/vdr-plugin-muggle/trunk/debian/patches/04_makefile.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/patches/04_makefile.dpatch?rev=7838&op=file
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/04_makefile.dpatch (added)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/04_makefile.dpatch Tue Jun  2 20:19:31 2009
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_makefile.dpatch by TomJoad http://www.vdrportal.de/board/thread.php?postid=818964#post818964
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compilation fix (vdr > 1.7.x).
+
+ at DPATCH@
+--- vdr-plugin-muggle-0.2.3~/Makefile	2009-01-15 16:01:23.000000000 +0100
++++ vdr-plugin-muggle-0.2.3/Makefile	2009-06-02 18:20:11.978820000 +0200
+@@ -80,6 +80,9 @@
+ 
+ ### Includes and Defines (add further entries here):
+ 
++FTWNOTWANTED = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++DEFINES := $(filter-out $(FTWNOTWANTED),$(DEFINES))
++
+ INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include \
+ 	$(shell taglib-config --cflags)
+ 

Added: vdr/vdr-plugin-muggle/trunk/debian/patches/05_gcc44.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/patches/05_gcc44.dpatch?rev=7838&op=file
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/05_gcc44.dpatch (added)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/05_gcc44.dpatch Tue Jun  2 20:19:31 2009
@@ -1,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_gcc44.dpatch by felix at fetzig.org http://projects.vdr-developer.org/issues/show/112
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compilation fix gcc-4.4
+
+ at DPATCH@
+diff -ruN muggle-0.2.3.orig/mg_db.c muggle-0.2.3/mg_db.c
+--- muggle-0.2.3.orig/mg_db.c	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3/mg_db.c	2009-03-31 15:18:32.133400460 +0200
+@@ -1140,7 +1140,7 @@
+ 	if (genre1.empty()) {
+ 		genre1 = m_TCON.toCString(the_setup.utf8);
+ 		const char *tcon=genre1.c_str();
+-		char *rparen=strchr(tcon,')');
++		char *rparen=strchr(strdup(tcon),')');
+ 		if (tcon[0]=='(' && rparen) {
+ 			*rparen=0;
+ 			genre1 = m_GenreIds[tcon+1];
+diff -ruN muggle-0.2.3.orig/mg_image_provider.c muggle-0.2.3/mg_image_provider.c
+--- muggle-0.2.3.orig/mg_image_provider.c	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3/mg_image_provider.c	2009-03-31 15:15:09.648153178 +0200
+@@ -39,7 +39,8 @@
+ 		return (FALSE);
+ 	}
+ 	else {
+-		char *ext = rindex( entry->d_name, '.' );
++		char *dname = strdup(entry->d_name);
++		char *ext = rindex( dname, '.' );
+ 
+ 		if( ext ) {
+ 			if( !strcmp( ext, ".jpg" ) || !strcmp( ext, ".png" ) || !strcmp( ext, ".JPG" ) || !strcmp( ext, ".PNG" ) ) {
+diff -ruN muggle-0.2.3.orig/mg_tools.c muggle-0.2.3/mg_tools.c
+--- muggle-0.2.3.orig/mg_tools.c	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3/mg_tools.c	2009-03-31 15:11:59.913150640 +0200
+@@ -170,9 +170,10 @@
+ 
+ char *
+ extension(const char *filename) {
+-	char *dot = strrchr(filename,'.');
++	char *fname = strdup(filename);
++	char *dot = strrchr(fname,'.');
+ 	if (!dot)
+-		dot = strrchr(filename,0)-1;
++		dot = strrchr(fname,0)-1;
+ 	return dot+1;
+ }
+ 
+@@ -209,9 +210,9 @@
+ }
+ 
+ bool mkdir_p(const char *s) {
+-	char *slash=strrchr(s,'/');
+-	if (!slash) return false;
+ 	char *sc = strdup(s);
++	char *slash=strrchr(sc,'/');
++	if (!slash) return false;
+ 	*strrchr(sc,'/')=0;	// cut off the filename
+ 	char *p = sc;
+ 	int mode;
+diff -ruN muggle-0.2.3.orig/mg_tools.h muggle-0.2.3/mg_tools.h
+--- muggle-0.2.3.orig/mg_tools.h	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3/mg_tools.h	2009-03-31 14:57:30.649150865 +0200
+@@ -14,6 +14,7 @@
+ #ifndef _MUGGLE_TOOLS_H
+ #define _MUGGLE_TOOLS_H
+ 
++#include <cstdarg>
+ #include <iostream>
+ #include <sstream>
+ #include <string>

Modified: vdr/vdr-plugin-muggle/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/postinst?rev=7838&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/postinst (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/postinst Tue Jun  2 20:19:31 2009
@@ -3,7 +3,7 @@
 
 # Remove old state file
 if [ "$1" = "configure" ]; then
-    /bin/rm -f /var/lib/vdr/plugins/muggle/muggle.state
+    rm -f /var/lib/vdr/plugins/muggle/muggle.state
     chown -R vdr:vdr /var/cache/vdr-plugin-muggle
     chown -R vdr:vdr /var/lib/vdr/plugins/muggle
 fi

Modified: vdr/vdr-plugin-muggle/trunk/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/postrm?rev=7838&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/postrm (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/postrm Tue Jun  2 20:19:31 2009
@@ -3,8 +3,8 @@
 
 # Remove state file 
 if [ "$1" = "purge" ]; then
-    /bin/rm -f /var/lib/vdr/plugins/muggle/muggle.state*
-    /bin/rm -rf /var/cache/vdr-plugin-muggle/*
+    rm -f /var/lib/vdr/plugins/muggle/muggle.state*
+    rm -rf /var/cache/vdr-plugin-muggle/*
 fi
 
 #DEBHELPER#

Modified: vdr/vdr-plugin-muggle/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/watch?rev=7838&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/watch (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/watch Tue Jun  2 20:19:31 2009
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/vdr-muggle/vdr-muggle-(.*)\.tgz
+http://projects.vdr-developer.org/projects/list_files/plg-muggle .*/vdr-muggle-(.*)\.tgz




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