rev 5001 - in people/ana/packages/amarok/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Mon Nov 27 14:33:23 UTC 2006
Author: ana
Date: 2006-11-27 15:33:21 +0100 (Mon, 27 Nov 2006)
New Revision: 5001
Added:
people/ana/packages/amarok/debian/patches/kde134333_negative_length_fix.diff
Modified:
people/ana/packages/amarok/debian/changelog
people/ana/packages/amarok/debian/control
people/ana/packages/amarok/debian/patches/series
people/ana/packages/amarok/debian/rules
Log:
Changes for new amarok upload. Hopefully last Etch upload.
Modified: people/ana/packages/amarok/debian/changelog
===================================================================
--- people/ana/packages/amarok/debian/changelog 2006-11-26 23:48:30 UTC (rev 5000)
+++ people/ana/packages/amarok/debian/changelog 2006-11-27 14:33:21 UTC (rev 5001)
@@ -1,3 +1,16 @@
+amarok (1.4.4-1) unstable; urgency=low
+
+ * Adding myself as uploader. ACK my last three NMUs...
+ * Removed circular dependencies. Now amarok-engines and amarok-$engine
+ Recommends: amarok, instead of depends on amarok (Closes: #368485).
+ * Fix kde#134333: properly compute total playlist length if there are
+ tracks dynamic lengths (e.g. last.fm streams) in the playlist. Patch by
+ Modestas Vainius <geromanas at mailas.com>.
+ * Replaced ${Source-Version} with ${source:Version} and added versioned
+ build-dependency on dpkg-dev accordingly.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Sun, 26 Nov 2006 03:42:59 +0100
+
amarok (1.4.4-0.3) unstable; urgency=low
* Non-maintainer upload.
Modified: people/ana/packages/amarok/debian/control
===================================================================
--- people/ana/packages/amarok/debian/control 2006-11-26 23:48:30 UTC (rev 5000)
+++ people/ana/packages/amarok/debian/control 2006-11-27 14:33:21 UTC (rev 5001)
@@ -2,6 +2,7 @@
Section: kde
Priority: optional
Maintainer: Adeodato Simó <dato at net.com.org.es>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>
Build-Depends: cdbs, debhelper (>=5), quilt, bzip2, automake1.9, libtool,
kdelibs4-dev, kdemultimedia-dev, kdebase-dev,
libxine-dev,
@@ -9,7 +10,8 @@
libmysqlclient15-dev, libpq-dev,
xmms-dev, libvisual-0.4-dev, libsdl1.2-dev,
libifp-dev, libusb-dev, libgpod-dev, libnjb-dev,
- ruby, ruby1.8-dev
+ ruby, ruby1.8-dev,
+ dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
Package: amarok
@@ -43,7 +45,8 @@
Package: amarok-engines
Architecture: any
-Depends: amarok (= ${Source-Version}), amarok-xine
+Depends: amarok-xine
+Recommends: amarok (= ${source:Version})
Description: output engines for the Amarok audio player
This package depends on all the available Amarok engines, and it's
installed by default unless you specify a particular engine. You can
@@ -52,7 +55,8 @@
Package: amarok-xine
Architecture: any
-Depends: amarok (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
+Recommends: amarok (= ${source:Version})
Provides: amarok-engine
Description: xine engine for the Amarok audio player
This package provides the xine engine for Amarok, which you may prefer
Added: people/ana/packages/amarok/debian/patches/kde134333_negative_length_fix.diff
===================================================================
--- people/ana/packages/amarok/debian/patches/kde134333_negative_length_fix.diff 2006-11-26 23:48:30 UTC (rev 5000)
+++ people/ana/packages/amarok/debian/patches/kde134333_negative_length_fix.diff 2006-11-27 14:33:21 UTC (rev 5001)
@@ -0,0 +1,157 @@
+--- amarok/src/playlistitem.cpp 2006-10-26 23:40:20.000000000 +0300
++++ amarok/src/playlistitem.cpp 2006-11-25 00:41:05.000000000 +0200
+@@ -71,19 +71,8 @@
+
+ refAlbum();
+
+- listView()->m_totalCount++;
+- listView()->m_totalLength += length();
+- if( isSelected() )
+- {
+- listView()->m_selCount++;
+- listView()->m_selLength += length();
+- }
+- if( isVisible() )
+- {
+- listView()->m_visCount++;
+- listView()->m_visLength += length();
+- incrementTotals();
+- }
++ incrementCounts();
++ incrementLengths();
+
+ filter( listView()->m_filter );
+
+@@ -96,19 +85,8 @@
+ if( isEmpty() ) //constructed with the generic constructor, for PlaylistLoader's marker item
+ return;
+
+- listView()->m_totalCount--;
+- listView()->m_totalLength -= length();
+- if( isSelected() )
+- {
+- listView()->m_selCount--;
+- listView()->m_selLength -= length();
+- }
+- if( isVisible() )
+- {
+- listView()->m_visCount--;
+- listView()->m_visLength -= length();
+- decrementTotals();
+- }
++ decrementCounts();
++ decrementLengths();
+
+ derefAlbum();
+
+@@ -160,13 +138,16 @@
+
+ void PlaylistItem::aboutToChange( const QValueList<int> &columns )
+ {
+- bool totals = false, ref = false;
++ bool totals = false, ref = false, length = false;
+ for( int i = 0, n = columns.count(); i < n; ++i )
+ switch( columns[i] )
+ {
++ case Length: length = true; break;
+ case Artist: case Album: ref = true; //note, no breaks
+ case Track: case Rating: case Score: case LastPlayed: totals = true;
+ }
++ if ( length )
++ decrementLengths();
+ if( totals )
+ decrementTotals();
+ if( ref )
+@@ -176,11 +157,16 @@
+ void PlaylistItem::reactToChanges( const QValueList<int> &columns )
+ {
+ MetaBundle::reactToChanges(columns);
+- bool totals = false, ref = false;
++ bool totals = false, ref = false, length = false;
+ for( int i = 0, n = columns.count(); i < n; ++i )
+ {
+ if( columns[i] == Mood )
+ moodbar().reset();
++ if ( !length && columns[i] == Length ) {
++ length = true;
++ incrementLengths();
++ listView()->countChanged();
++ }
+ switch( columns[i] )
+ {
+ case Artist: case Album: ref = true; //note, no breaks
+@@ -1069,6 +1055,60 @@
+ }
+ }
+
++void PlaylistItem::incrementCounts()
++{
++ listView()->m_totalCount++;
++ if( isSelected() )
++ {
++ listView()->m_selCount++;
++ }
++ if( isVisible() )
++ {
++ listView()->m_visCount++;
++ incrementTotals();
++ }
++}
++
++void PlaylistItem::decrementCounts()
++{
++ listView()->m_totalCount--;
++ if( isSelected() )
++ {
++ listView()->m_selCount--;
++ }
++ if( isVisible() )
++ {
++ listView()->m_visCount--;
++ decrementTotals();
++ }
++}
++
++void PlaylistItem::incrementLengths()
++{
++ listView()->m_totalLength += length();
++ if( isSelected() )
++ {
++ listView()->m_selLength += length();
++ }
++ if( isVisible() )
++ {
++ listView()->m_visLength += length();
++ }
++}
++
++void PlaylistItem::decrementLengths()
++{
++ listView()->m_totalLength -= length();
++ if( isSelected() )
++ {
++ listView()->m_selLength -= length();
++ }
++ if( isVisible() )
++ {
++ listView()->m_visLength -= length();
++ }
++}
++
+ QPixmap *PlaylistItem::s_star = 0;
+ QPixmap *PlaylistItem::s_grayedStar = 0;
+ QPixmap *PlaylistItem::s_smallStar = 0;
+--- amarok/src/playlistitem.h 2006-10-26 23:40:20.000000000 +0300
++++ amarok/src/playlistitem.h 2006-11-25 00:42:21.000000000 +0200
+@@ -149,6 +149,11 @@
+ void decrementTotals();
+ void incrementTotals();
+
++ void incrementCounts();
++ void decrementCounts();
++ void incrementLengths();
++ void decrementLengths();
++
+ int totalIncrementAmount() const;
+
+ PlaylistAlbum *m_album;
Modified: people/ana/packages/amarok/debian/patches/series
===================================================================
--- people/ana/packages/amarok/debian/patches/series 2006-11-26 23:48:30 UTC (rev 5000)
+++ people/ana/packages/amarok/debian/patches/series 2006-11-27 14:33:21 UTC (rev 5001)
@@ -6,3 +6,4 @@
revert-fix-for-bug-116127.diff -p0
sparc-asm.patch -p0
invoke_browser.patch -p0
+kde134333_negative_length_fix.diff -p0
Modified: people/ana/packages/amarok/debian/rules
===================================================================
--- people/ana/packages/amarok/debian/rules 2006-11-26 23:48:30 UTC (rev 5000)
+++ people/ana/packages/amarok/debian/rules 2006-11-27 14:33:21 UTC (rev 5001)
@@ -13,9 +13,16 @@
DEB_DH_MAKESHLIBS_ARGS_ALL := -n
DEB_INSTALL_DIRS_amarok := usr/lib/amarok
-DEB_DH_SHLIBDEPS_ARGS := -Xusr/bin/amarok_xmmswrapper2 \
+DEB_DH_SHLIBDEPS_ARGS_amarok := -Xusr/bin/amarok_xmmswrapper2 \
-Xusr/lib/kde3/konqsidebar_universalamarok.so
+#to avoid circular dep of amarok-xine on amarok
+DEB_DH_SHLIBDEPS_ARGS_amarok-xine := \
+ -Xusr/lib/libamarok.so \
+ -- -dRecommends \
+ debian/amarok/usr/lib/libamarok.so \
+ -dDepends
+
DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite \
--disable-final \
--without-akode \
More information about the pkg-kde-commits
mailing list