[Pkg-kde-commits] rev 1616 - in
branches/kde-3.4.0/packages/kdemultimedia/debian: . patches
Luk Claes
luk at costa.debian.org
Tue Aug 30 17:42:27 UTC 2005
Author: luk
Date: 2005-08-30 17:42:23 +0000 (Tue, 30 Aug 2005)
New Revision: 1616
Added:
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r455136.diff
Modified:
branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
branches/kde-3.4.0/packages/kdemultimedia/debian/control
branches/kde-3.4.0/packages/kdemultimedia/debian/copyright
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
Preparation of upload
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/changelog 2005-08-30 17:15:47 UTC (rev 1615)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/changelog 2005-08-30 17:42:23 UTC (rev 1616)
@@ -1,6 +1,8 @@
-kdemultimedia (4:3.4.2-1) UNRELEASED; urgency=low
+kdemultimedia (4:3.4.2-1) unstable; urgency=low
* New upstream release.
+
+ * Rebuild closes: #317423, #317205
+++ Changes by Christopher Martin:
@@ -9,8 +11,14 @@
* Improve libkcddb1 package description. (Closes: #312191)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 14 Jul 2005 04:42:59 -0400
+ +++ Changes by Luk Claes:
+
+ * Added me to uploaders
+ * Updated FSF's address
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 30 Aug 2005 19:18:45 +0200
+
kdemultimedia (4:3.4.1-1) experimental; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/control 2005-08-30 17:15:47 UTC (rev 1615)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/control 2005-08-30 17:42:23 UTC (rev 1616)
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.1-3), libgstreamer-plugins0.8-dev, libltdl3-dev, liboggflac-dev (>= 1.1.1-3), libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libtunepimp-bin, libtunepimp2-dev (>= 0.3.0-2.1), libxaw8-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev
Standards-Version: 3.6.2
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/copyright
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/copyright 2005-08-30 17:15:47 UTC (rev 1615)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/copyright 2005-08-30 17:42:23 UTC (rev 1616)
@@ -114,7 +114,7 @@
Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Added: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r455136.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r455136.diff 2005-08-30 17:15:47 UTC (rev 1615)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r455136.diff 2005-08-30 17:42:23 UTC (rev 1616)
@@ -0,0 +1,687 @@
+#DPATCHLEVEL=0
+--- kaboodle/kaboodleengine.desktop (revision 438734)
++++ kaboodle/kaboodleengine.desktop (revision 455136)
+@@ -3,6 +3,7 @@
+ Name=Embedded Media Player Engine
+ Name[af]=Ingebedde Media Speler Masjien
+ Name[bn]=সন্নিবিষ্ট মিডিয়া প্লেয়ার ইঞ্জিন
++Name[br]=Keflusker enframmet soner liesvedia
+ Name[bs]=Uključeni Media Player
+ Name[ca]=Motor del reproductor multimèdia incrustat
+ Name[cs]=Vestavěný přehrávač médií
+--- akode/plugins/jack_sink/jack_sink.cpp (revision 438734)
++++ akode/plugins/jack_sink/jack_sink.cpp (revision 455136)
+@@ -134,8 +134,10 @@
+ jack_port_unregister(m_data->client, m_data->left_port);
+ if (m_data->right_port)
+ jack_port_unregister(m_data->client, m_data->right_port);
+- if (m_data->client)
++ if (m_data->client) {
+ jack_deactivate(m_data->client);
++ jack_client_close(m_data->client);
++ }
+ delete m_data;
+ }
+
+--- akode/arts_plugin/Makefile.am (revision 438734)
++++ akode/arts_plugin/Makefile.am (revision 455136)
+@@ -7,7 +7,7 @@
+ libarts_akode_la_SOURCES = akodearts.cc akodePlayObject_impl.cpp \
+ akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp akodeXiphPlayObject_impl.cpp \
+ akodeVorbisStreamPlayObject_impl.cpp akodeSpeexStreamPlayObject_impl.cpp
+-libarts_akode_la_LDFLAGS = -L$(top_srcdir)/akode/lib $(KDE_LDFLAGS) $(KDE_RPATH) -module -avoid-version -no-undefined
++libarts_akode_la_LDFLAGS = -module $(KDE_PLUGIN)
+ libarts_akode_la_LIBADD = ../lib/libakode.la -lkmedia2_idl -lsoundserver_idl -lartsflow
+ libarts_akode_la_METASOURCES = AUTO
+
+--- kmid/x-karaoke.desktop (revision 438734)
++++ kmid/x-karaoke.desktop (revision 455136)
+@@ -20,6 +20,7 @@
+ Comment[eu]=Karaoke fitxategia
+ Comment[fi]=Karaoketiedosto
+ Comment[fr]=Fichier de karaoké
++Comment[ga]=Comhad Karaoke
+ Comment[gl]=Ficheiro Karaoke
+ Comment[hi]=कराओके फ़ाइल
+ Comment[hu]=Karaoke-fájl
+--- krec/krec_exportitem.desktop (revision 438734)
++++ krec/krec_exportitem.desktop (revision 455136)
+@@ -15,6 +15,7 @@
+ Comment[eu]=Esportazio plugin-a KRec-entzat
+ Comment[fi]=Vientiliitännäinen KRec-ohjelmalle
+ Comment[fr]=Module externe d'exportation pour KRec
++Comment[ga]=Breiseán easpórtála le haghaidh KRec
+ Comment[hi]=के-रेक के लिए निर्यात प्लगइन
+ Comment[hu]=Exportálási bővítőmodul a KRec-hez
+ Comment[is]=Útflutningsíforrit fyrir KRec
+--- krec/ogg_export/krec_exportogg.desktop (revision 438734)
++++ krec/ogg_export/krec_exportogg.desktop (revision 455136)
+@@ -15,6 +15,7 @@
+ Name[eu]=OGG-esportazioa
+ Name[fi]=OGG-vienti
+ Name[fr]=Exportation en OGG
++Name[ga]=Easpórtáil OGG
+ Name[hi]=ऑग-निर्यात
+ Name[hu]=Exportálás - OGG
+ Name[is]=OGG útflutningur
+--- krec/mp3_export/krec_exportmp3.desktop (revision 438734)
++++ krec/mp3_export/krec_exportmp3.desktop (revision 455136)
+@@ -14,6 +14,7 @@
+ Name[eu]=MP3-esportazioa
+ Name[fi]=MP3-vienti
+ Name[fr]=Exportation en MP3
++Name[ga]=Easpórtáil MP3
+ Name[hi]=एमपी3-निर्यात
+ Name[hu]=Exportálás - MP3
+ Name[is]=MP3 útflutningur
+--- kscd/kscd.cpp (revision 438734)
++++ kscd/kscd.cpp (revision 455136)
+@@ -125,6 +125,7 @@
+ random_current = random_list.begin();
+
+ cddb = new KCDDB::Client();
++ connect(cddb, SIGNAL(finished(CDDB::Result)), this, SLOT(lookupCDDBDone(CDDB::Result)));
+
+ #if defined(BUILD_CDDA)
+ audio_systems_list
+@@ -686,6 +687,7 @@
+ e->ignore();
+ return;
+ }
++ e->accept();
+ }
+
+ void KSCD::randomSelected()
+@@ -1267,7 +1269,6 @@
+
+ cddb->config().reparse();
+ cddb->setBlockingMode(false);
+- connect(cddb, SIGNAL(finished(CDDB::Result)), this, SLOT(lookupCDDBDone(CDDB::Result)));
+
+ cddb->lookup(trackStartFrames);
+ } // lookupCDDB
+@@ -1524,7 +1525,9 @@
+
+ QString KSCD::calculateDisplayedTime(int sec, int track)
+ {
+- // should check if tracknumber is valid.
++ if( track == 0 )
++ return QString::null;
++ // should check if tracknumber is valid.
+ static int mymin;
+ static int mysec;
+ int tmp;
+--- kscd/audiocd_play.desktop (revision 438734)
++++ kscd/audiocd_play.desktop (revision 455136)
+@@ -12,6 +12,7 @@
+ Name[cy]=Chwarae
+ Name[da]=Spil
+ Name[et]=Esitus
++Name[fi]=Soita
+ Name[fr]=Lecture
+ Name[ga]=Seinn
+ Name[hu]=Lejátszás
+--- juk/tracksequenceiterator.cpp (revision 438734)
++++ juk/tracksequenceiterator.cpp (revision 455136)
+@@ -14,10 +14,9 @@
+ ***************************************************************************/
+
+ #include <kaction.h>
++#include <kapplication.h>
+ #include <kdebug.h>
+
+-#include <stdlib.h>
+-
+ #include "tracksequenceiterator.h"
+ #include "playlist.h"
+ #include "actioncollection.h"
+@@ -81,7 +80,7 @@
+
+ if(albumRandom) {
+ if(m_albumSearch.isNull() || m_albumSearch.matchedItems().isEmpty()) {
+- item = m_randomItems[::random() % m_randomItems.count()];
++ item = m_randomItems[KApplication::random() % m_randomItems.count()];
+ initAlbumSearch(item);
+ }
+
+@@ -107,7 +106,7 @@
+ }
+ }
+ else
+- item = m_randomItems[::random() % m_randomItems.count()];
++ item = m_randomItems[KApplication::random() % m_randomItems.count()];
+
+ setCurrent(item);
+ m_randomItems.remove(item);
+@@ -148,7 +147,7 @@
+
+ PlaylistItem *newItem = 0;
+ if(!items.isEmpty())
+- newItem = items[::random() % items.count()];
++ newItem = items[KApplication::random() % items.count()];
+
+ setCurrent(newItem);
+ refillRandomList();
+--- juk/playlistsearch.cpp (revision 438734)
++++ juk/playlistsearch.cpp (revision 455136)
+@@ -221,7 +221,7 @@
+ case ContainsWord:
+ {
+ QString s = item->text(*it);
+- int i = s.find(m_query);
++ int i = s.find(m_query, 0, m_caseSensitive);
+
+ if(i >= 0) {
+
+--- juk/main.cpp (revision 438734)
++++ juk/main.cpp (revision 455136)
+@@ -47,7 +47,7 @@
+ int main(int argc, char *argv[])
+ {
+ KAboutData aboutData("juk", I18N_NOOP("JuK"),
+- "2.2.1", description, KAboutData::License_GPL,
++ "2.2.2", description, KAboutData::License_GPL,
+ "(c) 2002 - 2005, Scott Wheeler", 0,
+ "http://developer.kde.org/~wheeler/juk.html");
+
+--- kappfinder-data/galan.desktop (revision 438734)
++++ kappfinder-data/galan.desktop (revision 455136)
+@@ -15,6 +15,7 @@
+ GenericName[es]=Sintetizador modular
+ GenericName[et]=Modulaarne süntesaator
+ GenericName[eu]=Sintetizatzaile modularra
++GenericName[fi]=Modulaarinen synteesi
+ GenericName[fr]=Synthétiseur modulaire
+ GenericName[hi]=मॉड्यूलर सिंथ
+ GenericName[hu]=Moduláris szintetizátor
+--- kappfinder-data/amsynth.desktop (revision 438734)
++++ kappfinder-data/amsynth.desktop (revision 455136)
+@@ -17,6 +17,7 @@
+ GenericName[es]=Sintetizador analógico retro por software
+ GenericName[et]=Retro analoog tarkvaraline süntesaator
+ GenericName[eu]=Analogiko zaharra - Softsynth modelizazioa
++GenericName[fi]=Retro Analog - Mallioppiva pehmeä synteesi
+ GenericName[hi]=रीट्रो एनालॉग - मॉडलिंग सॉफ़्टसिंथ
+ GenericName[hu]=Egy retró stílusú, analóg-modellű szoftveres szintetizátor
+ GenericName[is]=Gamaldags hliðrænn - mjúkur hljóðgervill
+--- kappfinder-data/freqtweak.desktop (revision 438734)
++++ kappfinder-data/freqtweak.desktop (revision 455136)
+@@ -22,7 +22,7 @@
+ GenericName[hi]=जैक के लिए प्रभाव
+ GenericName[hu]=Effektező a JACK-hez
+ GenericName[is]=Brellur fyrir Jack
+-GenericName[it]=Effecti per Jack
++GenericName[it]=Effetti per Jack
+ GenericName[ja]=Jackのエフェクト
+ GenericName[mk]=Ефекти за Jack
+ GenericName[nb]=Effektar for Jack
+--- kappfinder-data/ardour.desktop (revision 438734)
++++ kappfinder-data/ardour.desktop (revision 455136)
+@@ -15,6 +15,7 @@
+ GenericName[es]=Estudio de audio multipista
+ GenericName[et]=Mitmerealine audiostuudio
+ GenericName[eu]=Pista anitzeko audio estudioa
++GenericName[fi]=Moniräkkinen äänistudio
+ GenericName[fr]=Studio audio multipiste
+ GenericName[hi]=मल्टी-ट्रैक ऑडियो स्टूडियो
+ GenericName[hu]=többsávos hangstúdió
+--- kappfinder-data/jamin.desktop (revision 438734)
++++ kappfinder-data/jamin.desktop (revision 455136)
+@@ -16,6 +16,7 @@
+ GenericName[es]=Herramienta de masterización de JACK
+ GenericName[et]=Jacki masterdamise rakendus
+ GenericName[eu]=Jack erabiltzeko tresna
++GenericName[fi]=Jack-masterointityökalu
+ GenericName[fr]=Outil de mastering Jack
+ GenericName[hu]=JACK-kezelő
+ GenericName[is]=Hljóðblöndunartól Jack
+--- kappfinder-data/zynaddsubfx.desktop (revision 438734)
++++ kappfinder-data/zynaddsubfx.desktop (revision 455136)
+@@ -15,6 +15,7 @@
+ GenericName[de]=Software-Synthesizer
+ GenericName[es]=Sintetizador por software
+ GenericName[et]=Tarkvaraline süntesaator
++GenericName[fi]=Pehmeä synteesi
+ GenericName[fr]=Synthétiseur logiciel
+ GenericName[hi]=सॉफ़्ट सिंथ
+ GenericName[hu]=Szoftveres szintetizátor
+--- kappfinder-data/kde-multimedia-music.directory (revision 438734)
++++ kappfinder-data/kde-multimedia-music.directory (revision 455136)
+@@ -8,9 +8,11 @@
+ Name[es]=Música
+ Name[et]=Muusika
+ Name[eu]=Musika
++Name[fi]=Musiikki
+ Name[fr]=Musique
+ Name[ga]=Ceol
+ Name[hu]=Zene
++Name[is]=Tónlist
+ Name[it]=Musica
+ Name[nl]=Muziek
+ Name[nn]=Musikk
+@@ -27,8 +29,10 @@
+ GenericName[es]=Audio profesional
+ GenericName[et]=Professionaalne audio
+ GenericName[eu]=Audio profesionala
++GenericName[fi]=Ammattilaisääni
+ GenericName[fr]=Audio professionnel
+ GenericName[hu]=Professzinonális minőségű hanganyag
++GenericName[is]=Atvinnumannahljóð
+ GenericName[it]=Audio professionale
+ GenericName[nl]=Professionele audio
+ GenericName[nn]=Profesjonell lydhandsaming
+--- kaudiocreator/job.cpp (revision 438734)
++++ kaudiocreator/job.cpp (revision 455136)
+@@ -18,6 +18,7 @@
+
+ #include "job.h"
+ #include <kmacroexpander.h>
++#include <qregexp.h>
+
+ /**
+ * A helper function to replace %X with the stuff in the album.
+@@ -43,3 +44,15 @@
+ return (KMacroExpander::expandMacros(string, map));
+ }
+
++void Job::fix(const QString &in, const QString &out){
++ track_title.replace( QRegExp(in), out );
++ track_artist.replace( QRegExp(in), out );
++ track_comment.replace( QRegExp(in), out );
++ // year
++ // track
++ genre.replace( QRegExp(in), out );
++ album.replace( QRegExp(in), out );
++ comment.replace( QRegExp(in), out );
++ group.replace( QRegExp(in), out );
++}
++
+--- kaudiocreator/encoder.cpp (revision 438734)
++++ kaudiocreator/encoder.cpp (revision 455136)
+@@ -162,13 +162,14 @@
+ {
+ QMap <QString,QString> map;
+ map.insert("extension", prefs->extension());
+- desiredFile = job->replaceSpecialChars(desiredFile, false, map);
++ Job jobx = *job;
++ jobx.fix(Prefs::replaceInput(), Prefs::replaceOutput());
++ jobx.fix("/", "%2f");
++ // If the user wants anything regexp replaced do it now...
++ desiredFile = jobx.replaceSpecialChars(desiredFile, false, map);
++ desiredFile.replace( QRegExp("~"), QDir::homeDirPath() );
+ }
+- desiredFile.replace( QRegExp("~"), QDir::homeDirPath() );
+
+- // If the user wants anything regexp replaced do it now...
+- desiredFile.replace( QRegExp(Prefs::replaceInput()), Prefs::replaceOutput() );
+-
+ while ( QFile::exists( desiredFile ) ) {
+ bool ok;
+ QString text = KInputDialog::getText(
+--- kaudiocreator/tracksimp.cpp (revision 438734)
++++ kaudiocreator/tracksimp.cpp (revision 455136)
+@@ -291,6 +291,7 @@
+ // TODO Why doesn't libcddb not return MultipleRecordFound?
+ //if( result == KCDDB::CDDB::MultipleRecordFound ) {
+ if( Prefs::promptIfIncompleteInfo() && cddb->lookupResponse().count() > 1 ) {
++ QString searchedCDId = cddbInfo.id;
+ CDInfoList cddb_info = cddb->lookupResponse();
+ CDInfoList::iterator it;
+ QStringList list;
+@@ -326,6 +327,11 @@
+ return;
+ // user pressed Cancel
+ }
++ // Check that the CD we looked up is the one now loaded.
++ // The user might have ejected the CD while we were in the
++ // KInputDialog event loop, and replaced it with another one.
++ if ( searchedCDId != cddbInfo.id )
++ return;
+ }
+
+ // Some sanity provisions to ensure that the number of records matches what
+--- kaudiocreator/encodefileimp.cpp (revision 438734)
++++ kaudiocreator/encodefileimp.cpp (revision 455136)
+@@ -32,6 +32,8 @@
+ genre->insertStringList(m_genres.i18nList());
+ // Specify to only accept wav files
+ file->setFilter("*.wav|Wav Files");
++
++ connect(encodeButton,SIGNAL(clicked()),this,SLOT(encode()));
+ }
+
+ /**
+@@ -53,6 +55,9 @@
+ newJob->track = track->value();
+
+ newJob->track_title = track_title->text();
++ if ((track_artist->text()).isEmpty())
++ newJob->track_artist = artist->text();
++ else
+ newJob->track_artist = track_artist->text();
+ newJob->track_comment = track_comment->text();
+
+--- kaudiocreator/job.h (revision 438734)
++++ kaudiocreator/job.h (revision 455136)
+@@ -35,6 +35,8 @@
+
+ QString replaceSpecialChars(const QString &string, bool quote, QMap<QString,QString> map);
+
++ void fix( const QString &in, const QString &out );
++
+ // The device to obtain the file such as /dev/cdrom/ (Used when ripping and ejecting)
+ QString device;
+ int id;
+--- kaudiocreator/encodefile.ui (revision 438734)
++++ kaudiocreator/encodefile.ui (revision 455136)
+@@ -1,4 +1,4 @@
+-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
++<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+ <class>EncodeFile</class>
+ <widget class="KDialog">
+ <property name="name">
+@@ -9,7 +9,7 @@
+ <x>0</x>
+ <y>0</y>
+ <width>339</width>
+- <height>435</height>
++ <height>452</height>
+ </rect>
+ </property>
+ <property name="caption">
+@@ -292,7 +292,7 @@
+ </spacer>
+ <widget class="QPushButton">
+ <property name="name">
+- <cstring>pushButton6</cstring>
++ <cstring>encodeButton</cstring>
+ </property>
+ <property name="text">
+ <string>&Encode File</string>
+@@ -300,7 +300,7 @@
+ </widget>
+ <widget class="QPushButton">
+ <property name="name">
+- <cstring>pushButton5</cstring>
++ <cstring>closeButton</cstring>
+ </property>
+ <property name="text">
+ <string>&Close</string>
+@@ -310,9 +310,11 @@
+ </widget>
+ </vbox>
+ </widget>
++<customwidgets>
++</customwidgets>
+ <connections>
+ <connection>
+- <sender>pushButton5</sender>
++ <sender>closeButton</sender>
+ <signal>clicked()</signal>
+ <receiver>EncodeFile</receiver>
+ <slot>accept()</slot>
+@@ -329,11 +331,12 @@
+ <tabstop>year</tabstop>
+ <tabstop>genre</tabstop>
+ <tabstop>comment</tabstop>
+- <tabstop>pushButton6</tabstop>
+- <tabstop>pushButton5</tabstop>
++ <tabstop>encodeButton</tabstop>
++ <tabstop>closeButton</tabstop>
+ </tabstops>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
++ <includehint>kdialog.h</includehint>
+ <includehint>kurlrequester.h</includehint>
+ <includehint>klineedit.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+--- libkcddb/kcmcddb/libkcddb.desktop (revision 438734)
++++ libkcddb/kcmcddb/libkcddb.desktop (revision 455136)
+@@ -67,6 +67,7 @@
+ GenericName[eu]=CDDB konfigurazioa
+ GenericName[fi]=CDDB-asetukset
+ GenericName[fr]=Configuration CDDB
++GenericName[ga]=Cumraíocht CDDB
+ GenericName[hi]=सीडीडीबी कॉन्फ़िगरेशन
+ GenericName[hr]=Podešavanje CDDB-a
+ GenericName[hu]=CDDB-beállító
+--- libkcddb/cdinfodialogbase.ui.h (revision 438734)
++++ libkcddb/cdinfodialogbase.ui.h (revision 455136)
+@@ -148,7 +148,11 @@
+ void CDInfoDialogBase::artistChanged( const QString &newArtist )
+ {
+ // Enable special handling of compilations.
+- m_multiple->setChecked(newArtist.stripWhiteSpace().compare("Various"));
++ if (newArtist.stripWhiteSpace().compare("Various")) {
++ m_multiple->setChecked(false);
++ } else {
++ m_multiple->setChecked(true);
++ }
+ }
+
+ void CDInfoDialogBase::genreChanged( const QString &newGenre )
+--- libkcddb/client.cpp (revision 438734)
++++ libkcddb/client.cpp (revision 455136)
+@@ -216,8 +216,11 @@
+
+ emit finished( r );
+
+- cdInfoLookup->deleteLater();
+- cdInfoLookup = 0L;
++ if ( cdInfoLookup ) // in case someone called lookup() while finished() was being processed, and deleted cdInfoLookup.
++ {
++ cdInfoLookup->deleteLater();
++ cdInfoLookup = 0L;
++ }
+ }
+
+ void
+--- noatun/modules/winskin/winskin.plugin (revision 438734)
++++ noatun/modules/winskin/winskin.plugin (revision 455136)
+@@ -40,7 +40,7 @@
+ Name[nb]=WinAmp-grensesnitt
+ Name[nl]=WinAmp-interface
+ Name[nn]=WinAmp-grensesnitt
+-Name[pl]=Interfejs WinAmpa
++Name[pl]=Motyw WinAmpa
+ Name[pt]=Interface do WinAmp
+ Name[pt_BR]=Interface WinAmp
+ Name[ro]=Interfaţă WinAmp
+--- noatun/modules/excellent/excellent.plugin (revision 438734)
++++ noatun/modules/excellent/excellent.plugin (revision 455136)
+@@ -18,6 +18,7 @@
+ Name[et]=Suurepärane
+ Name[eu]=Aparta
+ Name[fi]=Erinomainen
++Name[ga]=Sármhaith
+ Name[hi]=एक्सेलेंट
+ Name[hr]=Odlično
+ Name[is]=Frábært
+@@ -30,7 +31,7 @@
+ Name[mt]=Eċċellenti
+ Name[nb]=Fantastisk
+ Name[nn]=Fantastisk
+-Name[pl]=Doskonale
++Name[pl]=Doskonały
+ Name[pt]=Excelente
+ Name[pt_BR]=Excelente
+ Name[ro]=Excelent
+@@ -82,7 +83,7 @@
+ Comment[nb]=Et svært vanlig og brukervennlig grensesnitt
+ Comment[nl]=Een heel gewone, en daarom erg bruikbare, interface
+ Comment[nn]=Eit svært normalt og difor lettbrukt grensesnitt
+-Comment[pl]=Bardzo zwyczajny, ale przez to bardzo użyteczny interfejs
++Comment[pl]=Bardzo zwyczajny, ale przez to bardzo użyteczny motyw
+ Comment[pt]=Uma interface básica e, por isso, muito fácil de usar
+ Comment[pt_BR]=Uma interface bem ordinária e portanto muito utilizável
+ Comment[ro]=O interfaţă foarte simplă şi foarte utilă
+--- noatun/modules/simple/simple.plugin (revision 438734)
++++ noatun/modules/simple/simple.plugin (revision 455136)
+@@ -73,6 +73,7 @@
+ Comment[eu]=GUI sinplea (bideo kapsulatua)
+ Comment[fi]=Yksinkertainen käyttöliittymä (upotettu video)
+ Comment[fr]=Interface graphique simple (video incorporée)
++Comment[ga]=GUI Simplí (fís leabaithe)
+ Comment[he]=ממשק משתמש גרפי פשוט (וידאו מוטבע)
+ Comment[hi]=साधारण जीयूआई (एम्बेडेड वीडियो)
+ Comment[hu]=Egyszerű kezelőfelület (beágyazott videó)
+@@ -85,7 +86,7 @@
+ Comment[nb]=Enkel GUI (innebygget video)
+ Comment[nl]=Eenvoudige GUI (inbedbare video)
+ Comment[nn]=Enkelt grensesnitt (innebygd video)
+-Comment[pl]=Zwykły interfejs uzytkownika (osadzone wideo)
++Comment[pl]=Zwykły motyw (osadzone wideo)
+ Comment[pt]=Interface Simples (vídeo embebido)
+ Comment[pt_BR]=Interface Simples (vídeo integrado)
+ Comment[ro]=Interfaţă grafică simplă (video integrat)
+--- noatun/modules/kaiman/kaiman.plugin (revision 438734)
++++ noatun/modules/kaiman/kaiman.plugin (revision 455136)
+@@ -21,6 +21,7 @@
+ Name[eu]=Kaiman interfazea
+ Name[fi]=Kaiman-käyttöliittymä
+ Name[fr]=Interface de Kaiman
++Name[ga]=Comhéadan Kaiman
+ Name[he]=Kaiman
+ Name[hi]= काईमेन इंटरफेस
+ Name[hr]=Kaiman sučelje
+@@ -36,7 +37,7 @@
+ Name[nb]=Kaiman grensesnitt
+ Name[nl]=Kaiman interface
+ Name[nn]=Kaiman-grensesnitt
+-Name[pl]=Interfejs Kaimana
++Name[pl]=Motyw Kaimana
+ Name[pt]=Interface do Kaiman
+ Name[pt_BR]=Interface do Kaiman
+ Name[ro]=Interfaţă Kaiman
+@@ -92,7 +93,7 @@
+ Comment[nb]=Et GQMpeg ham-grensesnitt tatt fra Kaiman
+ Comment[nl]=Een GQMpeg-skin-interface, overgedragen van Kaiman
+ Comment[nn]=Eit GQMpeg-skalgrensesnitt porta frå Kaiman
+-Comment[pl]=Interfejs skór GQMpeg przeniesiony z Kaimana
++Comment[pl]=Motyw skór GQMpeg przeniesiony z Kaimana
+ Comment[pt]=A interface de aspectos do GQMpeg transposta para o Kaiman
+ Comment[pt_BR]=Uma interface de aparência (skin) GQMpeg portada do Kaiman
+ Comment[ro]=O interfaţă GQMpeg portată de la Kaiman
+--- noatun/modules/noatunui/noatunui.plugin (revision 438734)
++++ noatun/modules/noatunui/noatunui.plugin (revision 455136)
+@@ -81,7 +81,7 @@
+ Comment[nb]=Noatuns enkle GUI
+ Comment[nl]=Noatun's eenvoudige GUI
+ Comment[nn]=Det enkle Noatun-GUI-et
+-Comment[pl]=Prosty interfejs graficzny Noatun
++Comment[pl]=Prosty motyw Noatun
+ Comment[pt]=Uma interface simples do Noatun
+ Comment[pt_BR]=Interface simplificada do Noatun
+ Comment[ro]=Interfaţă grafică Noatun simplă
+--- noatun/modules/monoscope/monoscope.plugin (revision 438734)
++++ noatun/modules/monoscope/monoscope.plugin (revision 455136)
+@@ -66,7 +66,7 @@
+ Comment[nb]=Et nett lite program for analysering av «waveform scope»
+ Comment[nl]=Een goed waveform scope-analyseprogramma
+ Comment[nn]=Analysering av «waveform scope»
+-Comment[pl]=Analizator zakresu fal
++Comment[pl]=Analizator fal dźwiękowych
+ Comment[pt]=Um analisador de formas de onda bonito
+ Comment[pt_BR]=Um analisador de formas de onda
+ Comment[ro]=Un analizor de formă de undă foarte bun
+--- noatun/modules/splitplaylist/splitplaylist.plugin (revision 438734)
++++ noatun/modules/splitplaylist/splitplaylist.plugin (revision 455136)
+@@ -35,7 +35,7 @@
+ Name[nb]=Splittet spilleliste
+ Name[nl]=Gesplitste speellijst
+ Name[nn]=Delt speleliste
+-Name[pl]=Podziel listę nagrań
++Name[pl]=Zwykła lista odtwarzania
+ Name[pt]=Lista de Músicas Split
+ Name[pt_BR]=A lista de reprodução dividida
+ Name[ro]=Împarte lista de redare
+@@ -79,7 +79,7 @@
+ Comment[nb]=Den unøyaktig navngitte spillelisten
+ Comment[nl]=De inaccuraat getitelde afspeellijst
+ Comment[nn]=Spelelista med unøyaktig namn
+-Comment[pl]=Niedokładnie nazwana lista nagrań
++Comment[pl]=Zwykła, prosta lista odtwarzania
+ Comment[pt]=A lista mal intitulada
+ Comment[pt_BR]=A lista de reprodução erroneamente intitulada
+ Comment[ro]=Listă de redare incorect denumită
+--- noatun/modules/systray/systray.plugin (revision 438734)
++++ noatun/modules/systray/systray.plugin (revision 455136)
+@@ -12,6 +12,7 @@
+ Name[eo]=Juna hikorio
+ Name[es]=Joven Nogal
+ Name[et]=Noor hikkor
++Name[fi]=Nuori Hickory
+ Name[fr]=Jeune Hickory
+ Name[he]=מגש מערכת
+ Name[hi]=यंग हिकॉरी
+--- kmix/mixer_sun.cpp (revision 438734)
++++ kmix/mixer_sun.cpp (revision 455136)
+@@ -135,7 +135,7 @@
+ // FUNCTION : Mixer::Mixer
+ // DESCRIPTION : Class destructor.
+ //======================================================================
+-Mixer_SUN::~Mixer_SUN(int devnum) : Mixer_Backend(devnum)
++Mixer_SUN::~Mixer_SUN()
+ {
+ close();
+ }
+@@ -159,7 +159,7 @@
+ if(audiodev.isNull())
+ audiodev = "/dev/audio";
+ audiodev += "ctl";
+- if ( ( fd = open( audiodev.data(), O_RDWR ) ) < 0 )
++ if ( ( fd = ::open( audiodev.data(), O_RDWR ) ) < 0 )
+ {
+ if ( errno == EACCES )
+ return Mixer::ERR_PERM;
+--- kfile-plugins/theora/kfile_theora.desktop (revision 438734)
++++ kfile-plugins/theora/kfile_theora.desktop (revision 455136)
+@@ -10,6 +10,7 @@
+ Name[es]=Info Theora
+ Name[et]=Theora info
+ Name[eu]=theora informazioa
++Name[fi]=Theoran tiedot
+ Name[fr]=Informations theora
+ Name[hi]=थ्योरा जानकारी
+ Name[hu]=Theora-jellemzők
+--- kioslave/audiocd/plugins/flac/encoderflac.cpp (revision 438734)
++++ kioslave/audiocd/plugins/flac/encoderflac.cpp (revision 455136)
+@@ -31,7 +31,7 @@
+
+ extern "C"
+ {
+- void create_audiocd_encoders(KIO::SlaveBase *slave, QPtrList<AudioCDEncoder> &encoders)
++ KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, QPtrList<AudioCDEncoder> &encoders)
+ {
+ encoders.append(new EncoderFLAC(slave));
+ }
+--- kioslave/audiocd/plugins/lame/encoderlame.cpp (revision 438734)
++++ kioslave/audiocd/plugins/lame/encoderlame.cpp (revision 455136)
+@@ -244,6 +244,7 @@
+ #else
+ QStringList libpaths, libnames;
+ libpaths << QFL1("/usr/lib/")
++ << QFL1("/usr/lib64/")
+ << QFL1("/usr/local/lib/")
+ << QString::null;
+
+--- kioslave/audiocd/kcmaudiocd/audiocd.desktop (revision 438734)
++++ kioslave/audiocd/kcmaudiocd/audiocd.desktop (revision 455136)
+@@ -121,6 +121,7 @@
+ Keywords[eu]=Audio CD,CD,Ogg,Vorbis,Kdeketa,CDDA,bit-maiztasuna
+ Keywords[fi]=Ääni-CD,CD,Ogg,Vorbis,Koodaus,CDDA,Bittinopeus
+ Keywords[fr]=CD audio,CD,Ogg,Vorbis,Encodage,CDDA,débit
++Keywords[ga]=CD Fuaime,CD,Ogg,Vorbis,Ionchódú,CDDA,Ráta Giotán
+ Keywords[hi]=ऑडियो सीडी,सीडी,ऑग,वॉर्बिस,एनकोडिंग,सीडीडीए,बिटरेट
+ Keywords[hu]=hang-CD,CD,Ogg,Vorbis,kódolás,CDDA,bitráta
+ Keywords[it]=CD Audio,Ogg,Vorbis,Codifica,CDDA,Bitrate
+--- kioslave/audiocd/audiocd.cpp (revision 438734)
++++ kioslave/audiocd/audiocd.cpp (revision 455136)
+@@ -366,6 +366,7 @@
+ kdDebug(7117) << "cdda_open failed" << endl;
+
+ error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.path());
++ cdda_close(drive);
+ return 0;
+ }
+
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-08-30 17:15:47 UTC (rev 1615)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-08-30 17:42:23 UTC (rev 1616)
@@ -1,6 +1,7 @@
-diff -Nru kdemultimedia-3.4.2.orig/acinclude.m4 kdemultimedia-3.4.2/acinclude.m4
---- kdemultimedia-3.4.2.orig/acinclude.m4 2005-07-20 20:10:24.000000000 +0000
-+++ kdemultimedia-3.4.2/acinclude.m4 2005-07-27 16:53:36.534527208 +0000
+#DPATCHLEVEL=0
+# vi: ft=diff
+--- acinclude.m4
++++ acinclude.m4
@@ -1688,15 +1688,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -1516,49 +1517,24 @@
AC_MSG_RESULT([$SED])
])
-diff -Nru kdemultimedia-3.4.2.orig/aclocal.m4 kdemultimedia-3.4.2/aclocal.m4
---- kdemultimedia-3.4.2.orig/aclocal.m4 2005-07-20 20:10:40.000000000 +0000
-+++ kdemultimedia-3.4.2/aclocal.m4 2005-07-27 16:54:00.847831024 +0000
-@@ -522,6 +522,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
+--- akode/arts_plugin/Makefile.in
++++ akode/arts_plugin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes. -*- Autoconf -*-
+@@ -17,8 +17,6 @@
- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff -Nru kdemultimedia-3.4.2.orig/akode/arts_plugin/Makefile.in kdemultimedia-3.4.2/akode/arts_plugin/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/arts_plugin/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/arts_plugin/Makefile.in 2005-07-27 16:57:02.360236944 +0000
-@@ -260,6 +260,9 @@
+
+
+-SOURCES = $(libarts_akode_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -260,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1568,8 +1544,19 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -510,9 +511,7 @@
+ akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp akodeXiphPlayObject_impl.cpp \
+ akodeVorbisStreamPlayObject_impl.cpp akodeSpeexStreamPlayObject_impl.cpp
+-#>- libarts_akode_la_LDFLAGS = -L$(top_srcdir)/akode/lib $(KDE_LDFLAGS) $(KDE_RPATH) -module -avoid-version -no-undefined
+-#>+ 1
+-libarts_akode_la_LDFLAGS = -L$(top_srcdir)/akode/lib $(KDE_LDFLAGS) $(KDE_RPATH) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
++libarts_akode_la_LDFLAGS = -module $(KDE_PLUGIN)
+ libarts_akode_la_LIBADD = ../lib/libakode.la -lkmedia2_idl -lsoundserver_idl -lartsflow
+ #>- libarts_akode_la_METASOURCES = AUTO
+ mcoptypedir = $(libdir)/mcop
+@@ -526,7 +525,7 @@
+
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -1577,7 +1564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -564,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1589,7 +1576,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -900,7 +903,7 @@
+@@ -900,7 +899,7 @@
#>+ 2
@@ -1598,10 +1585,24 @@
#>+ 3
clean-closures:
-diff -Nru kdemultimedia-3.4.2.orig/akode/lib/Makefile.in kdemultimedia-3.4.2/akode/lib/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/lib/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/lib/Makefile.in 2005-07-27 16:57:02.388232688 +0000
-@@ -264,6 +264,9 @@
+--- akode/lib/Makefile.in
++++ akode/lib/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libakode_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1611,7 +1612,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -540,7 +541,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1620,7 +1621,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -578,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1632,9 +1633,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/akode/Makefile.in kdemultimedia-3.4.2/akode/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/Makefile.in 2005-07-27 16:57:02.332241200 +0000
+--- akode/Makefile.in
++++ akode/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1666,10 +1672,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/alsa_sink/Makefile.in kdemultimedia-3.4.2/akode/plugins/alsa_sink/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/alsa_sink/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/alsa_sink/Makefile.in 2005-07-27 16:57:02.424227216 +0000
-@@ -243,6 +243,9 @@
+--- akode/plugins/alsa_sink/Makefile.in
++++ akode/plugins/alsa_sink/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libakode_alsa_sink_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1679,7 +1699,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -499,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1688,7 +1708,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1700,10 +1720,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/jack_sink/Makefile.in kdemultimedia-3.4.2/akode/plugins/jack_sink/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/jack_sink/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/jack_sink/Makefile.in 2005-07-27 16:57:02.444224176 +0000
-@@ -243,6 +243,9 @@
+--- akode/plugins/jack_sink/Makefile.in
++++ akode/plugins/jack_sink/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libakode_jack_sink_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1713,7 +1747,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -499,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1722,7 +1756,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1734,9 +1768,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/Makefile.in kdemultimedia-3.4.2/akode/plugins/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/Makefile.in 2005-07-27 16:57:02.403230408 +0000
+--- akode/plugins/Makefile.in
++++ akode/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -218,6 +218,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1768,10 +1807,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/mpc_decoder/Makefile.in kdemultimedia-3.4.2/akode/plugins/mpc_decoder/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/mpc_decoder/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/mpc_decoder/Makefile.in 2005-07-27 16:57:02.468220528 +0000
-@@ -260,6 +260,9 @@
+--- akode/plugins/mpc_decoder/Makefile.in
++++ akode/plugins/mpc_decoder/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libakode_mpc_decoder_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -260,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1781,7 +1834,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -519,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1790,7 +1843,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -557,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1802,10 +1855,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in kdemultimedia-3.4.2/akode/plugins/mpc_decoder/mppdec/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-07-27 16:57:02.488217488 +0000
-@@ -235,6 +235,9 @@
+--- akode/plugins/mpc_decoder/mppdec/Makefile.in
++++ akode/plugins/mpc_decoder/mppdec/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libakode_mppdec_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -235,6 +233,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1815,7 +1882,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -490,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1824,7 +1891,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1836,10 +1903,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/mpeg_decoder/Makefile.in kdemultimedia-3.4.2/akode/plugins/mpeg_decoder/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/mpeg_decoder/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/mpeg_decoder/Makefile.in 2005-07-27 16:57:02.512213840 +0000
-@@ -247,6 +247,9 @@
+--- akode/plugins/mpeg_decoder/Makefile.in
++++ akode/plugins/mpeg_decoder/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libakode_mpeg_decoder_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1849,7 +1930,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -505,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1858,7 +1939,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -543,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1870,10 +1951,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/oss_sink/Makefile.in kdemultimedia-3.4.2/akode/plugins/oss_sink/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/oss_sink/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/oss_sink/Makefile.in 2005-07-27 16:57:02.534210496 +0000
-@@ -243,6 +243,9 @@
+--- akode/plugins/oss_sink/Makefile.in
++++ akode/plugins/oss_sink/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libakode_oss_sink_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1883,7 +1978,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -499,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1892,7 +1987,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1904,10 +1999,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/polyp_sink/Makefile.in kdemultimedia-3.4.2/akode/plugins/polyp_sink/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/polyp_sink/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/polyp_sink/Makefile.in 2005-07-27 16:57:02.555207304 +0000
-@@ -243,6 +243,9 @@
+--- akode/plugins/polyp_sink/Makefile.in
++++ akode/plugins/polyp_sink/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libakode_polyp_sink_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1917,7 +2026,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -499,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1926,7 +2035,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1938,10 +2047,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/src_resampler/Makefile.in kdemultimedia-3.4.2/akode/plugins/src_resampler/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/src_resampler/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/src_resampler/Makefile.in 2005-07-27 16:57:02.575204264 +0000
-@@ -244,6 +244,9 @@
+--- akode/plugins/src_resampler/Makefile.in
++++ akode/plugins/src_resampler/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libakode_src_resampler_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1951,7 +2074,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -500,7 +501,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1960,7 +2083,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -538,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1972,10 +2095,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/akode/plugins/xiph_decoder/Makefile.in kdemultimedia-3.4.2/akode/plugins/xiph_decoder/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/plugins/xiph_decoder/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/plugins/xiph_decoder/Makefile.in 2005-07-27 16:57:02.598200768 +0000
-@@ -254,6 +254,9 @@
+--- akode/plugins/xiph_decoder/Makefile.in
++++ akode/plugins/xiph_decoder/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libakode_xiph_decoder_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -1985,7 +2122,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -515,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -1994,7 +2131,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2006,7 +2143,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -840,7 +843,7 @@
+@@ -840,7 +841,7 @@
#>+ 2
@@ -2015,10 +2152,24 @@
#>+ 3
clean-closures:
-diff -Nru kdemultimedia-3.4.2.orig/akode/test/Makefile.in kdemultimedia-3.4.2/akode/test/Makefile.in
---- kdemultimedia-3.4.2.orig/akode/test/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/akode/test/Makefile.in 2005-07-27 16:57:02.616198032 +0000
-@@ -236,6 +236,9 @@
+--- akode/test/Makefile.in
++++ akode/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(akodeplay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -236,6 +234,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2028,7 +2179,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -490,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2037,7 +2188,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2049,10 +2200,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/arts/builder/Makefile.in kdemultimedia-3.4.2/arts/builder/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/builder/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/builder/Makefile.in 2005-07-27 16:57:02.692186480 +0000
-@@ -283,6 +283,9 @@
+--- arts/builder/Makefile.in
++++ arts/builder/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(artsbuilder_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2062,7 +2227,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -561,7 +562,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2071,7 +2236,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -599,9 +600,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2083,7 +2248,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1102,7 +1105,7 @@
+@@ -1102,7 +1103,7 @@
-rm -f qttableview.moc interfacedlg.moc mwidget.moc portposdlg.moc main.moc execdlg.moc retrievedlg.moc propertypanel.moc menumaker.moc
#>+ 2
@@ -2092,9 +2257,14 @@
#>+ 4
clean-ui:
-diff -Nru kdemultimedia-3.4.2.orig/arts/builder/pics/Makefile.in kdemultimedia-3.4.2/arts/builder/pics/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/builder/pics/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/builder/pics/Makefile.in 2005-07-27 16:57:02.735179944 +0000
+--- arts/builder/pics/Makefile.in
++++ arts/builder/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -224,6 +224,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2157,9 +2327,14 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/arts/examples/Makefile.in kdemultimedia-3.4.2/arts/examples/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/examples/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/examples/Makefile.in 2005-07-27 16:57:02.753177208 +0000
+--- arts/examples/Makefile.in
++++ arts/examples/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -213,6 +213,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2200,10 +2375,24 @@
#>+ 2
docs-am:
-diff -Nru kdemultimedia-3.4.2.orig/arts/gui/common/Makefile.in kdemultimedia-3.4.2/arts/gui/common/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/gui/common/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/gui/common/Makefile.in 2005-07-27 16:57:02.807169000 +0000
-@@ -256,6 +256,9 @@
+--- arts/gui/common/Makefile.in
++++ arts/gui/common/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libartsgui_la_SOURCES) $(libartsgui_idl_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -256,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2213,7 +2402,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -532,7 +533,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2222,7 +2411,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -570,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2234,10 +2423,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/arts/gui/kde/Makefile.in kdemultimedia-3.4.2/arts/gui/kde/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/gui/kde/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/gui/kde/Makefile.in 2005-07-27 16:57:02.894155776 +0000
-@@ -294,6 +294,9 @@
+--- arts/gui/kde/Makefile.in
++++ arts/gui/kde/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libartsgui_kde_la_SOURCES) $(artstestgui_SOURCES) $(dbtest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -294,6 +292,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2247,7 +2450,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2256,7 +2459,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2268,7 +2471,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1122,18 +1125,18 @@
+@@ -1122,18 +1123,18 @@
mocs: kcombobox_impl.moc
#>+ 3
@@ -2293,7 +2496,7 @@
#>+ 3
kbutton_impl.moc: $(srcdir)/kbutton_impl.h
-@@ -1157,18 +1160,18 @@
+@@ -1157,18 +1158,18 @@
mocs: kpoti.moc
#>+ 3
@@ -2318,7 +2521,7 @@
#>+ 3
kpoti_impl.moc: $(srcdir)/kpoti_impl.h
-@@ -1200,10 +1203,10 @@
+@@ -1200,10 +1201,10 @@
#>+ 3
clean-metasources:
@@ -2331,7 +2534,7 @@
#>+ 3
clean-closures:
-@@ -1251,7 +1254,7 @@
+@@ -1251,7 +1252,7 @@
#>+ 11
@@ -2340,9 +2543,14 @@
@echo 'creating libartsgui_kde_la.all_cpp.cpp ...'; \
rm -f libartsgui_kde_la.all_cpp.files libartsgui_kde_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libartsgui_kde_la.all_cpp.final; \
-diff -Nru kdemultimedia-3.4.2.orig/arts/gui/kde/mcopclass/Makefile.in kdemultimedia-3.4.2/arts/gui/kde/mcopclass/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/gui/kde/mcopclass/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/gui/kde/mcopclass/Makefile.in 2005-07-27 16:57:02.911153192 +0000
+--- arts/gui/kde/mcopclass/Makefile.in
++++ arts/gui/kde/mcopclass/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2383,9 +2591,14 @@
#>+ 2
docs-am:
-diff -Nru kdemultimedia-3.4.2.orig/arts/gui/Makefile.in kdemultimedia-3.4.2/arts/gui/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/gui/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/gui/Makefile.in 2005-07-27 16:57:02.774174016 +0000
+--- arts/gui/Makefile.in
++++ arts/gui/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2417,9 +2630,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/arts/Makefile.in kdemultimedia-3.4.2/arts/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/Makefile.in 2005-07-27 16:57:02.631195752 +0000
+--- arts/Makefile.in
++++ arts/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2451,10 +2669,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/arts/midi/Makefile.in kdemultimedia-3.4.2/arts/midi/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/midi/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/midi/Makefile.in 2005-07-27 16:57:02.964145136 +0000
-@@ -312,6 +312,9 @@
+--- arts/midi/Makefile.in
++++ arts/midi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -20,8 +20,6 @@
+
+
+
+-SOURCES = $(libartsmidi_la_SOURCES) $(libartsmidi_idl_la_SOURCES) $(midisend_SOURCES) $(midisynctest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -312,6 +310,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2464,7 +2696,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -2473,7 +2705,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2485,7 +2717,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1151,7 +1154,7 @@
+@@ -1151,7 +1152,7 @@
#>+ 2
@@ -2494,9 +2726,14 @@
#>+ 3
clean-closures:
-diff -Nru kdemultimedia-3.4.2.orig/arts/midi/mcopclass/Makefile.in kdemultimedia-3.4.2/arts/midi/mcopclass/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/midi/mcopclass/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/midi/mcopclass/Makefile.in 2005-07-27 16:57:02.980142704 +0000
+--- arts/midi/mcopclass/Makefile.in
++++ arts/midi/mcopclass/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2528,10 +2765,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/arts/modules/common/Makefile.in kdemultimedia-3.4.2/arts/modules/common/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/modules/common/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/modules/common/Makefile.in 2005-07-27 16:57:03.044132976 +0000
-@@ -269,6 +269,9 @@
+--- arts/modules/common/Makefile.in
++++ arts/modules/common/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libartsmodulescommon_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -269,6 +267,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2541,7 +2792,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -563,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2550,7 +2801,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2562,10 +2813,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/arts/modules/effects/freeverb/Makefile.in kdemultimedia-3.4.2/arts/modules/effects/freeverb/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/modules/effects/freeverb/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/modules/effects/freeverb/Makefile.in 2005-07-27 16:57:03.114122336 +0000
-@@ -236,6 +236,9 @@
+--- arts/modules/effects/freeverb/Makefile.in
++++ arts/modules/effects/freeverb/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libfreeverb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -236,6 +234,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2575,7 +2840,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -487,7 +488,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2584,7 +2849,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -525,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2596,7 +2861,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -758,7 +761,7 @@
+@@ -758,7 +759,7 @@
.NOEXPORT:
#>+ 2
@@ -2605,10 +2870,24 @@
#>+ 2
docs-am:
-diff -Nru kdemultimedia-3.4.2.orig/arts/modules/effects/Makefile.in kdemultimedia-3.4.2/arts/modules/effects/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/modules/effects/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/modules/effects/Makefile.in 2005-07-27 16:57:03.091125832 +0000
-@@ -292,6 +292,9 @@
+--- arts/modules/effects/Makefile.in
++++ arts/modules/effects/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libartsmoduleseffects_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2618,7 +2897,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -2627,7 +2906,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2639,10 +2918,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/arts/modules/Makefile.in kdemultimedia-3.4.2/arts/modules/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/modules/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/modules/Makefile.in 2005-07-27 16:57:03.011137992 +0000
-@@ -274,6 +274,9 @@
+--- arts/modules/Makefile.in
++++ arts/modules/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libartsmodules_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2652,7 +2945,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -573,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2661,7 +2954,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -611,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2673,7 +2966,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1023,7 +1026,7 @@
+@@ -1023,7 +1024,7 @@
#>+ 2
@@ -2682,10 +2975,24 @@
#>+ 3
clean-closures:
-diff -Nru kdemultimedia-3.4.2.orig/arts/modules/mixers/Makefile.in kdemultimedia-3.4.2/arts/modules/mixers/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/modules/mixers/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/modules/mixers/Makefile.in 2005-07-27 16:57:03.145117624 +0000
-@@ -267,6 +267,9 @@
+--- arts/modules/mixers/Makefile.in
++++ arts/modules/mixers/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libartsmodulesmixers_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2695,7 +3002,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -567,7 +568,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2704,7 +3011,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -605,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2716,10 +3023,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/arts/modules/synth/Makefile.in kdemultimedia-3.4.2/arts/modules/synth/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/modules/synth/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/modules/synth/Makefile.in 2005-07-27 16:57:03.193110328 +0000
-@@ -297,6 +297,9 @@
+--- arts/modules/synth/Makefile.in
++++ arts/modules/synth/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libartsmodulessynth_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2729,7 +3050,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -602,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -2738,7 +3059,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2750,10 +3071,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/arts/runtime/Makefile.in kdemultimedia-3.4.2/arts/runtime/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/runtime/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/runtime/Makefile.in 2005-07-27 16:57:03.226105312 +0000
-@@ -264,6 +264,9 @@
+--- arts/runtime/Makefile.in
++++ arts/runtime/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -21,8 +21,6 @@
+
+
+
+-SOURCES = $(libartsbuilder_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2763,7 +3098,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -541,7 +542,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -2772,7 +3107,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2784,7 +3119,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -914,7 +917,7 @@
+@@ -914,7 +915,7 @@
#>+ 2
@@ -2793,10 +3128,24 @@
#>+ 3
clean-closures:
-diff -Nru kdemultimedia-3.4.2.orig/arts/tools/Makefile.in kdemultimedia-3.4.2/arts/tools/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/tools/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/tools/Makefile.in 2005-07-27 16:57:03.298094368 +0000
-@@ -300,6 +300,9 @@
+--- arts/tools/Makefile.in
++++ arts/tools/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libartscontrolapplet_la_SOURCES) $(libartscontrolsupport_la_SOURCES) $(artscontrol_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -300,6 +298,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -2806,7 +3155,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +624,7 @@
+@@ -621,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -2815,7 +3164,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -659,9 +662,9 @@
+@@ -659,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2827,7 +3176,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1173,18 +1176,18 @@
+@@ -1173,18 +1174,18 @@
mocs: audiomanager.moc
#>+ 3
@@ -2852,7 +3201,7 @@
#>+ 3
choosebusdlg.moc: $(srcdir)/choosebusdlg.h
-@@ -1253,10 +1256,10 @@
+@@ -1253,10 +1254,10 @@
#>+ 3
clean-metasources:
@@ -2865,9 +3214,14 @@
#>+ 5
clean-ui:
-diff -Nru kdemultimedia-3.4.2.orig/arts/tools/pics/Makefile.in kdemultimedia-3.4.2/arts/tools/pics/Makefile.in
---- kdemultimedia-3.4.2.orig/arts/tools/pics/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/arts/tools/pics/Makefile.in 2005-07-27 16:57:03.336088592 +0000
+--- arts/tools/pics/Makefile.in
++++ arts/tools/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3086,10 +3440,24 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/audiofile_artsplugin/Makefile.in kdemultimedia-3.4.2/audiofile_artsplugin/Makefile.in
---- kdemultimedia-3.4.2.orig/audiofile_artsplugin/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/audiofile_artsplugin/Makefile.in 2005-07-27 16:57:03.367083880 +0000
-@@ -254,6 +254,9 @@
+--- audiofile_artsplugin/Makefile.in
++++ audiofile_artsplugin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libaudiofilearts_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -3099,7 +3467,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -518,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -3108,7 +3476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -556,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3120,7 +3488,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -886,7 +889,7 @@
+@@ -886,7 +887,7 @@
#>+ 2
@@ -3129,9 +3497,8 @@
#>+ 3
clean-closures:
-diff -Nru kdemultimedia-3.4.2.orig/configure kdemultimedia-3.4.2/configure
---- kdemultimedia-3.4.2.orig/configure 2005-07-20 20:12:16.000000000 +0000
-+++ kdemultimedia-3.4.2/configure 2005-07-27 16:57:14.572380416 +0000
+--- configure
++++ configure
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -9322,9 +9689,8 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nru kdemultimedia-3.4.2.orig/configure.in kdemultimedia-3.4.2/configure.in
---- kdemultimedia-3.4.2.orig/configure.in 2005-07-20 20:10:26.000000000 +0000
-+++ kdemultimedia-3.4.2/configure.in 2005-07-27 16:53:38.018301640 +0000
+--- configure.in
++++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdemultimedia, "3.4.2") dnl searches for some needed programs
@@ -9334,9 +9700,14 @@
KDE_SET_PREFIX
dnl generate the config header
-diff -Nru kdemultimedia-3.4.2.orig/doc/artsbuilder/images/Makefile.in kdemultimedia-3.4.2/doc/artsbuilder/images/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/artsbuilder/images/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/artsbuilder/images/Makefile.in 2005-07-27 16:57:03.438073088 +0000
+--- doc/artsbuilder/images/Makefile.in
++++ doc/artsbuilder/images/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9402,9 +9773,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdemultimedia-3.4.2.orig/doc/artsbuilder/Makefile.in kdemultimedia-3.4.2/doc/artsbuilder/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/artsbuilder/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/artsbuilder/Makefile.in 2005-07-27 16:57:03.412077040 +0000
+--- doc/artsbuilder/Makefile.in
++++ doc/artsbuilder/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9473,9 +9849,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdemultimedia-3.4.2.orig/doc/juk/Makefile.in kdemultimedia-3.4.2/doc/juk/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/juk/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/juk/Makefile.in 2005-07-27 16:57:03.455070504 +0000
+--- doc/juk/Makefile.in
++++ doc/juk/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9544,9 +9925,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdemultimedia-3.4.2.orig/doc/kaboodle/Makefile.in kdemultimedia-3.4.2/doc/kaboodle/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/kaboodle/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/kaboodle/Makefile.in 2005-07-27 16:57:03.471068072 +0000
+--- doc/kaboodle/Makefile.in
++++ doc/kaboodle/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9587,9 +9973,14 @@
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nru kdemultimedia-3.4.2.orig/doc/kcontrol/kmixcfg/Makefile.in kdemultimedia-3.4.2/doc/kcontrol/kmixcfg/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/kcontrol/kmixcfg/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/kcontrol/kmixcfg/Makefile.in 2005-07-27 16:57:03.503063208 +0000
+--- doc/kcontrol/kmixcfg/Makefile.in
++++ doc/kcontrol/kmixcfg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9630,9 +10021,14 @@
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nru kdemultimedia-3.4.2.orig/doc/kcontrol/Makefile.in kdemultimedia-3.4.2/doc/kcontrol/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/kcontrol/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/kcontrol/Makefile.in 2005-07-27 16:57:03.488065488 +0000
+--- doc/kcontrol/Makefile.in
++++ doc/kcontrol/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9664,9 +10060,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/doc/kio_audiocd/Makefile.in kdemultimedia-3.4.2/doc/kio_audiocd/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/kio_audiocd/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/kio_audiocd/Makefile.in 2005-07-27 16:57:03.518060928 +0000
+--- doc/kio_audiocd/Makefile.in
++++ doc/kio_audiocd/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9698,9 +10099,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/doc/kmid/Makefile.in kdemultimedia-3.4.2/doc/kmid/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/kmid/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/kmid/Makefile.in 2005-07-27 16:57:03.534058496 +0000
+--- doc/kmid/Makefile.in
++++ doc/kmid/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9741,9 +10147,14 @@
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nru kdemultimedia-3.4.2.orig/doc/kmix/Makefile.in kdemultimedia-3.4.2/doc/kmix/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/kmix/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/kmix/Makefile.in 2005-07-27 16:57:03.553055608 +0000
+--- doc/kmix/Makefile.in
++++ doc/kmix/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9812,9 +10223,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdemultimedia-3.4.2.orig/doc/krec/Makefile.in kdemultimedia-3.4.2/doc/krec/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/krec/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/krec/Makefile.in 2005-07-27 16:57:03.571052872 +0000
+--- doc/krec/Makefile.in
++++ doc/krec/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9883,9 +10299,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdemultimedia-3.4.2.orig/doc/kscd/Makefile.in kdemultimedia-3.4.2/doc/kscd/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/kscd/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/kscd/Makefile.in 2005-07-27 16:57:03.588050288 +0000
+--- doc/kscd/Makefile.in
++++ doc/kscd/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9954,9 +10375,14 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nru kdemultimedia-3.4.2.orig/doc/Makefile.in kdemultimedia-3.4.2/doc/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/Makefile.in 2005-07-27 16:57:03.388080688 +0000
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9995,9 +10421,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/doc/noatun/Makefile.in kdemultimedia-3.4.2/doc/noatun/Makefile.in
---- kdemultimedia-3.4.2.orig/doc/noatun/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/doc/noatun/Makefile.in 2005-07-27 16:57:03.603048008 +0000
+--- doc/noatun/Makefile.in
++++ doc/noatun/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10038,10 +10469,24 @@
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nru kdemultimedia-3.4.2.orig/juk/Makefile.in kdemultimedia-3.4.2/juk/Makefile.in
---- kdemultimedia-3.4.2.orig/juk/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/juk/Makefile.in 2005-07-27 16:57:03.834012896 +0000
-@@ -326,6 +326,9 @@
+--- juk/Makefile.in
++++ juk/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(juk_SOURCES) $(tagguessertest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -326,6 +324,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10051,7 +10496,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -732,7 +735,7 @@
+@@ -732,7 +733,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10060,7 +10505,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -770,9 +773,9 @@
+@@ -770,9 +771,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10072,7 +10517,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1276,18 +1279,18 @@
+@@ -1276,18 +1277,18 @@
mocs: collectionlist.moc
#>+ 3
@@ -10097,7 +10542,7 @@
#>+ 3
artsplayer.moc: $(srcdir)/artsplayer.h
-@@ -1297,18 +1300,18 @@
+@@ -1297,18 +1298,18 @@
mocs: artsplayer.moc
#>+ 3
@@ -10122,7 +10567,7 @@
#>+ 3
directorylist.moc: $(srcdir)/directorylist.h
-@@ -1437,18 +1440,18 @@
+@@ -1437,18 +1438,18 @@
mocs: searchwidget.moc
#>+ 3
@@ -10147,7 +10592,7 @@
#>+ 3
playlistbox.moc: $(srcdir)/playlistbox.h
-@@ -1458,18 +1461,18 @@
+@@ -1458,18 +1459,18 @@
mocs: playlistbox.moc
#>+ 3
@@ -10172,7 +10617,7 @@
#>+ 3
gstreamerplayer.moc: $(srcdir)/gstreamerplayer.h
-@@ -1529,10 +1532,10 @@
+@@ -1529,10 +1530,10 @@
#>+ 3
clean-metasources:
@@ -10185,7 +10630,7 @@
#>+ 4
clean-idl:
-@@ -1557,23 +1560,23 @@
+@@ -1557,23 +1558,23 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
$(INSTALL_DATA) $(srcdir)/cr64-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
@@ -10215,9 +10660,14 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/juk.png
#>+ 15
-diff -Nru kdemultimedia-3.4.2.orig/juk/pics/Makefile.in kdemultimedia-3.4.2/juk/pics/Makefile.in
---- kdemultimedia-3.4.2.orig/juk/pics/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/juk/pics/Makefile.in 2005-07-27 16:57:03.848010768 +0000
+--- juk/pics/Makefile.in
++++ juk/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10249,9 +10699,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/kaboodle/actions/Makefile.in kdemultimedia-3.4.2/kaboodle/actions/Makefile.in
---- kdemultimedia-3.4.2.orig/kaboodle/actions/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kaboodle/actions/Makefile.in 2005-07-27 16:57:03.918999976 +0000
+--- kaboodle/actions/Makefile.in
++++ kaboodle/actions/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10301,10 +10756,24 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/kaboodle/Makefile.in kdemultimedia-3.4.2/kaboodle/Makefile.in
---- kdemultimedia-3.4.2.orig/kaboodle/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kaboodle/Makefile.in 2005-07-27 16:57:03.904002256 +0000
-@@ -291,6 +291,9 @@
+--- kaboodle/Makefile.in
++++ kaboodle/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkaboodle_noinst_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10314,7 +10783,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -567,7 +568,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10323,7 +10792,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -605,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10335,7 +10804,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1087,20 +1090,6 @@
+@@ -1087,20 +1088,6 @@
.NOEXPORT:
#>+ 3
@@ -10356,7 +10825,7 @@
userinterface.moc: $(srcdir)/userinterface.h
$(MOC) $(srcdir)/userinterface.h -o userinterface.moc
-@@ -1122,13 +1111,6 @@
+@@ -1122,13 +1109,6 @@
mocs: kaboodle_factory.moc
#>+ 3
@@ -10370,7 +10839,7 @@
player.moc: $(srcdir)/player.h
$(MOC) $(srcdir)/player.h -o player.moc
-@@ -1142,6 +1124,27 @@
+@@ -1142,6 +1122,27 @@
#>+ 2
mocs: conf.moc
@@ -10398,7 +10867,7 @@
#>+ 8
libkaboodlepart.la.closure: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES)
@echo "int main() {return 0;}" > libkaboodlepart_la_closure.cpp
-@@ -1153,10 +1156,10 @@
+@@ -1153,10 +1154,10 @@
#>+ 3
clean-metasources:
@@ -10411,7 +10880,7 @@
#>+ 3
clean-closures:
-@@ -1204,7 +1207,7 @@
+@@ -1204,7 +1205,7 @@
#>+ 11
@@ -10420,7 +10889,7 @@
@echo 'creating libkaboodle_noinst_la.all_cpp.cpp ...'; \
rm -f libkaboodle_noinst_la.all_cpp.files libkaboodle_noinst_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkaboodle_noinst_la.all_cpp.final; \
-@@ -1266,8 +1269,8 @@
+@@ -1266,8 +1267,8 @@
kaboodle_factory.lo: kaboodle_factory.moc
nmcheck:
conf.o: conf.moc
@@ -10430,9 +10899,14 @@
nmcheck-am: nmcheck
player.lo: player.moc
userinterface.o: userinterface.moc
-diff -Nru kdemultimedia-3.4.2.orig/kaboodle/pics/Makefile.in kdemultimedia-3.4.2/kaboodle/pics/Makefile.in
---- kdemultimedia-3.4.2.orig/kaboodle/pics/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kaboodle/pics/Makefile.in 2005-07-27 16:57:03.940996632 +0000
+--- kaboodle/pics/Makefile.in
++++ kaboodle/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10500,9 +10974,14 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/kappfinder-data/Makefile.in kdemultimedia-3.4.2/kappfinder-data/Makefile.in
---- kdemultimedia-3.4.2.orig/kappfinder-data/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kappfinder-data/Makefile.in 2005-07-27 16:57:03.956994200 +0000
+--- kappfinder-data/Makefile.in
++++ kappfinder-data/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10541,9 +11020,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/kaudiocreator/icons/Makefile.in kdemultimedia-3.4.2/kaudiocreator/icons/Makefile.in
---- kdemultimedia-3.4.2.orig/kaudiocreator/icons/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kaudiocreator/icons/Makefile.in 2005-07-27 16:57:04.031982800 +0000
+--- kaudiocreator/icons/Makefile.in
++++ kaudiocreator/icons/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10575,10 +11059,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/kaudiocreator/Makefile.in kdemultimedia-3.4.2/kaudiocreator/Makefile.in
---- kdemultimedia-3.4.2.orig/kaudiocreator/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kaudiocreator/Makefile.in 2005-07-27 16:57:04.017984928 +0000
-@@ -280,6 +280,9 @@
+--- kaudiocreator/Makefile.in
++++ kaudiocreator/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kaudiocreator_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10588,7 +11086,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -551,7 +552,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10597,7 +11095,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10609,7 +11107,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1058,13 +1061,6 @@
+@@ -1058,13 +1059,6 @@
.NOEXPORT:
#>+ 3
@@ -10623,7 +11121,7 @@
encodefileimp.moc: $(srcdir)/encodefileimp.h
$(MOC) $(srcdir)/encodefileimp.h -o encodefileimp.moc
-@@ -1072,18 +1068,18 @@
+@@ -1072,18 +1066,18 @@
mocs: encodefileimp.moc
#>+ 3
@@ -10648,7 +11146,7 @@
#>+ 3
kaudiocreator.moc: $(srcdir)/kaudiocreator.h
-@@ -1093,11 +1089,11 @@
+@@ -1093,11 +1087,11 @@
mocs: kaudiocreator.moc
#>+ 3
@@ -10663,7 +11161,7 @@
#>+ 3
ripper.moc: $(srcdir)/ripper.h
-@@ -1107,8 +1103,15 @@
+@@ -1107,8 +1101,15 @@
mocs: ripper.moc
#>+ 3
@@ -10680,7 +11178,7 @@
#>+ 2
KDE_DIST=encoderedit.ui prefs.kcfgc lo16-app-kaudiocreator.png eventsrc encoderconfig.ui.h encoder_prefs.kcfgc encoderoutput.ui encoderconfig.ui kaudiocreator_encoders.kcfg wizard.ui.h ripconfig.ui Makefile.in job.h encoder_prefs_addons.h kaudiocreator-meta.upd general.ui.h kaudiocreator.kcfg upgrade-kaudiocreator-metadata.sh cdconfig.ui tracks.ui jobque.ui kaudiocreatorui.rc encodefile.ui kaudiocreator_workman.h cr32-app-kaudiocreator.png wizard.ui cr16-app-kaudiocreator.png kaudiocreator-libkcddb.upd configure.in.in general.ui infodialog.ui lo32-app-kaudiocreator.png Makefile.am
-@@ -1139,20 +1142,20 @@
+@@ -1139,20 +1140,20 @@
#>+ 16
install-kde-icons:
@@ -10707,7 +11205,7 @@
#>+ 15
force-reedit:
-@@ -1193,7 +1196,7 @@
+@@ -1193,7 +1194,7 @@
#>+ 11
@@ -10716,7 +11214,7 @@
@echo 'creating kaudiocreator.all_cpp.cpp ...'; \
rm -f kaudiocreator.all_cpp.files kaudiocreator.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kaudiocreator.all_cpp.final; \
-@@ -1244,8 +1247,8 @@
+@@ -1244,8 +1245,8 @@
encodefileimp.lo: encodefileimp.moc
kaudiocreator.lo: kaudiocreator.moc
$(srcdir)/tracksimp.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h
@@ -10726,7 +11224,7 @@
tracksimp.o: tracksimp.moc
encoder.o: encoder.moc
nmcheck:
-@@ -1255,8 +1258,8 @@
+@@ -1255,8 +1256,8 @@
nmcheck-am: nmcheck
$(srcdir)/encoder.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h
ripper.lo: ripper.moc
@@ -10736,10 +11234,24 @@
$(srcdir)/job.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h
#>+ 177
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/au/Makefile.in kdemultimedia-3.4.2/kfile-plugins/au/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/au/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/au/Makefile.in 2005-07-27 16:57:04.072976568 +0000
-@@ -249,6 +249,9 @@
+--- kfile-plugins/au/Makefile.in
++++ kfile-plugins/au/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_au_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10749,7 +11261,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10758,7 +11270,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10770,10 +11282,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/avi/Makefile.in kdemultimedia-3.4.2/kfile-plugins/avi/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/avi/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/avi/Makefile.in 2005-07-27 16:57:04.100972312 +0000
-@@ -249,6 +249,9 @@
+--- kfile-plugins/avi/Makefile.in
++++ kfile-plugins/avi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_avi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10783,7 +11309,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10792,7 +11318,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10804,10 +11330,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/flac/Makefile.in kdemultimedia-3.4.2/kfile-plugins/flac/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/flac/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/flac/Makefile.in 2005-07-27 16:57:04.131967600 +0000
-@@ -249,6 +249,9 @@
+--- kfile-plugins/flac/Makefile.in
++++ kfile-plugins/flac/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_flac_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10817,7 +11357,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10826,7 +11366,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10838,10 +11378,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/m3u/Makefile.in kdemultimedia-3.4.2/kfile-plugins/m3u/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/m3u/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/m3u/Makefile.in 2005-07-27 16:57:04.155963952 +0000
-@@ -249,6 +249,9 @@
+--- kfile-plugins/m3u/Makefile.in
++++ kfile-plugins/m3u/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_m3u_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10851,7 +11405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10860,7 +11414,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10872,9 +11426,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/Makefile.in kdemultimedia-3.4.2/kfile-plugins/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/Makefile.in 2005-07-27 16:57:04.047980368 +0000
+--- kfile-plugins/Makefile.in
++++ kfile-plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10906,10 +11465,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/mp3/Makefile.in kdemultimedia-3.4.2/kfile-plugins/mp3/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/mp3/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/mp3/Makefile.in 2005-07-27 16:57:04.181960000 +0000
-@@ -249,6 +249,9 @@
+--- kfile-plugins/mp3/Makefile.in
++++ kfile-plugins/mp3/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_mp3_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10919,7 +11492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10928,7 +11501,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10940,10 +11513,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/mpc/Makefile.in kdemultimedia-3.4.2/kfile-plugins/mpc/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/mpc/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/mpc/Makefile.in 2005-07-27 16:57:04.206956200 +0000
-@@ -249,6 +249,9 @@
+--- kfile-plugins/mpc/Makefile.in
++++ kfile-plugins/mpc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_mpc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10953,7 +11540,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10962,7 +11549,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10974,10 +11561,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/ogg/Makefile.in kdemultimedia-3.4.2/kfile-plugins/ogg/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/ogg/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/ogg/Makefile.in 2005-07-27 16:57:04.234951944 +0000
-@@ -260,6 +260,9 @@
+--- kfile-plugins/ogg/Makefile.in
++++ kfile-plugins/ogg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_ogg_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -260,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -10987,7 +11588,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -524,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -10996,7 +11597,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11008,10 +11609,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/sid/Makefile.in kdemultimedia-3.4.2/kfile-plugins/sid/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/sid/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/sid/Makefile.in 2005-07-27 16:57:04.258948296 +0000
-@@ -249,6 +249,9 @@
+--- kfile-plugins/sid/Makefile.in
++++ kfile-plugins/sid/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_sid_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11021,7 +11636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11030,7 +11645,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11042,10 +11657,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/theora/Makefile.in kdemultimedia-3.4.2/kfile-plugins/theora/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/theora/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/theora/Makefile.in 2005-07-27 16:57:04.285944192 +0000
-@@ -249,6 +249,9 @@
+--- kfile-plugins/theora/Makefile.in
++++ kfile-plugins/theora/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_theora_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11055,7 +11684,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11064,7 +11693,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11076,10 +11705,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kfile-plugins/wav/Makefile.in kdemultimedia-3.4.2/kfile-plugins/wav/Makefile.in
---- kdemultimedia-3.4.2.orig/kfile-plugins/wav/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kfile-plugins/wav/Makefile.in 2005-07-27 16:57:04.309940544 +0000
-@@ -249,6 +249,9 @@
+--- kfile-plugins/wav/Makefile.in
++++ kfile-plugins/wav/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_wav_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11089,7 +11732,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11098,7 +11741,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11110,10 +11753,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/kcmaudiocd/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/kcmaudiocd/Makefile.in
---- kdemultimedia-3.4.2.orig/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-07-27 16:57:04.377930208 +0000
-@@ -250,6 +250,9 @@
+--- kioslave/audiocd/kcmaudiocd/Makefile.in
++++ kioslave/audiocd/kcmaudiocd/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kcm_audiocd_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -250,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11123,7 +11780,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -508,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11132,7 +11789,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11144,10 +11801,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/Makefile.in
---- kdemultimedia-3.4.2.orig/kioslave/audiocd/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kioslave/audiocd/Makefile.in 2005-07-27 16:57:04.351934160 +0000
-@@ -270,6 +270,9 @@
+--- kioslave/audiocd/Makefile.in
++++ kioslave/audiocd/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+
+
+
+-SOURCES = $(kio_audiocd_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11157,7 +11828,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -535,7 +536,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11166,7 +11837,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -573,9 +574,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11178,10 +11849,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/flac/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/flac/Makefile.in
---- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/flac/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/flac/Makefile.in 2005-07-27 16:57:04.425922912 +0000
-@@ -244,6 +244,9 @@
+--- kioslave/audiocd/plugins/flac/Makefile.in
++++ kioslave/audiocd/plugins/flac/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libaudiocd_encoder_flac_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11191,7 +11876,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -502,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11200,7 +11885,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -540,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11212,10 +11897,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/lame/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/lame/Makefile.in
---- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/lame/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/lame/Makefile.in 2005-07-27 16:57:04.457918048 +0000
-@@ -251,6 +251,9 @@
+--- kioslave/audiocd/plugins/lame/Makefile.in
++++ kioslave/audiocd/plugins/lame/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libaudiocd_encoder_lame_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11225,7 +11924,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -512,7 +513,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11234,7 +11933,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11246,10 +11945,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/Makefile.in
---- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/Makefile.in 2005-07-27 16:57:04.401926560 +0000
-@@ -264,6 +264,9 @@
+--- kioslave/audiocd/plugins/Makefile.in
++++ kioslave/audiocd/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -20,8 +20,6 @@
+ #endif
+
+
+-SOURCES = $(libaudiocdplugins_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11259,7 +11972,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -522,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11268,7 +11981,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -560,9 +563,9 @@
+@@ -560,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11280,10 +11993,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/vorbis/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/vorbis/Makefile.in
---- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-07-27 16:57:04.486913640 +0000
-@@ -252,6 +252,9 @@
+--- kioslave/audiocd/plugins/vorbis/Makefile.in
++++ kioslave/audiocd/plugins/vorbis/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libaudiocd_encoder_vorbis_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -252,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11293,7 +12020,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11302,7 +12029,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11314,10 +12041,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/wav/Makefile.in kdemultimedia-3.4.2/kioslave/audiocd/plugins/wav/Makefile.in
---- kdemultimedia-3.4.2.orig/kioslave/audiocd/plugins/wav/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kioslave/audiocd/plugins/wav/Makefile.in 2005-07-27 16:57:04.510909992 +0000
-@@ -247,6 +247,9 @@
+--- kioslave/audiocd/plugins/wav/Makefile.in
++++ kioslave/audiocd/plugins/wav/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libaudiocd_encoder_wav_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11327,7 +12068,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -505,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11336,7 +12077,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -543,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11348,9 +12089,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kioslave/Makefile.in kdemultimedia-3.4.2/kioslave/Makefile.in
---- kdemultimedia-3.4.2.orig/kioslave/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kioslave/Makefile.in 2005-07-27 16:57:04.325938112 +0000
+--- kioslave/Makefile.in
++++ kioslave/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11382,9 +12128,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/kmid/examples/Makefile.in kdemultimedia-3.4.2/kmid/examples/Makefile.in
---- kdemultimedia-3.4.2.orig/kmid/examples/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kmid/examples/Makefile.in 2005-07-27 16:57:04.634891144 +0000
+--- kmid/examples/Makefile.in
++++ kmid/examples/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11416,10 +12167,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/kmid/Makefile.in kdemultimedia-3.4.2/kmid/Makefile.in
---- kdemultimedia-3.4.2.orig/kmid/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kmid/Makefile.in 2005-07-27 16:57:04.620893272 +0000
-@@ -302,6 +302,9 @@
+--- kmid/Makefile.in
++++ kmid/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+
+
+
+-SOURCES = $(libkmidlib_la_SOURCES) $(libkmidpart_la_SOURCES) $(kmid_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -302,6 +300,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11429,7 +12194,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11438,7 +12203,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11450,7 +12215,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1290,13 +1293,6 @@
+@@ -1290,13 +1291,6 @@
mocs: channelcfgdlg.moc
#>+ 3
@@ -11464,7 +12229,7 @@
kmid_part.moc: $(srcdir)/kmid_part.h
$(MOC) $(srcdir)/kmid_part.h -o kmid_part.moc
-@@ -1304,11 +1300,11 @@
+@@ -1304,11 +1298,11 @@
mocs: kmid_part.moc
#>+ 3
@@ -11479,7 +12244,7 @@
#>+ 3
qslidertime.moc: $(srcdir)/qslidertime.h
-@@ -1318,6 +1314,13 @@
+@@ -1318,6 +1312,13 @@
mocs: qslidertime.moc
#>+ 3
@@ -11493,7 +12258,7 @@
kmidframe.moc: $(srcdir)/kmidframe.h
$(MOC) $(srcdir)/kmidframe.h -o kmidframe.moc
-@@ -1342,7 +1345,7 @@
+@@ -1342,7 +1343,7 @@
#>+ 3
clean-metasources:
@@ -11502,7 +12267,7 @@
#>+ 2
KDE_DIST=kmidbutton.h audiomidi.desktop PEOPLE std.sb kmidIface.h drums.sb instrname.i18n button1.xpm Makefile.in kmid.lsm kmid.desktop kmid_partui.rc x-karaoke.desktop cr16-app-kmid.png instrfilter.awk kmid.spec kmidui.rc history.txt configure.in.in button2.xpm cr32-app-kmid.png version.h keyboard.xpm cr48-app-kmid.png Makefile.am
-@@ -1363,15 +1366,15 @@
+@@ -1363,15 +1364,15 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
$(INSTALL_DATA) $(srcdir)/cr32-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmid.png
@@ -11521,7 +12286,7 @@
#>+ 15
force-reedit:
-@@ -1412,7 +1415,7 @@
+@@ -1412,7 +1413,7 @@
#>+ 11
@@ -11530,9 +12295,14 @@
@echo 'creating libkmidlib_la.all_cpp.cpp ...'; \
rm -f libkmidlib_la.all_cpp.files libkmidlib_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmidlib_la.all_cpp.final; \
-diff -Nru kdemultimedia-3.4.2.orig/kmid/maps/Makefile.in kdemultimedia-3.4.2/kmid/maps/Makefile.in
---- kdemultimedia-3.4.2.orig/kmid/maps/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kmid/maps/Makefile.in 2005-07-27 16:57:04.648889016 +0000
+--- kmid/maps/Makefile.in
++++ kmid/maps/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11564,9 +12334,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/kmid/pics/Makefile.in kdemultimedia-3.4.2/kmid/pics/Makefile.in
---- kdemultimedia-3.4.2.orig/kmid/pics/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kmid/pics/Makefile.in 2005-07-27 16:57:04.665886432 +0000
+--- kmid/pics/Makefile.in
++++ kmid/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11624,10 +12399,39 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/kmix/Makefile.in kdemultimedia-3.4.2/kmix/Makefile.in
---- kdemultimedia-3.4.2.orig/kmix/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kmix/Makefile.in 2005-07-27 16:57:04.827861808 +0000
-@@ -332,6 +332,9 @@
+--- kmix/Makefile.in
++++ kmix/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -149,8 +145,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \
++#>- $(kmixctrl_la_SOURCES)
++#>+ 2
+ SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \
+- $(kmixctrl_la_SOURCES)
++ $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES)
+ #>- DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \
+ #>- $(kmixctrl_la_SOURCES)
+ #>+ 2
+@@ -332,6 +331,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -11637,7 +12441,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -653,7 +656,7 @@
+@@ -653,7 +655,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11646,7 +12450,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -691,9 +694,9 @@
+@@ -691,9 +693,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11658,7 +12462,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1356,18 +1359,18 @@
+@@ -1356,18 +1358,18 @@
mocs: viewswitches.moc
#>+ 3
@@ -11683,7 +12487,7 @@
#>+ 3
ksmallslider.moc: $(srcdir)/ksmallslider.h
-@@ -1398,13 +1401,6 @@
+@@ -1398,13 +1400,6 @@
mocs: viewapplet.moc
#>+ 3
@@ -11697,7 +12501,7 @@
mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
$(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
-@@ -1412,11 +1408,11 @@
+@@ -1412,11 +1407,11 @@
mocs: mixdevicewidget.moc
#>+ 3
@@ -11712,7 +12516,7 @@
#>+ 3
dialogviewconfiguration.moc: $(srcdir)/dialogviewconfiguration.h
-@@ -1426,6 +1422,13 @@
+@@ -1426,6 +1421,13 @@
mocs: dialogviewconfiguration.moc
#>+ 3
@@ -11726,7 +12530,7 @@
kmixapplet.moc: $(srcdir)/kmixapplet.h
$(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
-@@ -1447,18 +1450,18 @@
+@@ -1447,18 +1449,18 @@
mocs: kmix.moc
#>+ 3
@@ -11751,7 +12555,7 @@
#>+ 3
mixdevice.moc: $(srcdir)/mixdevice.h
-@@ -1489,18 +1492,18 @@
+@@ -1489,18 +1491,18 @@
mocs: viewsurround.moc
#>+ 3
@@ -11776,7 +12580,7 @@
#>+ 3
kledbutton.moc: $(srcdir)/kledbutton.h
-@@ -1536,7 +1539,7 @@
+@@ -1536,7 +1538,7 @@
#>+ 3
clean-metasources:
@@ -11785,7 +12589,7 @@
#>+ 2
KDE_DIST=kmix.desktop resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop viewapplet.h mixer_irix.cpp mixer_sun.cpp kmixctrl_restore.desktop Makefile.in restore_kmix_volumes.desktop TestCases mixer_hpux.h mixer_irix.h mixer_none.cpp configure.in.in mixer_oss.cpp mixer_none.h mixer_alsa9.cpp Makefile.am mixer_oss.h
-@@ -1599,7 +1602,7 @@
+@@ -1599,7 +1601,7 @@
#>+ 11
@@ -11794,9 +12598,14 @@
@echo 'creating libkdeinit_kmix_la.all_cpp.cpp ...'; \
rm -f libkdeinit_kmix_la.all_cpp.files libkdeinit_kmix_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kmix_la.all_cpp.final; \
-diff -Nru kdemultimedia-3.4.2.orig/kmix/pics/Makefile.in kdemultimedia-3.4.2/kmix/pics/Makefile.in
---- kdemultimedia-3.4.2.orig/kmix/pics/Makefile.in 2005-07-20 20:12:11.000000000 +0000
-+++ kdemultimedia-3.4.2/kmix/pics/Makefile.in 2005-07-27 16:57:04.848858616 +0000
+--- kmix/pics/Makefile.in
++++ kmix/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11861,9 +12670,40 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/krec/Makefile.in kdemultimedia-3.4.2/krec/Makefile.in
---- kdemultimedia-3.4.2.orig/krec/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/krec/Makefile.in 2005-07-27 16:57:04.951842960 +0000
+--- krec/Makefile.in
++++ krec/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(kcm_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) $(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) $(libkrecexport_wave_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcm_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) $(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) $(libkrecexport_wave_la_SOURCES) $(krec_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -140,9 +136,13 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kcm_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) \
++#>- $(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) \
++#>- $(libkrecexport_wave_la_SOURCES)
++#>+ 3
+ SOURCES = $(kcm_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) \
+ $(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) \
+- $(libkrecexport_wave_la_SOURCES)
++ $(libkrecexport_wave_la_SOURCES) $(krec_SOURCES)
+ #>- DIST_SOURCES = $(kcm_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) \
+ #>- $(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) \
+ #>- $(libkrecexport_wave_la_SOURCES)
@@ -326,6 +326,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12044,10 +12884,24 @@
krecexport_template.lo: krecexport_template.moc
krecfileview.lo: krecfileview.moc
krecconfig_files.lo: krecconfig_files.moc
-diff -Nru kdemultimedia-3.4.2.orig/krec/mp3_export/Makefile.in kdemultimedia-3.4.2/krec/mp3_export/Makefile.in
---- kdemultimedia-3.4.2.orig/krec/mp3_export/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/krec/mp3_export/Makefile.in 2005-07-27 16:57:04.982838248 +0000
-@@ -247,6 +247,9 @@
+--- krec/mp3_export/Makefile.in
++++ krec/mp3_export/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkrecexport_mp3_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12057,7 +12911,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -514,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12066,7 +12920,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -552,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12078,10 +12932,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/krec/ogg_export/Makefile.in kdemultimedia-3.4.2/krec/ogg_export/Makefile.in
---- kdemultimedia-3.4.2.orig/krec/ogg_export/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/krec/ogg_export/Makefile.in 2005-07-27 16:57:05.006834600 +0000
-@@ -247,6 +247,9 @@
+--- krec/ogg_export/Makefile.in
++++ krec/ogg_export/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkrecexport_ogg_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12091,7 +12959,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -514,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12100,7 +12968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -552,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12112,9 +12980,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/krec/pics/Makefile.in kdemultimedia-3.4.2/krec/pics/Makefile.in
---- kdemultimedia-3.4.2.orig/krec/pics/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/krec/pics/Makefile.in 2005-07-27 16:57:05.024831864 +0000
+--- krec/pics/Makefile.in
++++ krec/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12179,9 +13052,14 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/kscd/bitmaps/Makefile.in kdemultimedia-3.4.2/kscd/bitmaps/Makefile.in
---- kdemultimedia-3.4.2.orig/kscd/bitmaps/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/kscd/bitmaps/Makefile.in 2005-07-27 16:57:05.134815144 +0000
+--- kscd/bitmaps/Makefile.in
++++ kscd/bitmaps/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12213,10 +13091,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/kscd/kscdmagic/Makefile.in kdemultimedia-3.4.2/kscd/kscdmagic/Makefile.in
---- kdemultimedia-3.4.2.orig/kscd/kscdmagic/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/kscd/kscdmagic/Makefile.in 2005-07-27 16:57:05.159811344 +0000
-@@ -266,6 +266,9 @@
+--- kscd/kscdmagic/Makefile.in
++++ kscd/kscdmagic/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -29,8 +29,6 @@
+ # kde_wallpaperdir Where general wallpapers should go to.
+
+
+-SOURCES = $(kscdmagic_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12226,7 +13118,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -534,7 +535,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -12235,7 +13127,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -572,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12247,10 +13139,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/kscd/libwm/audio/Makefile.in kdemultimedia-3.4.2/kscd/libwm/audio/Makefile.in
---- kdemultimedia-3.4.2.orig/kscd/libwm/audio/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/kscd/libwm/audio/Makefile.in 2005-07-27 16:57:05.211803440 +0000
-@@ -228,6 +228,9 @@
+--- kscd/libwm/audio/Makefile.in
++++ kscd/libwm/audio/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libworkmanaudio_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -228,6 +226,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12260,7 +13166,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -480,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12269,7 +13175,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -518,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12281,10 +13187,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/kscd/libwm/Makefile.in kdemultimedia-3.4.2/kscd/libwm/Makefile.in
---- kdemultimedia-3.4.2.orig/kscd/libwm/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/kscd/libwm/Makefile.in 2005-07-27 16:57:05.187807088 +0000
-@@ -259,6 +259,9 @@
+--- kscd/libwm/Makefile.in
++++ kscd/libwm/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -20,8 +20,6 @@
+ # shared library.
+ #
+
+-SOURCES = $(libworkman_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -259,6 +257,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12294,7 +13214,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -521,7 +522,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12303,7 +13223,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -559,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12315,10 +13235,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/kscd/Makefile.in kdemultimedia-3.4.2/kscd/Makefile.in
---- kdemultimedia-3.4.2.orig/kscd/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/kscd/Makefile.in 2005-07-27 16:57:05.119817424 +0000
-@@ -283,6 +283,9 @@
+--- kscd/Makefile.in
++++ kscd/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -20,8 +20,6 @@
+
+
+
+-SOURCES = $(kscd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12328,7 +13262,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -572,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12337,7 +13271,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12349,7 +13283,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1174,7 +1177,7 @@
+@@ -1174,7 +1175,7 @@
-rm -f bwlednum.moc kscd.moc docking.moc ledlamp.moc configWidget.moc kvolumecontrol.moc cddbdlg.moc
#>+ 2
@@ -12358,7 +13292,7 @@
#>+ 4
clean-idl:
-@@ -1199,24 +1202,24 @@
+@@ -1199,24 +1200,24 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions
$(INSTALL_DATA) $(srcdir)/cr22-action-cdsmall.png $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
@@ -12392,10 +13326,24 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/libkcddb/kcmcddb/Makefile.in kdemultimedia-3.4.2/libkcddb/kcmcddb/Makefile.in
---- kdemultimedia-3.4.2.orig/libkcddb/kcmcddb/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/libkcddb/kcmcddb/Makefile.in 2005-07-27 16:57:05.292791128 +0000
-@@ -250,6 +250,9 @@
+--- libkcddb/kcmcddb/Makefile.in
++++ libkcddb/kcmcddb/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kcm_cddb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -250,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12405,7 +13353,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -519,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12414,7 +13362,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -557,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12426,7 +13374,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -887,7 +890,7 @@
+@@ -887,7 +888,7 @@
-rm -f cddbconfigwidget.moc kcmcddb.moc
#>+ 2
@@ -12435,10 +13383,24 @@
#>+ 4
clean-ui:
-diff -Nru kdemultimedia-3.4.2.orig/libkcddb/Makefile.in kdemultimedia-3.4.2/libkcddb/Makefile.in
---- kdemultimedia-3.4.2.orig/libkcddb/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/libkcddb/Makefile.in 2005-07-27 16:57:05.261795840 +0000
-@@ -277,6 +277,9 @@
+--- libkcddb/Makefile.in
++++ libkcddb/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkcddb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -277,6 +275,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12448,7 +13410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -555,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12457,7 +13419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12469,7 +13431,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1011,32 +1014,32 @@
+@@ -1011,32 +1012,32 @@
.NOEXPORT:
#>+ 3
@@ -12514,7 +13476,7 @@
#>+ 3
asynchttplookup.moc: $(srcdir)/asynchttplookup.h
-@@ -1054,7 +1057,7 @@
+@@ -1054,7 +1055,7 @@
#>+ 3
clean-metasources:
@@ -12523,7 +13485,7 @@
#>+ 2
KDE_DIST=categories.h httplookup.h configbase.kcfgc asynccddbplookup.h asynchttplookup.h synchttplookup.h asyncsmtpsubmit.h genres.h Makefile.in lookup.h sites.h libkcddb.kcfg cdinfodialogbase.ui.h smtpsubmit.h asynchttpsubmit.h httpsubmit.h synchttpsubmit.h submit.h cdinfodialogbase.ui cddbplookup.h synccddbplookup.h syncsmtpsubmit.h Makefile.am
-@@ -1111,7 +1114,7 @@
+@@ -1111,7 +1112,7 @@
#>+ 11
@@ -12532,10 +13494,24 @@
@echo 'creating libkcddb_la.all_cpp.cpp ...'; \
rm -f libkcddb_la.all_cpp.files libkcddb_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkcddb_la.all_cpp.final; \
-diff -Nru kdemultimedia-3.4.2.orig/libkcddb/test/Makefile.in kdemultimedia-3.4.2/libkcddb/test/Makefile.in
---- kdemultimedia-3.4.2.orig/libkcddb/test/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/libkcddb/test/Makefile.in 2005-07-27 16:57:05.337784288 +0000
-@@ -300,6 +300,9 @@
+--- libkcddb/test/Makefile.in
++++ libkcddb/test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(asynccddblookuptest_SOURCES) $(asynchttplookuptest_SOURCES) $(asynchttpsubmittest_SOURCES) $(asyncsmtpsubmittest_SOURCES) $(sitestest_SOURCES) $(synccddblookuptest_SOURCES) $(synchttplookuptest_SOURCES) $(synchttpsubmittest_SOURCES) $(syncsmtpsubmittest_SOURCES) $(utf8test_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -300,6 +298,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12545,7 +13521,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12554,7 +13530,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12566,7 +13542,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -900,22 +903,22 @@
+@@ -900,22 +901,22 @@
mocs: asynccddblookuptest.moc
#>+ 3
@@ -12596,9 +13572,14 @@
#>+ 2
KDE_DIST=asynccddblookuptest.h asynchttplookuptest.h asyncsmtpsubmittest.h Makefile.in asynchttpsubmittest.h Makefile.am
-diff -Nru kdemultimedia-3.4.2.orig/Makefile.in kdemultimedia-3.4.2/Makefile.in
---- kdemultimedia-3.4.2.orig/Makefile.in 2005-07-20 20:12:10.000000000 +0000
-+++ kdemultimedia-3.4.2/Makefile.in 2005-07-27 16:57:02.318243328 +0000
+--- Makefile.in
++++ Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -234,6 +234,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12651,10 +13632,24 @@
#>+ 2
docs-am:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/cddaplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/cddaplay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/cddaplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/cddaplay/Makefile.in 2005-07-27 16:57:05.388776536 +0000
-@@ -240,6 +240,9 @@
+--- mpeglib/example/cddaplay/Makefile.in
++++ mpeglib/example/cddaplay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # splay-yaf - Makefile.am
+
+
+-SOURCES = $(cddaplay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -240,6 +238,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12664,7 +13659,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -496,7 +497,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12673,7 +13668,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -534,9 +535,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12685,9 +13680,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/Makefile.in kdemultimedia-3.4.2/mpeglib/example/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/Makefile.in 2005-07-27 16:57:05.369779424 +0000
+--- mpeglib/example/Makefile.in
++++ mpeglib/example/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12719,10 +13719,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/mpgplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/mpgplay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/mpgplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/mpgplay/Makefile.in 2005-07-27 16:57:05.406773800 +0000
-@@ -240,6 +240,9 @@
+--- mpeglib/example/mpgplay/Makefile.in
++++ mpeglib/example/mpgplay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # mpegplay-yaf - Makefile.am
+
+
+-SOURCES = $(mpgplay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -240,6 +238,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12732,7 +13746,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -497,7 +498,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12741,7 +13755,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12753,10 +13767,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/splay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/splay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/splay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/splay/Makefile.in 2005-07-27 16:57:05.428770456 +0000
-@@ -245,6 +245,9 @@
+--- mpeglib/example/splay/Makefile.in
++++ mpeglib/example/splay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # splay-yaf - Makefile.am
+
+
+-SOURCES = $(mp3framing_SOURCES) $(splay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -245,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12766,7 +13794,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -507,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12775,7 +13803,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -545,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12787,10 +13815,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/tplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/tplay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/tplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/tplay/Makefile.in 2005-07-27 16:57:05.453766656 +0000
-@@ -240,6 +240,9 @@
+--- mpeglib/example/tplay/Makefile.in
++++ mpeglib/example/tplay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # tplay-yaf - Makefile.am
+
+
+-SOURCES = $(tplay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -240,6 +238,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12800,7 +13842,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -497,7 +498,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12809,7 +13851,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12821,9 +13863,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/yaf/Makefile.in 2005-07-27 16:57:05.469764224 +0000
+--- mpeglib/example/yaf/Makefile.in
++++ mpeglib/example/yaf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -219,6 +219,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12855,10 +13902,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafcdda/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafcdda/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafcdda/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafcdda/Makefile.in 2005-07-27 16:57:05.489761184 +0000
-@@ -244,6 +244,9 @@
+--- mpeglib/example/yaf/yafcdda/Makefile.in
++++ mpeglib/example/yaf/yafcdda/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # splay-yaf - Makefile.am
+
+
+-SOURCES = $(yaf_cdda_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12868,7 +13929,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -502,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12877,7 +13938,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -540,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12889,10 +13950,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafcore/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafcore/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafcore/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafcore/Makefile.in 2005-07-27 16:57:05.513757536 +0000
-@@ -257,6 +257,9 @@
+--- mpeglib/example/yaf/yafcore/Makefile.in
++++ mpeglib/example/yaf/yafcore/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libyafshared - Makefile.am
+
+
+-SOURCES = $(libyafcore_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -257,6 +255,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12902,7 +13977,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -538,7 +539,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12911,7 +13986,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -576,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12923,10 +13998,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafmpgplay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-07-27 16:57:05.533754496 +0000
-@@ -244,6 +244,9 @@
+--- mpeglib/example/yaf/yafmpgplay/Makefile.in
++++ mpeglib/example/yaf/yafmpgplay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # mpegplay-yaf - Makefile.am
+
+
+-SOURCES = $(yaf_mpgplay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12936,7 +14025,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12945,7 +14034,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12957,10 +14046,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafsplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafsplay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafsplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafsplay/Makefile.in 2005-07-27 16:57:05.552751608 +0000
-@@ -244,6 +244,9 @@
+--- mpeglib/example/yaf/yafsplay/Makefile.in
++++ mpeglib/example/yaf/yafsplay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # splay-yaf - Makefile.am
+
+
+-SOURCES = $(yaf_splay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -12970,7 +14073,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12979,7 +14082,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12991,10 +14094,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yaftplay/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yaftplay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yaftplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/yaf/yaftplay/Makefile.in 2005-07-27 16:57:05.571748720 +0000
-@@ -244,6 +244,9 @@
+--- mpeglib/example/yaf/yaftplay/Makefile.in
++++ mpeglib/example/yaf/yaftplay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # tplay-yaf - Makefile.am
+
+
+-SOURCES = $(yaf_tplay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13004,7 +14121,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -502,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13013,7 +14130,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -540,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13025,10 +14142,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafvorbis/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafvorbis/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-07-27 16:57:05.591745680 +0000
-@@ -244,6 +244,9 @@
+--- mpeglib/example/yaf/yafvorbis/Makefile.in
++++ mpeglib/example/yaf/yafvorbis/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # splay-yaf - Makefile.am
+
+
+-SOURCES = $(yaf_vorbis_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13038,7 +14169,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -504,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13047,7 +14178,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -542,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13059,10 +14190,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafxplayer/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafxplayer/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-07-27 16:57:05.615742032 +0000
-@@ -256,6 +256,9 @@
+--- mpeglib/example/yaf/yafxplayer/Makefile.in
++++ mpeglib/example/yaf/yafxplayer/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libxplayer - Makefile.am
+
+
+-SOURCES = $(libyafxplayer_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -256,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13072,7 +14217,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -530,7 +531,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13081,7 +14226,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -568,9 +569,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13093,10 +14238,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafyuv/Makefile.in kdemultimedia-3.4.2/mpeglib/example/yaf/yafyuv/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/example/yaf/yafyuv/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/example/yaf/yafyuv/Makefile.in 2005-07-27 16:57:05.634739144 +0000
-@@ -244,6 +244,9 @@
+--- mpeglib/example/yaf/yafyuv/Makefile.in
++++ mpeglib/example/yaf/yafyuv/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # splay-yaf - Makefile.am
+
+
+-SOURCES = $(yaf_yuv_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -244,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13106,7 +14265,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13115,7 +14274,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13127,10 +14286,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/decoder/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/decoder/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/decoder/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/decoder/Makefile.in 2005-07-27 16:57:05.686731240 +0000
-@@ -253,6 +253,9 @@
+--- mpeglib/lib/decoder/Makefile.in
++++ mpeglib/lib/decoder/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libplayerplugin - Makefile.am
+
+
+-SOURCES = $(libdecoder_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -253,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13140,7 +14313,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -517,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13149,7 +14322,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13161,10 +14334,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/frame/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/frame/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/frame/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/frame/Makefile.in 2005-07-27 16:57:05.725725312 +0000
-@@ -253,6 +253,9 @@
+--- mpeglib/lib/frame/Makefile.in
++++ mpeglib/lib/frame/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # ---- @OS_TYPE@/@ARCH_TYPE@ ----
+
+
+-SOURCES = $(libframe_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -253,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13174,7 +14361,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -517,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13183,7 +14370,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13195,10 +14382,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/input/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/input/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/input/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/input/Makefile.in 2005-07-27 16:57:05.750721512 +0000
-@@ -259,6 +259,9 @@
+--- mpeglib/lib/input/Makefile.in
++++ mpeglib/lib/input/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libinputplugin - Makefile.am
+
+
+-SOURCES = $(libinput_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -259,6 +257,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13208,7 +14409,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -539,7 +540,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13217,7 +14418,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -577,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13229,10 +14430,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/Makefile.in 2005-07-27 16:57:05.663734736 +0000
-@@ -264,6 +264,9 @@
+--- mpeglib/lib/Makefile.in
++++ mpeglib/lib/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+ # player - Makefile.am
+
+-SOURCES = $(libmpeg_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13242,7 +14457,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -538,7 +539,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13251,7 +14466,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -576,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13263,10 +14478,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/mpegplay/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/mpegplay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/mpegplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/mpegplay/Makefile.in 2005-07-27 16:57:05.779717104 +0000
-@@ -274,6 +274,9 @@
+--- mpeglib/lib/mpegplay/Makefile.in
++++ mpeglib/lib/mpegplay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libsplay - Makefile.am
+
+
+-SOURCES = $(libmpegplay_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13276,7 +14505,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -564,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .S .cpp .lo .o .obj
@@ -13285,7 +14514,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -602,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13297,10 +14526,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/mpgplayer/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/mpgplayer/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/mpgplayer/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/mpgplayer/Makefile.in 2005-07-27 16:57:05.800713912 +0000
-@@ -246,6 +246,9 @@
+--- mpeglib/lib/mpgplayer/Makefile.in
++++ mpeglib/lib/mpgplayer/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libsplay - Makefile.am
+
+
+-SOURCES = $(libmpgplayer_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13310,7 +14553,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -500,7 +501,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13319,7 +14562,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -538,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13331,10 +14574,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/oggvorbis/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/oggvorbis/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/oggvorbis/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/oggvorbis/Makefile.in 2005-07-27 16:57:05.825710112 +0000
-@@ -251,6 +251,9 @@
+--- mpeglib/lib/oggvorbis/Makefile.in
++++ mpeglib/lib/oggvorbis/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # liboggvorbis - Makefile.am
+
+
+-SOURCES = $(liboggvorbisbase_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13344,7 +14601,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -509,7 +512,7 @@
+@@ -509,7 +510,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13353,7 +14610,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -547,9 +550,9 @@
+@@ -547,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13365,10 +14622,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/output/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/output/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/output/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/output/Makefile.in 2005-07-27 16:57:05.852706008 +0000
-@@ -257,6 +257,9 @@
+--- mpeglib/lib/output/Makefile.in
++++ mpeglib/lib/output/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # liboutplugin - Makefile.am
+
+
+-SOURCES = $(liboutput_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -257,6 +255,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13378,7 +14649,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -528,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13387,7 +14658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -566,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13399,10 +14670,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/splay/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/splay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/splay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/splay/Makefile.in 2005-07-27 16:57:05.888700536 +0000
-@@ -259,6 +259,9 @@
+--- mpeglib/lib/splay/Makefile.in
++++ mpeglib/lib/splay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libsplay - Makefile.am
+
+
+-SOURCES = $(libsplay_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -259,6 +257,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13412,7 +14697,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -539,7 +540,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13421,7 +14706,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -577,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13433,10 +14718,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/tplay/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/tplay/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/tplay/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/tplay/Makefile.in 2005-07-27 16:57:05.909697344 +0000
-@@ -241,6 +241,9 @@
+--- mpeglib/lib/tplay/Makefile.in
++++ mpeglib/lib/tplay/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libtplay - Makefile.am
+
+
+-SOURCES = $(libtplay_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -241,6 +239,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13446,7 +14745,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -497,7 +498,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13455,7 +14754,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13467,10 +14766,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/abstract/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/abstract/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/abstract/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/abstract/Makefile.in 2005-07-27 16:57:05.960689592 +0000
-@@ -249,6 +249,9 @@
+--- mpeglib/lib/util/abstract/Makefile.in
++++ mpeglib/lib/util/abstract/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # player - Makefile.am
+
+
+-SOURCES = $(libutilabstract_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13480,7 +14793,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13489,7 +14802,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13501,10 +14814,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/audio/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/audio/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/audio/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/audio/Makefile.in 2005-07-27 16:57:05.981686400 +0000
-@@ -241,6 +241,9 @@
+--- mpeglib/lib/util/audio/Makefile.in
++++ mpeglib/lib/util/audio/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # ---- @OS_TYPE@/@ARCH_TYPE@ ----
+
+
+-SOURCES = $(libaudio_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -241,6 +239,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13514,7 +14841,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -499,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13523,7 +14850,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13535,10 +14862,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/file/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/file/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/file/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/file/Makefile.in 2005-07-27 16:57:06.002683208 +0000
-@@ -246,6 +246,9 @@
+--- mpeglib/lib/util/file/Makefile.in
++++ mpeglib/lib/util/file/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libsplay - Makefile.am
+
+
+-SOURCES = $(libsimplefile_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13548,7 +14889,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -501,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13557,7 +14898,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -539,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13569,10 +14910,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/Makefile.in 2005-07-27 16:57:05.939692784 +0000
-@@ -267,6 +267,9 @@
+--- mpeglib/lib/util/Makefile.in
++++ mpeglib/lib/util/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # player - Makefile.am
+
+
+-SOURCES = $(libutil_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13582,7 +14937,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -536,7 +537,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13591,7 +14946,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -574,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13603,10 +14958,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/mmx/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/mmx/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/mmx/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/mmx/Makefile.in 2005-07-27 16:57:06.021680320 +0000
-@@ -242,6 +242,9 @@
+--- mpeglib/lib/util/mmx/Makefile.in
++++ mpeglib/lib/util/mmx/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -21,8 +21,6 @@
+ # (I dont have debugged why)
+
+
+-SOURCES = $(libmmx_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -242,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13616,7 +14985,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -498,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -13625,7 +14994,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -536,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13637,10 +15006,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/dither/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/dither/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/dither/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/render/dither/Makefile.in 2005-07-27 16:57:06.068673176 +0000
-@@ -247,6 +247,9 @@
+--- mpeglib/lib/util/render/dither/Makefile.in
++++ mpeglib/lib/util/render/dither/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # liboutplugin - Makefile.am
+
+
+-SOURCES = $(libdither_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -247,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13650,7 +15033,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -514,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13659,7 +15042,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -552,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13671,10 +15054,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/dither2YUV/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-07-27 16:57:06.089669984 +0000
-@@ -243,6 +243,9 @@
+--- mpeglib/lib/util/render/dither2YUV/Makefile.in
++++ mpeglib/lib/util/render/dither2YUV/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libdivxplugin - Makefile.am
+
+
+-SOURCES = $(libdivxutil_dither_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13684,7 +15081,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -501,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13693,7 +15090,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -539,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13705,10 +15102,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/render/Makefile.in 2005-07-27 16:57:06.046676520 +0000
-@@ -267,6 +267,9 @@
+--- mpeglib/lib/util/render/Makefile.in
++++ mpeglib/lib/util/render/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # player - Makefile.am
+
+
+-SOURCES = $(libutilrender_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13718,7 +15129,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -533,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13727,7 +15138,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -571,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13739,10 +15150,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/sdl/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/sdl/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/sdl/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/render/sdl/Makefile.in 2005-07-27 16:57:06.109666944 +0000
-@@ -241,6 +241,9 @@
+--- mpeglib/lib/util/render/sdl/Makefile.in
++++ mpeglib/lib/util/render/sdl/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # player - Makefile.am
+
+
+-SOURCES = $(libutilsdl_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -241,6 +239,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13752,7 +15177,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,7 +497,7 @@
+@@ -494,7 +495,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13761,7 +15186,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -532,9 +535,9 @@
+@@ -532,9 +533,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13773,10 +15198,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/x11/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/util/render/x11/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/util/render/x11/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/util/render/x11/Makefile.in 2005-07-27 16:57:06.136662840 +0000
-@@ -243,6 +243,9 @@
+--- mpeglib/lib/util/render/x11/Makefile.in
++++ mpeglib/lib/util/render/x11/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # player - Makefile.am
+
+
+-SOURCES = $(libutilx11_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -243,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13786,7 +15225,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13795,7 +15234,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13807,10 +15246,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/lib/yuv/Makefile.in kdemultimedia-3.4.2/mpeglib/lib/yuv/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/lib/yuv/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/lib/yuv/Makefile.in 2005-07-27 16:57:06.156659800 +0000
-@@ -246,6 +246,9 @@
+--- mpeglib/lib/yuv/Makefile.in
++++ mpeglib/lib/yuv/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # libplayerplugin - Makefile.am
+
+
+-SOURCES = $(libyuvPlugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13820,7 +15273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -501,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13829,7 +15282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -539,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13841,9 +15294,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib/Makefile.in kdemultimedia-3.4.2/mpeglib/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib/Makefile.in 2005-07-20 20:12:12.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib/Makefile.in 2005-07-27 16:57:05.353781856 +0000
+--- mpeglib/Makefile.in
++++ mpeglib/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -220,6 +220,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13875,10 +15333,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/mpeglib_artsplug/Makefile.in kdemultimedia-3.4.2/mpeglib_artsplug/Makefile.in
---- kdemultimedia-3.4.2.orig/mpeglib_artsplug/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpeglib_artsplug/Makefile.in 2005-07-27 16:57:06.188654936 +0000
-@@ -287,6 +287,9 @@
+--- mpeglib_artsplug/Makefile.in
++++ mpeglib_artsplug/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -20,8 +20,6 @@
+
+
+
+-SOURCES = $(libarts_mpeglib_la_SOURCES) $(libarts_splay_la_SOURCES) $(mpeglibartsplay_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13888,7 +15360,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -612,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13897,7 +15369,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -650,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13909,7 +15381,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1018,7 +1021,7 @@
+@@ -1018,7 +1019,7 @@
.NOEXPORT:
#>+ 2
@@ -13918,10 +15390,24 @@
#>+ 2
docs-am:
-diff -Nru kdemultimedia-3.4.2.orig/mpg123_artsplugin/Makefile.in kdemultimedia-3.4.2/mpg123_artsplugin/Makefile.in
---- kdemultimedia-3.4.2.orig/mpg123_artsplugin/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpg123_artsplugin/Makefile.in 2005-07-27 16:57:06.217650528 +0000
-@@ -278,6 +278,9 @@
+--- mpg123_artsplugin/Makefile.in
++++ mpg123_artsplugin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libmpg123arts_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13931,7 +15417,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -542,7 +543,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -13940,7 +15426,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13952,10 +15438,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/mpg123_artsplugin/mpg123/Makefile.in kdemultimedia-3.4.2/mpg123_artsplugin/mpg123/Makefile.in
---- kdemultimedia-3.4.2.orig/mpg123_artsplugin/mpg123/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/mpg123_artsplugin/mpg123/Makefile.in 2005-07-27 16:57:06.262643688 +0000
-@@ -315,6 +315,9 @@
+--- mpg123_artsplugin/mpg123/Makefile.in
++++ mpg123_artsplugin/mpg123/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ # $Id: Makefile.am 169017 2002-07-27 09:29:23Z coolo $
+
+
+-SOURCES = $(libmp486_la_SOURCES) $(libmp586_la_SOURCES) $(libmp586mmx_la_SOURCES) $(libmp686_la_SOURCES) $(libmp686mmx_la_SOURCES) $(libmpg123_la_SOURCES) $(libmpplain_la_SOURCES) $(libmpppc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -315,6 +313,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13965,7 +15465,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj .s
@@ -13974,7 +15474,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13986,10 +15486,37 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/app/Makefile.in kdemultimedia-3.4.2/noatun/app/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/app/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/app/Makefile.in 2005-07-27 16:57:06.319635024 +0000
-@@ -258,6 +258,9 @@
+--- noatun/app/Makefile.in
++++ noatun/app/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,10 +16,6 @@
+ @SET_MAKE@
+
+
+-#>- SOURCES = $(noatun_la_SOURCES)
+-#>+ 1
+-SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -100,7 +96,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(noatun_la_SOURCES)
++#>- SOURCES = $(noatun_la_SOURCES)
++#>+ 1
++SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES)
+ #>- DIST_SOURCES = $(noatun_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES)
+@@ -258,6 +256,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -13999,7 +15526,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -518,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14008,7 +15535,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -556,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14020,10 +15547,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/library/Makefile.in kdemultimedia-3.4.2/noatun/library/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/library/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/library/Makefile.in 2005-07-27 16:57:06.442616328 +0000
-@@ -301,6 +301,9 @@
+--- noatun/library/Makefile.in
++++ noatun/library/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+
+
+
+-SOURCES = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14033,7 +15574,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14042,7 +15583,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14054,7 +15595,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1102,18 +1105,18 @@
+@@ -1102,18 +1103,18 @@
mocs: mimetypetree.moc
#>+ 3
@@ -14079,7 +15620,7 @@
#>+ 3
vequalizer.moc: $(srcdir)/noatun/vequalizer.h
-@@ -1207,18 +1210,18 @@
+@@ -1207,18 +1208,18 @@
mocs: playlist.moc
#>+ 3
@@ -14104,7 +15645,7 @@
#>+ 3
effectview.moc: $(srcdir)/effectview.h
-@@ -1252,7 +1255,7 @@
+@@ -1252,7 +1253,7 @@
#>+ 3
clean-metasources:
@@ -14113,7 +15654,7 @@
#>+ 2
KDE_DIST=pluginmodule.h noatunlistview.h Makefile.in titleproxy.h equalizerwidget.ui spline.h globalvideo.h Makefile.am
-@@ -1308,7 +1311,7 @@
+@@ -1308,7 +1309,7 @@
#>+ 11
@@ -14122,9 +15663,14 @@
@echo 'creating libnoatun_la.all_cpp.cpp ...'; \
rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \
-diff -Nru kdemultimedia-3.4.2.orig/noatun/library/noatun/Makefile.in kdemultimedia-3.4.2/noatun/library/noatun/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/library/noatun/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/library/noatun/Makefile.in 2005-07-27 16:57:06.459613744 +0000
+--- noatun/library/noatun/Makefile.in
++++ noatun/library/noatun/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -214,6 +214,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14156,10 +15702,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/library/noatunarts/Makefile.in kdemultimedia-3.4.2/noatun/library/noatunarts/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/library/noatunarts/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/library/noatunarts/Makefile.in 2005-07-27 16:57:06.492608728 +0000
-@@ -262,6 +262,9 @@
+--- noatun/library/noatunarts/Makefile.in
++++ noatun/library/noatunarts/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libnoatunarts_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14169,7 +15729,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -534,7 +535,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -14178,7 +15738,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -572,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14190,10 +15750,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/library/noatuntags/Makefile.in kdemultimedia-3.4.2/noatun/library/noatuntags/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/library/noatuntags/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/library/noatuntags/Makefile.in 2005-07-27 16:57:06.515605232 +0000
-@@ -246,6 +246,9 @@
+--- noatun/library/noatuntags/Makefile.in
++++ noatun/library/noatuntags/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libnoatuntags_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14203,7 +15777,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14212,7 +15786,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14224,10 +15798,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/Makefile.in kdemultimedia-3.4.2/noatun/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/Makefile.in 2005-07-27 16:57:06.290639432 +0000
-@@ -41,7 +41,7 @@
+--- noatun/Makefile.in
++++ noatun/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(noatun20update_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -41,7 +39,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@@ -14236,7 +15824,7 @@
subdir = noatun
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING TODO
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -52,10 +52,10 @@
+@@ -52,10 +50,10 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -14250,7 +15838,7 @@
am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
#>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
#>+ 1
-@@ -263,6 +263,9 @@
+@@ -263,6 +261,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14260,7 +15848,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,6 +517,7 @@
+@@ -514,6 +515,7 @@
presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
updatedir = $(kde_datadir)/kconf_update
update_DATA = noatun.upd
@@ -14268,7 +15856,7 @@
noatun20update_SOURCES = noatun20update.cpp
noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noatun20update_LDADD = $(LIB_QT)
-@@ -523,7 +527,7 @@
+@@ -523,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14277,7 +15865,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,34 +565,34 @@
+@@ -561,34 +563,34 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14325,7 +15913,7 @@
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
-@@ -866,7 +870,7 @@
+@@ -866,7 +868,7 @@
all-am: Makefile $(PROGRAMS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
@@ -14334,7 +15922,7 @@
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
-@@ -897,10 +901,10 @@
+@@ -897,10 +899,10 @@
#>+ 1
clean: kde-rpo-clean clean-recursive
@@ -14347,7 +15935,7 @@
mostlyclean-am
distclean: distclean-recursive
-@@ -919,11 +923,11 @@
+@@ -919,11 +921,11 @@
info-am:
@@ -14363,7 +15951,7 @@
install-exec-am:
-@@ -951,32 +955,33 @@
+@@ -951,32 +953,33 @@
ps-am:
@@ -14409,7 +15997,7 @@
messages:
-@@ -1001,26 +1006,26 @@
+@@ -1001,26 +1004,26 @@
#>+ 22
install-kde-icons:
@@ -14445,10 +16033,24 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/artseffects/Makefile.in kdemultimedia-3.4.2/noatun/modules/artseffects/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/artseffects/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/artseffects/Makefile.in 2005-07-27 16:57:06.555599152 +0000
-@@ -249,6 +249,9 @@
+--- noatun/modules/artseffects/Makefile.in
++++ noatun/modules/artseffects/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libartseffects_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14458,7 +16060,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -515,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14467,7 +16069,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14479,10 +16081,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/dcopiface/Makefile.in kdemultimedia-3.4.2/noatun/modules/dcopiface/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/dcopiface/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/dcopiface/Makefile.in 2005-07-27 16:57:06.581595200 +0000
-@@ -253,6 +253,9 @@
+--- noatun/modules/dcopiface/Makefile.in
++++ noatun/modules/dcopiface/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_dcopiface_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -253,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14492,7 +16108,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -515,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14501,7 +16117,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14513,10 +16129,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/excellent/Makefile.in kdemultimedia-3.4.2/noatun/modules/excellent/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/excellent/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/excellent/Makefile.in 2005-07-27 16:57:06.609590944 +0000
-@@ -254,6 +254,9 @@
+--- noatun/modules/excellent/Makefile.in
++++ noatun/modules/excellent/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_excellent_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14526,7 +16156,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -520,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14535,7 +16165,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -558,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14547,10 +16177,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/htmlexport/Makefile.in kdemultimedia-3.4.2/noatun/modules/htmlexport/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/htmlexport/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/htmlexport/Makefile.in 2005-07-27 16:57:06.636586840 +0000
-@@ -250,6 +250,9 @@
+--- noatun/modules/htmlexport/Makefile.in
++++ noatun/modules/htmlexport/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_htmlexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -250,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14560,7 +16204,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -512,7 +513,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14569,7 +16213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14581,10 +16225,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/infrared/Makefile.in kdemultimedia-3.4.2/noatun/modules/infrared/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/infrared/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/infrared/Makefile.in 2005-07-27 16:57:06.666582280 +0000
-@@ -253,6 +253,9 @@
+--- noatun/modules/infrared/Makefile.in
++++ noatun/modules/infrared/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_infrared_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -253,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14594,7 +16252,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -515,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14603,7 +16261,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14615,10 +16273,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kaiman/Makefile.in 2005-07-27 16:57:06.743570576 +0000
-@@ -269,6 +269,9 @@
+--- noatun/modules/kaiman/Makefile.in
++++ noatun/modules/kaiman/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_kaiman_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -269,6 +267,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14628,7 +16300,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -541,7 +542,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14637,7 +16309,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14649,7 +16321,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -984,22 +987,22 @@
+@@ -984,22 +985,22 @@
mocs: userinterface.moc
#>+ 3
@@ -14679,7 +16351,7 @@
#>+ 2
KDE_DIST=kaimanui.rc Makefile.in kaiman.plugin SKIN-SPECS Makefile.am
-@@ -1050,7 +1053,7 @@
+@@ -1050,7 +1051,7 @@
#>+ 11
@@ -14688,7 +16360,7 @@
@echo 'creating noatun_kaiman_la.all_cpp.cpp ...'; \
rm -f noatun_kaiman_la.all_cpp.files noatun_kaiman_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> noatun_kaiman_la.all_cpp.final; \
-@@ -1093,8 +1096,8 @@
+@@ -1093,8 +1094,8 @@
nmcheck:
userinterface.lo: userinterface.moc
nmcheck-am: nmcheck
@@ -14698,9 +16370,14 @@
userinterface.o: userinterface.moc
style.o: style.moc
pref.o: pref.moc
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/skins/car-preset/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-07-27 16:57:06.775565712 +0000
+--- noatun/modules/kaiman/skins/car-preset/Makefile.in
++++ noatun/modules/kaiman/skins/car-preset/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14732,9 +16409,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/circle/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/skins/circle/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/circle/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kaiman/skins/circle/Makefile.in 2005-07-27 16:57:06.791563280 +0000
+--- noatun/modules/kaiman/skins/circle/Makefile.in
++++ noatun/modules/kaiman/skins/circle/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14766,9 +16448,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/k9/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/skins/k9/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/k9/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kaiman/skins/k9/Makefile.in 2005-07-27 16:57:06.807560848 +0000
+--- noatun/modules/kaiman/skins/k9/Makefile.in
++++ noatun/modules/kaiman/skins/k9/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14809,9 +16496,14 @@
#>+ 2
docs-am:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/Makefile.in kdemultimedia-3.4.2/noatun/modules/kaiman/skins/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kaiman/skins/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kaiman/skins/Makefile.in 2005-07-27 16:57:06.759568144 +0000
+--- noatun/modules/kaiman/skins/Makefile.in
++++ noatun/modules/kaiman/skins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14843,10 +16535,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/keyz/Makefile.in kdemultimedia-3.4.2/noatun/modules/keyz/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/keyz/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/keyz/Makefile.in 2005-07-27 16:57:06.832557048 +0000
-@@ -250,6 +250,9 @@
+--- noatun/modules/keyz/Makefile.in
++++ noatun/modules/keyz/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_keyz_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -250,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14856,7 +16562,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -510,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14865,7 +16571,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -548,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14877,10 +16583,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/Makefile.in 2005-07-27 16:57:06.889548384 +0000
-@@ -275,6 +275,9 @@
+--- noatun/modules/kjofol-skin/Makefile.in
++++ noatun/modules/kjofol-skin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_kjofol_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -275,6 +273,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14890,7 +16610,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -569,7 +570,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14899,7 +16619,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -607,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14911,9 +16631,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-07-27 16:57:06.903546256 +0000
+--- noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
++++ noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14945,9 +16670,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-07-27 16:57:06.935541392 +0000
+--- noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
++++ noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14988,9 +16718,14 @@
#>+ 2
docs-am:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/Makefile.in 2005-07-27 16:57:06.919543824 +0000
+--- noatun/modules/kjofol-skin/skins/Makefile.in
++++ noatun/modules/kjofol-skin/skins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15022,9 +16757,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/phong/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-07-27 16:57:06.949539264 +0000
+--- noatun/modules/kjofol-skin/skins/phong/Makefile.in
++++ noatun/modules/kjofol-skin/skins/phong/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15056,9 +16796,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-07-27 16:57:06.964536984 +0000
+--- noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
++++ noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15090,9 +16835,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/Makefile.in kdemultimedia-3.4.2/noatun/modules/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/Makefile.in 2005-07-27 16:57:06.531602800 +0000
+--- noatun/modules/Makefile.in
++++ noatun/modules/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15124,10 +16874,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/marquis/Makefile.in kdemultimedia-3.4.2/noatun/modules/marquis/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/marquis/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/marquis/Makefile.in 2005-07-27 16:57:06.991532880 +0000
-@@ -253,6 +253,9 @@
+--- noatun/modules/marquis/Makefile.in
++++ noatun/modules/marquis/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_marquis_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -253,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15137,7 +16901,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -515,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15146,7 +16910,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15158,10 +16922,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/metatag/Makefile.in kdemultimedia-3.4.2/noatun/modules/metatag/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/metatag/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/metatag/Makefile.in 2005-07-27 16:57:07.024527864 +0000
-@@ -254,6 +254,9 @@
+--- noatun/modules/metatag/Makefile.in
++++ noatun/modules/metatag/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_metatag_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15171,7 +16949,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -516,7 +517,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15180,7 +16958,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -554,9 +555,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15192,10 +16970,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/monoscope/Makefile.in kdemultimedia-3.4.2/noatun/modules/monoscope/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/monoscope/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/monoscope/Makefile.in 2005-07-27 16:57:07.051523760 +0000
-@@ -250,6 +250,9 @@
+--- noatun/modules/monoscope/Makefile.in
++++ noatun/modules/monoscope/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_monoscope_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -250,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15205,7 +16997,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -512,7 +513,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15214,7 +17006,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15226,10 +17018,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/net/Makefile.in kdemultimedia-3.4.2/noatun/modules/net/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/net/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/net/Makefile.in 2005-07-27 16:57:07.076519960 +0000
-@@ -250,6 +250,9 @@
+--- noatun/modules/net/Makefile.in
++++ noatun/modules/net/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_net_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -250,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15239,7 +17045,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -510,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15248,7 +17054,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -548,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15260,10 +17066,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/noatunui/Makefile.in kdemultimedia-3.4.2/noatun/modules/noatunui/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/noatunui/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/noatunui/Makefile.in 2005-07-27 16:57:07.103515856 +0000
-@@ -254,6 +254,9 @@
+--- noatun/modules/noatunui/Makefile.in
++++ noatun/modules/noatunui/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_ui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15273,7 +17093,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -517,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15282,7 +17102,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15294,10 +17114,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/simple/Makefile.in kdemultimedia-3.4.2/noatun/modules/simple/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/simple/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/simple/Makefile.in 2005-07-27 16:57:07.134511144 +0000
-@@ -253,6 +253,9 @@
+--- noatun/modules/simple/Makefile.in
++++ noatun/modules/simple/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatunsimple_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -253,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15307,7 +17141,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -516,7 +517,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15316,7 +17150,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -554,9 +555,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15328,10 +17162,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/splitplaylist/Makefile.in kdemultimedia-3.4.2/noatun/modules/splitplaylist/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/splitplaylist/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/splitplaylist/Makefile.in 2005-07-27 16:57:07.174505064 +0000
-@@ -258,6 +258,9 @@
+--- noatun/modules/splitplaylist/Makefile.in
++++ noatun/modules/splitplaylist/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_splitplaylist_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -258,6 +256,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15341,7 +17189,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -520,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15350,7 +17198,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -558,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15362,10 +17210,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/systray/Makefile.in kdemultimedia-3.4.2/noatun/modules/systray/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/systray/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/systray/Makefile.in 2005-07-27 16:57:07.207500048 +0000
-@@ -255,6 +255,9 @@
+--- noatun/modules/systray/Makefile.in
++++ noatun/modules/systray/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_systray_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -255,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15375,7 +17237,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -520,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15384,7 +17246,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -558,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15396,7 +17258,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -877,7 +880,7 @@
+@@ -877,7 +878,7 @@
-rm -f kitsystemtray.moc systray.moc cmodule.moc
#>+ 2
@@ -15405,10 +17267,24 @@
#>+ 4
clean-ui:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/voiceprint/Makefile.in kdemultimedia-3.4.2/noatun/modules/voiceprint/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/voiceprint/Makefile.in 2005-07-20 20:12:13.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/voiceprint/Makefile.in 2005-07-27 16:57:07.240495032 +0000
-@@ -253,6 +253,9 @@
+--- noatun/modules/voiceprint/Makefile.in
++++ noatun/modules/voiceprint/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(noatun_voiceprint_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -253,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15418,7 +17294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15427,7 +17303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15439,10 +17315,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/winskin/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/winskin/Makefile.in 2005-07-27 16:57:07.302485608 +0000
-@@ -274,6 +274,9 @@
+--- noatun/modules/winskin/Makefile.in
++++ noatun/modules/winskin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(noatun_winskin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15452,7 +17342,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15461,7 +17351,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15473,7 +17363,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1119,18 +1122,18 @@
+@@ -1119,18 +1120,18 @@
mocs: waJumpSlider.moc
#>+ 3
@@ -15498,7 +17388,7 @@
#>+ 3
waButton.moc: $(srcdir)/waButton.h
-@@ -1175,18 +1178,18 @@
+@@ -1175,18 +1176,18 @@
mocs: waBalanceSlider.moc
#>+ 3
@@ -15523,7 +17413,7 @@
#>+ 3
waSkinManager.moc: $(srcdir)/waSkinManager.h
-@@ -1197,10 +1200,10 @@
+@@ -1197,10 +1198,10 @@
#>+ 3
clean-metasources:
@@ -15536,7 +17426,7 @@
#>+ 4
clean-idl:
-@@ -1253,7 +1256,7 @@
+@@ -1253,7 +1254,7 @@
#>+ 11
@@ -15545,9 +17435,14 @@
@echo 'creating noatun_winskin_la.all_cpp.cpp ...'; \
rm -f noatun_winskin_la.all_cpp.files noatun_winskin_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/mimetypes/interface/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-07-27 16:57:07.338480136 +0000
+--- noatun/modules/winskin/mimetypes/interface/Makefile.in
++++ noatun/modules/winskin/mimetypes/interface/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15579,9 +17474,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/mimetypes/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/mimetypes/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/winskin/mimetypes/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/winskin/mimetypes/Makefile.in 2005-07-27 16:57:07.321482720 +0000
+--- noatun/modules/winskin/mimetypes/Makefile.in
++++ noatun/modules/winskin/mimetypes/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15613,9 +17513,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/skins/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/skins/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/winskin/skins/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/winskin/skins/Makefile.in 2005-07-27 16:57:07.353477856 +0000
+--- noatun/modules/winskin/skins/Makefile.in
++++ noatun/modules/winskin/skins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -219,6 +219,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15647,9 +17552,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/skins/winamp/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/skins/winamp/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/winskin/skins/winamp/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/winskin/skins/winamp/Makefile.in 2005-07-27 16:57:07.368475576 +0000
+--- noatun/modules/winskin/skins/winamp/Makefile.in
++++ noatun/modules/winskin/skins/winamp/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -211,6 +211,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15681,10 +17591,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/noatun/modules/winskin/vis/Makefile.in kdemultimedia-3.4.2/noatun/modules/winskin/vis/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/modules/winskin/vis/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/modules/winskin/vis/Makefile.in 2005-07-27 16:57:07.394471624 +0000
-@@ -252,6 +252,9 @@
+--- noatun/modules/winskin/vis/Makefile.in
++++ noatun/modules/winskin/vis/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libwinskinvis_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -252,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15694,7 +17618,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -524,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -15703,7 +17627,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15715,9 +17639,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/noatun/pics/Makefile.in kdemultimedia-3.4.2/noatun/pics/Makefile.in
---- kdemultimedia-3.4.2.orig/noatun/pics/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/noatun/pics/Makefile.in 2005-07-27 16:57:07.424467064 +0000
+--- noatun/pics/Makefile.in
++++ noatun/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -201,6 +201,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15893,10 +17822,24 @@
#>+ 15
force-reedit:
-diff -Nru kdemultimedia-3.4.2.orig/oggvorbis_artsplugin/Makefile.in kdemultimedia-3.4.2/oggvorbis_artsplugin/Makefile.in
---- kdemultimedia-3.4.2.orig/oggvorbis_artsplugin/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/oggvorbis_artsplugin/Makefile.in 2005-07-27 16:57:07.449463264 +0000
-@@ -254,6 +254,9 @@
+--- oggvorbis_artsplugin/Makefile.in
++++ oggvorbis_artsplugin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(liboggarts_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15906,7 +17849,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -517,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -15915,7 +17858,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15927,10 +17870,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/xine_artsplugin/Makefile.in kdemultimedia-3.4.2/xine_artsplugin/Makefile.in
---- kdemultimedia-3.4.2.orig/xine_artsplugin/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/xine_artsplugin/Makefile.in 2005-07-27 16:57:07.476459160 +0000
-@@ -276,6 +276,9 @@
+--- xine_artsplugin/Makefile.in
++++ xine_artsplugin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libarts_xine_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -276,6 +274,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15940,7 +17897,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -541,7 +542,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -15949,7 +17906,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15961,9 +17918,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.2.orig/xine_artsplugin/tools/Makefile.in kdemultimedia-3.4.2/xine_artsplugin/tools/Makefile.in
---- kdemultimedia-3.4.2.orig/xine_artsplugin/tools/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/xine_artsplugin/tools/Makefile.in 2005-07-27 16:57:07.492456728 +0000
+--- xine_artsplugin/tools/Makefile.in
++++ xine_artsplugin/tools/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15995,10 +17957,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.2.orig/xine_artsplugin/tools/thumbnail/Makefile.in kdemultimedia-3.4.2/xine_artsplugin/tools/thumbnail/Makefile.in
---- kdemultimedia-3.4.2.orig/xine_artsplugin/tools/thumbnail/Makefile.in 2005-07-20 20:12:14.000000000 +0000
-+++ kdemultimedia-3.4.2/xine_artsplugin/tools/thumbnail/Makefile.in 2005-07-27 16:57:07.523452016 +0000
-@@ -255,6 +255,9 @@
+--- xine_artsplugin/tools/thumbnail/Makefile.in
++++ xine_artsplugin/tools/thumbnail/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(videothumbnail_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -255,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -16008,7 +17984,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -516,7 +517,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16017,7 +17993,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -554,9 +555,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the Pkg-kde-commits
mailing list