[Pkg-kde-commits] rev 2435 - in branches/kde-3.4.0/packages/kdemultimedia/debian: . patches

Adeodato Simó adeodato at costa.debian.org
Wed Nov 30 01:23:44 UTC 2005 

Author: adeodato
Date: 2005-11-30 01:23:43 +0000 (Wed, 30 Nov 2005)
New Revision: 2435

Added:
   branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r484270.diff
Modified:
   branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
Log:
kdemultimedia branch pull, upload to unstable.
not updating build-prep for the small Makefile.am update in the end.


Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/changelog	2005-11-30 01:15:57 UTC (rev 2434)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/changelog	2005-11-30 01:23:43 UTC (rev 2435)
@@ -1,7 +1,9 @@
-kdemultimedia (4:3.4.3-4) UNRELEASED; urgency=low
+kdemultimedia (4:3.4.3-4) unstable; urgency=low
 
   * Upload to unstable, rebuilding against kdelibs4c2a.
 
+  * KDE_3_4_BRANCH update (up to r484270).
+
   +++ Changes by Christopher Martin:
 
   * Temporarily bump our build-dependency on libtunepimp2-dev to >= 0.3.0-9.1,
@@ -10,7 +12,7 @@
   * Add a manpage for kaudiocreator, courtesy of Francois Wendling.
     (Closes: #337166)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Nov 2005 02:17:39 +0100
 
 kdemultimedia (4:3.4.3-3) experimental; urgency=low
 

Added: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r484270.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r484270.diff	2005-11-30 01:15:57 UTC (rev 2434)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r484270.diff	2005-11-30 01:23:43 UTC (rev 2435)
@@ -0,0 +1,171 @@
+#DPATCHLEVEL=0
+--- akode/plugins/mpeg_decoder/mpeg_decoder.cpp	(revision 471133)
++++ akode/plugins/mpeg_decoder/mpeg_decoder.cpp	(revision 484270)
+@@ -63,9 +63,9 @@
+     }
+     src->close();
+     return res;
+-};
++}
+ 
+-extern "C" { MPEGDecoderPlugin mpeg_decoder; };
++extern "C" { MPEGDecoderPlugin mpeg_decoder; }
+ 
+ struct xing_frame {
+     // Xing header:
+@@ -132,7 +132,7 @@
+     m_data->src->fadvise();
+ 
+     m_data->length = m_data->src->length();
+-};
++}
+ 
+ MPEGDecoder::~MPEGDecoder() {
+     mad_stream_finish(&m_data->stream);
+--- akode/plugins/xiph_decoder/flac_decoder.cpp	(revision 471133)
++++ akode/plugins/xiph_decoder/flac_decoder.cpp	(revision 484270)
+@@ -525,12 +525,12 @@
+ #endif
+ 
+ long FLACDecoder::length() {
+-    float pos = m_data->length/m_data->config.sample_rate;
++    float pos = ((float)m_data->length)/m_data->config.sample_rate;
+     return (long)(pos*1000.0);
+ }
+ 
+ long FLACDecoder::position() {
+-    float pos = m_data->position/m_data->config.sample_rate;
++    float pos = ((float)m_data->position)/m_data->config.sample_rate;
+     return (long)(pos*1000.0);
+ }
+ 
+@@ -551,12 +551,12 @@
+ 
+ #ifdef HAVE_LIBOGGFLAC
+ long OggFLACDecoder::length() {
+-    float pos = m_data->length/m_data->config.sample_rate;
++    float pos = ((float)m_data->length)/m_data->config.sample_rate;
+     return (long)(pos*1000.0);
+ }
+ 
+ long OggFLACDecoder::position() {
+-    float pos = m_data->position/m_data->config.sample_rate;
++    float pos = ((float)m_data->position)/m_data->config.sample_rate;
+     return (long)(pos*1000.0);
+ }
+ 
+--- juk/filehandle.cpp	(revision 471133)
++++ juk/filehandle.cpp	(revision 484270)
+@@ -26,18 +26,18 @@
+ #include "cache.h"
+ #include "coverinfo.h"
+ 
+-AddProperty(Title, tag()->title());
+-AddProperty(Artist, tag()->artist());
+-AddProperty(Album, tag()->album());
+-AddProperty(Genre, tag()->genre());
+-AddNumberProperty(Track, tag()->track());
+-AddNumberProperty(Year, tag()->year());
+-AddProperty(Comment, tag()->comment());
+-AddNumberProperty(Seconds, tag()->seconds());
+-AddNumberProperty(Bitrate, tag()->bitrate());
+-AddProperty(Path, absFilePath());
+-AddNumberProperty(Size, fileInfo().size());
+-AddProperty(Extension, fileInfo().extension(false));
++AddProperty(Title, tag()->title())
++AddProperty(Artist, tag()->artist())
++AddProperty(Album, tag()->album())
++AddProperty(Genre, tag()->genre())
++AddNumberProperty(Track, tag()->track())
++AddNumberProperty(Year, tag()->year())
++AddProperty(Comment, tag()->comment())
++AddNumberProperty(Seconds, tag()->seconds())
++AddNumberProperty(Bitrate, tag()->bitrate())
++AddProperty(Path, absFilePath())
++AddNumberProperty(Size, fileInfo().size())
++AddProperty(Extension, fileInfo().extension(false))
+ 
+ static QString resolveSymLinks(const QFileInfo &file) // static
+ {
+--- kaudiocreator/eventsrc	(revision 471133)
++++ kaudiocreator/eventsrc	(revision 484270)
+@@ -17,6 +17,7 @@
+ Name[cy]=Trac wedi'i Rhwygo
+ Name[da]=Spor rippet
+ Name[de]=Stück ausgelesen
++Name[el]=Το κομμάτι εξήχθη
+ Name[es]=Pista extraida
+ Name[et]=Rada ripitud
+ Name[eu]=Pista erauztua
+@@ -53,6 +54,7 @@
+ Comment[cy]=Wedi gorffen rhwygo'r trac
+ Comment[da]=Spor færdig med at blive rippet
+ Comment[de]=Das Stück ist fertig ausgelesen.
++Comment[el]=Η εξαγωγή του κομματιού ολοκληρώθηκε
+ Comment[es]=Finalizó la extracción de la pista
+ Comment[et]=Raja rippimine lõpetatud
+ Comment[eu]=Pistaren erauzketa amaituta
+@@ -91,6 +93,7 @@
+ Name[cy]=CD wedi'i Rhwygo
+ Name[da]=CD rippet
+ Name[de]=CD ausgelesen
++Name[el]=Το CD εξήχθη
+ Name[es]=CD extraido
+ Name[et]=CD ripitud
+ Name[eu]=CD-a erauztua
+@@ -129,6 +132,7 @@
+ Comment[cy]=Wedi gorffen rhwygo'r CD
+ Comment[da]=CD færdig med at blive rippet
+ Comment[de]=Die CD ist fertig ausgelesen.
++Comment[el]=Η εξαγωγή του CD ολοκληρώθηκε
+ Comment[es]=Finalizó la extracción del CD
+ Comment[et]=CD rippimine lõpetatud
+ Comment[eu]=CD-aren erauztea amaituta
+--- kaudiocreator/kaudiocreator.desktop	(revision 471133)
++++ kaudiocreator/kaudiocreator.desktop	(revision 484270)
+@@ -70,6 +70,7 @@
+ GenericName[cy]=Rhwygydd CD
+ GenericName[da]=CD-Ripper
+ GenericName[de]=CD-Ripper
++GenericName[el]=Εξαγωγέας CD
+ GenericName[es]=Extractor digital de CDs
+ GenericName[et]=CD rippija
+ GenericName[eu]=CD erauzlea
+--- noatun/modules/kjofol-skin/parser.cpp	(revision 471133)
++++ noatun/modules/kjofol-skin/parser.cpp	(revision 484270)
+@@ -100,7 +100,7 @@
+ 		QImageIO iio;
+ 		iio.setFileName( filenameNoCase(filename) );
+ 		// forget about gamma-value, fix for broken PNGs
+-		iio.setGamma( 0.0f );
++		iio.setGamma( 0.00000001 );
+ 		if ( iio.read() )
+ 		{
+ 			image = iio.image();
+--- xine_artsplugin/tools/thumbnail/videocreator.cpp	(revision 471133)
++++ xine_artsplugin/tools/thumbnail/videocreator.cpp	(revision 484270)
+@@ -269,11 +269,11 @@
+ 
+ extern "C"
+ {
+-    ThumbCreator *new_creator()
++    KDE_EXPORT ThumbCreator *new_creator()
+     {
+         return new VideoCreator;
+     }
+-};
++}
+ 
+ VideoCreator::VideoCreator()
+ {
+--- Makefile.am.in	(revision 471133)
++++ Makefile.am.in	(revision 484270)
+@@ -4,7 +4,7 @@
+ AUTOMAKE_OPTIONS = foreign 1.5
+ DISTCLEANFILES = inst-apps
+ 
+-COMPILE_AFTER_arts = noatun krec
++COMPILE_AFTER_arts = noatun krec akode
+ COMPILE_AFTER_mpeglib = mpeglib_artsplug
+ COMPILE_AFTER_libkcddb = kaudiocreator kioslave kscd
+ COMPILE_AFTER_akode = juk

More information about the pkg-kde-commits mailing list