[Pkg-kde-commits] rev 2114 - in
people/dato/packages/trunk/amarok/debian: . patches
Adeodato Simó
adeodato at costa.debian.org
Mon Oct 24 00:10:07 UTC 2005
Author: adeodato
Date: 2005-10-24 00:10:06 +0000 (Mon, 24 Oct 2005)
New Revision: 2114
Modified:
people/dato/packages/trunk/amarok/debian/amarok.install
people/dato/packages/trunk/amarok/debian/changelog
people/dato/packages/trunk/amarok/debian/control
people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
Log:
libvisual support for amarok.
Modified: people/dato/packages/trunk/amarok/debian/amarok.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok.install 2005-10-24 00:07:07 UTC (rev 2113)
+++ people/dato/packages/trunk/amarok/debian/amarok.install 2005-10-24 00:10:06 UTC (rev 2114)
@@ -22,6 +22,7 @@
debian/tmp/usr/bin/amarok
debian/tmp/usr/bin/amarokapp /usr/lib/amarok
debian/tmp/usr/bin/amarok_xmmswrapper2 /usr/lib/amarok
+debian/tmp/usr/bin/amarok_libvisual /usr/lib/amarok
debian/tmp/etc/*
Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog 2005-10-24 00:07:07 UTC (rev 2113)
+++ people/dato/packages/trunk/amarok/debian/changelog 2005-10-24 00:10:06 UTC (rev 2114)
@@ -4,8 +4,14 @@
immensely happy because a fix for upstream #114195 is included.
("Collection scanner ignored files with non-ascii characters").
- -- Adeodato Simó <asp16 at alu.ua.es> Mon, 24 Oct 2005 02:00:27 +0200
+ * Add libvisual0.2-dev to Build-Depends to enable libvisual support.
+ Thanks to Jean-Rémy Falleri for the heads-up. (Closes: #335053)
+ Install amarok_libvisual in /usr/lib/amarok instead of /usr/bin as per
+ Policy. Add the appropriate snippet to some-binaries-in-usr-lib.patch.
+
+ -- Adeodato Simó <asp16 at alu.ua.es> Mon, 24 Oct 2005 02:01:59 +0200
+
amarok (1.3.3-1) unstable; urgency=low
* New upstream bugfix release:
Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control 2005-10-24 00:07:07 UTC (rev 2113)
+++ people/dato/packages/trunk/amarok/debian/control 2005-10-24 00:10:06 UTC (rev 2114)
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Adeodato Simó <asp16 at alu.ua.es>
-Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.21), debhelper (>> 4.1.0), bzip2, automake1.9, libtool, kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.4.2), kdebase-dev (>= 4:3.4.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient14-dev, libpq-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.21), debhelper (>> 4.1.0), bzip2, automake1.9, libtool, kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.4.2), kdebase-dev (>= 4:3.4.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient14-dev, libpq-dev, libtag1-dev (>> 1.3.1), libvisual0.2-dev, libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
Standards-Version: 3.6.2
Package: amarok
Modified: people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch 2005-10-24 00:07:07 UTC (rev 2113)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch 2005-10-24 00:10:06 UTC (rev 2114)
@@ -20,7 +20,7 @@
m_proc->setCommunication( QProcess::Stdout );
--- a/amarok/src/socketserver.cpp
+++ b/amarok/src/socketserver.cpp
-@@ -169,14 +169,14 @@
+@@ -193,23 +193,23 @@
//can I get a pointer to the data section of a QCString?
char str[4096];
@@ -35,8 +35,19 @@
- new Item( this, "amarok_xmmswrapper2", *it, "xmms" );
+ new Item( this, "/usr/lib/amarok/amarok_xmmswrapper2", *it, "xmms" );
- vis = popen( "amarok_libvisual --list", "r" );
+- vis = popen( "amarok_libvisual --list", "r" );
++ vis = popen( "/usr/lib/amarok/amarok_libvisual --list", "r" );
str[ fread( (void*)str, sizeof(char), 4096, vis ) ] = '\0';
+ pclose( vis );
+
+ entries = QStringList::split( '\n', QString::fromLocal8Bit( str ) );
+
+ for( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it )
+- new Item( this, "amarok_libvisual", *it, "libvisual" );
++ new Item( this, "/usr/lib/amarok/amarok_libvisual", *it, "libvisual" );
+
+ resize( sizeHint() + QSize(20,0) );
+ // Center the widget on screen
--- a/amarok/src/amarokcore/main.cpp
+++ b/amarok/src/amarokcore/main.cpp
@@ -77,6 +77,8 @@
More information about the pkg-kde-commits
mailing list