r7478 - in /vdr/vdr-plugin-muggle/trunk/debian: ./ patches/
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Sat Nov 22 17:13:47 UTC 2008
Author: tiber-guest
Date: Sat Nov 22 17:13:47 2008
New Revision: 7478
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7478
Log:
Install shell scripts to /usr/share/vdr-plugin-muggle instead of
/usr/lib...
Added:
vdr/vdr-plugin-muggle/trunk/debian/dirs
vdr/vdr-plugin-muggle/trunk/debian/links
Removed:
vdr/vdr-plugin-muggle/trunk/debian/patches/01_flac++-6.dpatch
vdr/vdr-plugin-muggle/trunk/debian/patches/04_kernel-headers-workaround.dpatch
vdr/vdr-plugin-muggle/trunk/debian/patches/90_muggle-0.1.11_include-getopt.dpatch
vdr/vdr-plugin-muggle/trunk/debian/patches/91_gcc43.dpatch
Modified:
vdr/vdr-plugin-muggle/trunk/debian/changelog
vdr/vdr-plugin-muggle/trunk/debian/control
vdr/vdr-plugin-muggle/trunk/debian/install
vdr/vdr-plugin-muggle/trunk/debian/patches/03_debian-paths.dpatch
vdr/vdr-plugin-muggle/trunk/debian/postinst
vdr/vdr-plugin-muggle/trunk/debian/postrm
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=7478&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog Sat Nov 22 17:13:47 2008
@@ -1,4 +1,4 @@
-vdr-plugin-muggle (0.2.1-1) UNRELEASED; urgency=low
+vdr-plugin-muggle (0.2.1-1) experimental; urgency=low
* New upstream release
* Changed my maintainer/uploader email address
@@ -10,8 +10,10 @@
* 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
+ * Install shell scripts to /usr/share/vdr-plugin-muggle instead of
+ /usr/lib...
+
+ -- Tobias Grimm <etobi at debian.org> Sat, 22 Nov 2008 18:11:48 +0100
vdr-plugin-muggle (0.1.11-22) experimental; urgency=low
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=7478&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/control (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/control Sat Nov 22 17:13:47 2008
@@ -3,7 +3,9 @@
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 <etobi at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), libtag1-dev, libmysqlclient-dev, libmad0-dev, libvorbis-dev, libflac++-dev, libsndfile1-dev
+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
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/
Added: vdr/vdr-plugin-muggle/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/dirs?rev=7478&op=file
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/dirs (added)
+++ vdr/vdr-plugin-muggle/trunk/debian/dirs Sat Nov 22 17:13:47 2008
@@ -1,0 +1,1 @@
+var/cache/vdr-plugin-muggle
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=7478&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/install (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/install Sat Nov 22 17:13:47 2008
@@ -1,6 +1,6 @@
libvdr-muggle.so.* usr/lib/vdr/plugins/
debian/plugin.muggle.conf etc/vdr/plugins/
-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/
+scripts/muggle-image-convert usr/share/vdr-plugin-muggle/scripts/
+scripts/muggle_getlyrics usr/share/vdr-plugin-muggle/scripts/
+mugglei usr/share/vdr-plugin-muggle/
debian/tmp/usr/share/locale
Added: vdr/vdr-plugin-muggle/trunk/debian/links
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-muggle/trunk/debian/links?rev=7478&op=file
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/links (added)
+++ vdr/vdr-plugin-muggle/trunk/debian/links Sat Nov 22 17:13:47 2008
@@ -1,0 +1,1 @@
+usr/share/vdr-plugin-muggle/scripts var/lib/vdr/plugins/muggle/scripts
Modified: 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=7478&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/patches/03_debian-paths.dpatch (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/patches/03_debian-paths.dpatch Sat Nov 22 17:13:47 2008
@@ -6,27 +6,55 @@
## DP: Set path of image_convert.sh script.
@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() );
+diff -urNad vdr-plugin-muggle-0.2.1~/mg_setup.c vdr-plugin-muggle-0.2.1/mg_setup.c
+--- vdr-plugin-muggle-0.2.1~/mg_setup.c 2008-04-18 15:10:49.000000000 +0200
++++ vdr-plugin-muggle-0.2.1/mg_setup.c 2008-11-22 14:17:29.000000000 +0100
+@@ -64,7 +64,7 @@
+ Jumptime = 30;
+
+ // stuff related to cover image display
+- msprintf(&CacheDir,"%s/.muggle/cache",getenv("HOME"));
++ msprintf(&CacheDir,"/var/cache/vdr-plugin-muggle");
+ UseDeviceStillPicture = 1;
+ ImageShowDuration = 10;
+ }
+diff -urNad vdr-plugin-muggle-0.2.1~/muggle.c vdr-plugin-muggle-0.2.1/muggle.c
+--- vdr-plugin-muggle-0.2.1~/muggle.c 2008-04-18 15:10:49.000000000 +0200
++++ vdr-plugin-muggle-0.2.1/muggle.c 2008-11-22 14:17:29.000000000 +0100
+@@ -108,13 +108,7 @@
+ the_setup.DeleteStaleReferences = atoi (Value);
+ else if (!strcasecmp (Name, "ImageShowDuration"))
+ the_setup.ImageShowDuration = atoi (Value);
+- else if (!strcasecmp (Name, "ImageCacheDir")) { // old version
+- free(the_setup.CacheDir);
+- the_setup.CacheDir=strdup(Value);
+- } else if (!strcasecmp (Name, "CacheDir")) {
+- free(the_setup.CacheDir);
+- the_setup.CacheDir=strdup(Value);
+- } else if (!strcasecmp (Name, "UseStillPicture"))
++ else if (!strcasecmp (Name, "UseStillPicture"))
+ the_setup.UseDeviceStillPicture = atoi (Value);
+ else if (!strcasecmp(Name, "Jumptime"))
+ the_setup.Jumptime = atoi(Value);
+diff -urNad vdr-plugin-muggle-0.2.1~/vdr_setup.c vdr-plugin-muggle-0.2.1/vdr_setup.c
+--- vdr-plugin-muggle-0.2.1~/vdr_setup.c 2008-04-18 15:10:49.000000000 +0200
++++ vdr-plugin-muggle-0.2.1/vdr_setup.c 2008-11-22 14:19:00.000000000 +0100
+@@ -68,10 +68,6 @@
+ Add (new
+ cMenuEditIntItem (tr ("Image show duration (secs)"),
+ &the_setup.ImageShowDuration, 1, 100));
+- the_setup.CacheDir=(char*)realloc(the_setup.CacheDir,MAX_PATH+1);
+- Add (new
+- cMenuEditStrItem (tr ("Cache directory"),
+- the_setup.CacheDir, MAX_PATH, chars_allowed ) );
+ Add (new
+ cMenuEditBoolItem (tr ("Use DVB still picture"), &the_setup.UseDeviceStillPicture,
+ tr("no"), tr("yes") ) );
+@@ -109,7 +105,6 @@
+ SetupStore ("DeleteStaleReferences", the_setup.DeleteStaleReferences);
+ SetupStore ("ImageShowDuration", the_setup.ImageShowDuration);
+ SetupStore ("ImgAlpha", the_setup.ImgAlpha);
+- SetupStore ("CacheDir", the_setup.CacheDir);
+ SetupStore ("ArtistFirst", the_setup.ArtistFirst);
+ SetupStore ("Jumptime", the_setup.Jumptime);
+ SetupStore ("UseStillPicture", the_setup.UseDeviceStillPicture );
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=7478&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/postinst (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/postinst Sat Nov 22 17:13:47 2008
@@ -4,6 +4,8 @@
# Remove old state file
if [ "$1" = "configure" ]; then
/bin/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
#DEBHELPER#
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=7478&op=diff
==============================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/postrm (original)
+++ vdr/vdr-plugin-muggle/trunk/debian/postrm Sat Nov 22 17:13:47 2008
@@ -3,7 +3,8 @@
# Remove state file
if [ "$1" = "purge" ]; then
- /bin/rm -f /var/lib/vdr/plugins/muggle/muggle.state
+ /bin/rm -f /var/lib/vdr/plugins/muggle/muggle.state*
+ /bin/rm -rf /var/cache/vdr-plugin-muggle/*
fi
#DEBHELPER#
More information about the pkg-vdr-dvb-changes
mailing list