--- k3b-1.0.orig/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ k3b-1.0/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,11 @@ +debian/rules applies and unapplies patches +debian/rules generates .pot files +all the debian/patches files +build-dep dbus-qt-1-dev -> libdbus-qt-1-dev +build-dep on libmpcdec-dev and libmad0-dev +don't build-dep on libresmgr-dev +libk3b2-mp3 with usr/lib/kde3/libk3bmaddecoder.* +libk3b2.files has to list each file in usr/lib/kde3 +libk3b-dev conflicts with k3blibs +install kubuntu-media-k3b and k3b_extract_audiocd.desktop and chmod +x kubuntu-media-k3b + --- k3b-1.0.orig/debian/patches/kubuntu_109_disable_firstrun.diff +++ k3b-1.0/debian/patches/kubuntu_109_disable_firstrun.diff @@ -0,0 +1,12 @@ +diff -Nurp k3b-1.0rc4-clean/src/k3bapplication.cpp k3b-1.0rc4/src/k3bapplication.cpp +--- k3b-1.0rc4-clean/src/k3bapplication.cpp 2007-01-09 13:36:40.000000000 +0000 ++++ k3b-1.0rc4/src/k3bapplication.cpp 2007-01-09 16:39:51.000000000 +0000 +@@ -143,7 +143,7 @@ void K3bApplication::init() + + emit initializationDone(); + +- K3bFirstRun::run( m_mainWindow ); ++ //K3bFirstRun::run( m_mainWindow ); + + if( K3bSystemProblemDialog::readCheckSystemConfig() ) { + emit initializationInfo( i18n("Checking System") ); --- k3b-1.0.orig/debian/patches/k3b-svn-r644133-bug143107.diff +++ k3b-1.0/debian/patches/k3b-svn-r644133-bug143107.diff @@ -0,0 +1,28 @@ +Index: k3b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +=================================================================== +--- k3b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp (revision 644119) ++++ k3b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp (revision 644133) +@@ -559,7 +559,8 @@ + if( m_w->selectedAudioCodec() == K3bVideoDVDTitleTranscodingJob::AUDIO_CODEC_AC3_PASSTHROUGH ) { + for( QMap::iterator it = m_titleRipInfos.begin(); + it != m_titleRipInfos.end(); ++it ) { +- if( m_dvd[it.data().title-1].audioStream(it.data().audioStream).format() != K3bVideoDVD::AUDIO_FORMAT_AC3 ) { ++ if( m_dvd[it.data().title-1].numAudioStreams() > 0 && ++ m_dvd[it.data().title-1].audioStream(it.data().audioStream).format() != K3bVideoDVD::AUDIO_FORMAT_AC3 ) { + KMessageBox::sorry( this, i18n("

When using the AC3 pass-through audio codec all selected audio " + "streams need to be in AC3 format. Please select another audio codec or " + "choose AC3 audio streams for all ripped titles."), +Index: k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +=================================================================== +--- k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp (revision 644119) ++++ k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp (revision 644133) +@@ -218,7 +218,8 @@ + *d->process << "-T" << QString("%1,-1,1").arg( m_titleNumber ); + + // select the audio stream to extract +- *d->process << "-a" << QString::number( m_audioStreamIndex ); ++ if ( m_dvd[m_titleNumber-1].numAudioStreams() > 0 ) ++ *d->process << "-a" << QString::number( m_audioStreamIndex ); + + // clipping + *d->process << "-j" << QString("%1,%2,%3,%4") --- k3b-1.0.orig/debian/patches/k3b-svn-r644087-bug143193.diff +++ k3b-1.0/debian/patches/k3b-svn-r644087-bug143193.diff @@ -0,0 +1,14 @@ +Index: k3b/libk3b/jobs/k3bdvdcopyjob.cpp +=================================================================== +--- k3b/libk3b/jobs/k3bdvdcopyjob.cpp (revision 643215) ++++ k3b/libk3b/jobs/k3bdvdcopyjob.cpp (revision 644087) +@@ -264,7 +264,7 @@ + + K3bIso9660 isoF( m_readerDevice, 0 ); + if( isoF.open() ) { +- d->lastSector = ((long long)isoF.primaryDescriptor().logicalBlockSize*isoF.primaryDescriptor().volumeSpaceSize)/2048LL; ++ d->lastSector = ((long long)isoF.primaryDescriptor().logicalBlockSize*isoF.primaryDescriptor().volumeSpaceSize)/2048LL - 1; + } + else { + emit infoMessage( i18n("Unable to determine the ISO9660 filesystem size."), ERROR ); + --- k3b-1.0.orig/debian/patches/k3b-svn-r644118-bug143181.diff +++ k3b-1.0/debian/patches/k3b-svn-r644118-bug143181.diff @@ -0,0 +1,185 @@ +Index: k3b/src/k3bwriterselectionwidget.cpp +=================================================================== +--- k3b/src/k3bwriterselectionwidget.cpp (revision 644100) ++++ k3b/src/k3bwriterselectionwidget.cpp (revision 644118) +@@ -44,6 +44,9 @@ + #include + + ++#include ++ ++ + class K3bWriterSelectionWidget::MediaSelectionComboBox : public K3bMediaSelectionComboBox + { + public: +@@ -284,14 +287,6 @@ + insertSpeedItem( (int)(2.4*1385.0) ); + i = ( i == 1 ? 2 : i+2 ); + } +- +- // +- // Since we do not know the exact max writing speed if an override device is set (we can't becasue +- // the writer always returns the speed relative to the inserted medium) we allow the user to specify +- // the speed manually +- // +- m_comboSpeed->insertItem( i18n("More...") ); +- d->haveManualSpeed = true; + } + else { + for( QValueList::iterator it = speeds.begin(); it != speeds.end(); ++it ) +@@ -299,6 +294,16 @@ + } + } + ++ ++ // ++ // Although most devices return all speeds properly there are still some dumb ones around ++ // that don't. Users of those will need the possibility to set the speed manually even if ++ // a medium is inserted. ++ // ++ m_comboSpeed->insertItem( i18n("More...") ); ++ d->haveManualSpeed = true; ++ ++ + // try to reload last set speed + if( d->lastSetSpeed == -1 ) + setSpeed( lastSpeed ); +@@ -322,18 +327,35 @@ + + void K3bWriterSelectionWidget::insertSpeedItem( int speed ) + { +- if( !d->speedIndexMap.contains( speed ) ) { +- d->indexSpeedMap[m_comboSpeed->count()] = speed; +- d->speedIndexMap[speed] = m_comboSpeed->count(); ++ // ++ // polish the speed ++ // ++ if( k3bappcore->mediaCache()->diskInfo( writerDevice() ).isDvdMedia() ) { ++ // ++ // AFAIK there is only one strange DVD burning speed like 2.4 ++ // ++ int xs = ( int )( 1385.0*2.4 ); ++ if ( abs( speed - xs ) < 1385/2 ) ++ speed = xs; ++ else ++ speed = ( ( speed+692 )/1385 )*1385; ++ } ++ else { ++ speed = ( ( speed+87 )/175 )*175; ++ } + +- if( k3bappcore->mediaCache()->diskInfo( writerDevice() ).isDvdMedia() ) +- m_comboSpeed->insertItem( ( speed%1385 > 0 +- ? QString::number( (float)speed/1385.0, 'f', 1 ) // example: DVD+R(W): 2.4x +- : QString::number( speed/1385 ) ) +- + "x" ); +- else +- m_comboSpeed->insertItem( QString("%1x").arg(speed/175) ); +- } ++ if( !d->speedIndexMap.contains( speed ) ) { ++ d->indexSpeedMap[m_comboSpeed->count()] = speed; ++ d->speedIndexMap[speed] = m_comboSpeed->count(); ++ ++ if( k3bappcore->mediaCache()->diskInfo( writerDevice() ).isDvdMedia() ) ++ m_comboSpeed->insertItem( ( speed%1385 > 0 ++ ? QString::number( (float)speed/1385.0, 'f', 1 ) // example: DVD+R(W): 2.4x ++ : QString::number( speed/1385 ) ) ++ + "x" ); ++ else ++ m_comboSpeed->insertItem( QString("%1x").arg(speed/175) ); ++ } + } + + +@@ -565,37 +587,61 @@ + + void K3bWriterSelectionWidget::slotManualSpeed() + { +- // +- // We need to know if it will be a CD or DVD medium. Since the override device +- // is only used for CD/DVD copy anyway we simply reply on the inserted medium's type. +- // +- int speedFactor = ( k3bappcore->mediaCache()->diskInfo( writerDevice() ).isDvdMedia() ? 1385 : 175 ); ++ // ++ // In case we think we have all the available speeds (i.e. if the device reported a non-empty list) ++ // we just treat it as a manual selection. Otherwise we admit that we cannot do better ++ // ++ bool haveSpeeds = ( writerDevice() && !k3bappcore->mediaCache()->writingSpeeds( writerDevice() ).isEmpty() ); ++ QString s; ++ if ( haveSpeeds ) { ++ s = i18n( "Please enter the speed that K3b should use for burning (Example: 16x)." ); ++ } ++ else { ++ s = i18n("

K3b is not able to perfectly determine the maximum " ++ "writing speed of an optical writer. Writing speed is always " ++ "reported subject to the inserted medium." ++ "

Please enter the writing speed here and K3b will remember it " ++ "for future sessions (Example: 16x)."); ++ } + +- bool ok = true; +- int newSpeed = KInputDialog::getInteger( i18n("Set writing speed manually"), +- i18n("

K3b is not able to perfectly determine the maximum " +- "writing speed of an optical writer. Writing speed is always " +- "reported subject to the inserted medium." +- "

Please enter the writing speed here and K3b will remember it " +- "for future sessions (Example: 16x)."), +- writerDevice()->maxWriteSpeed()/speedFactor, +- 1, +- 10000, +- 1, +- 10, +- &ok, +- this ) * speedFactor; +- if( ok ) { +- writerDevice()->setMaxWriteSpeed( QMAX( newSpeed, writerDevice()->maxWriteSpeed() ) ); +- slotRefreshWriterSpeeds(); +- setSpeed( newSpeed ); +- } +- else { +- if( d->lastSetSpeed == -1 ) +- m_comboSpeed->setCurrentItem( 0 ); // Auto +- else +- setSpeed( d->lastSetSpeed ); +- } ++ // ++ // We need to know if it will be a CD or DVD medium. Since the override device ++ // is only used for CD/DVD copy anyway we simply reply on the inserted medium's type. ++ // ++ int speedFactor = ( k3bappcore->mediaCache()->diskInfo( writerDevice() ).isDvdMedia() ? 1385 : 175 ); ++ ++ bool ok = true; ++ int newSpeed = KInputDialog::getInteger( i18n("Set writing speed manually"), ++ s, ++ writerDevice()->maxWriteSpeed()/speedFactor, ++ 1, ++ 10000, ++ 1, ++ 10, ++ &ok, ++ this ) * speedFactor; ++ if( ok ) { ++ writerDevice()->setMaxWriteSpeed( QMAX( newSpeed, writerDevice()->maxWriteSpeed() ) ); ++ if ( haveSpeeds ) { ++ // ++ // Hack: insert the new speed item. This is ugly and ++ // needs fixing but should not be used often ++ // ++ m_comboSpeed->removeItem( m_comboSpeed->count()-1 ); ++ insertSpeedItem( newSpeed ); ++ m_comboSpeed->insertItem( i18n("More...") ); ++ } ++ else { ++ slotRefreshWriterSpeeds(); ++ } ++ setSpeed( newSpeed ); ++ } ++ else { ++ if( d->lastSetSpeed == -1 ) ++ m_comboSpeed->setCurrentItem( 0 ); // Auto ++ else ++ setSpeed( d->lastSetSpeed ); ++ } + } + + #include "k3bwriterselectionwidget.moc" --- k3b-1.0.orig/debian/patches/k3b-svn-r644512-bug143236.diff +++ k3b-1.0/debian/patches/k3b-svn-r644512-bug143236.diff @@ -0,0 +1,43 @@ +Index: k3b/src/projects/k3bvideodvdview.h +=================================================================== +--- k3b/src/projects/k3bvideodvdview.h (revision 644143) ++++ k3b/src/projects/k3bvideodvdview.h (revision 644512) +@@ -32,6 +32,8 @@ + K3bVideoDvdView( K3bVideoDvdDoc* doc, QWidget *parent = 0, const char *name = 0 ); + ~K3bVideoDvdView(); + ++ void addUrls( const KURL::List& ); ++ + protected: + virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + +Index: k3b/src/projects/k3bvideodvdview.cpp +=================================================================== +--- k3b/src/projects/k3bvideodvdview.cpp (revision 644143) ++++ k3b/src/projects/k3bvideodvdview.cpp (revision 644512) +@@ -1,4 +1,4 @@ +-/* ++/* + * + * $Id$ + * Copyright (C) 2005 Sebastian Trueg +@@ -18,6 +18,7 @@ + #include "k3bvideodvdburndialog.h" + #include "k3bdatadirtreeview.h" + #include "k3bdatafileview.h" ++#include "k3bdataurladdingdialog.h" + #include + #include + #include +@@ -74,5 +75,10 @@ + "video_dvd_restrictions" ); + } + +-//#include "k3bvideodvdview.moc" ++ ++void K3bVideoDvdView::addUrls( const KURL::List& urls ) ++{ ++ K3bDataUrlAddingDialog::addUrls( urls, m_dataFileView->currentDir() ); ++} ++ + #include "k3bvideodvdview.moc" --- k3b-1.0.orig/debian/patches/k3b-svn-r644528-bug143238.diff +++ k3b-1.0/debian/patches/k3b-svn-r644528-bug143238.diff @@ -0,0 +1,24 @@ +Index: k3b/src/k3bapplication.cpp +=================================================================== +--- k3b/src/k3bapplication.cpp (revision 644512) ++++ k3b/src/k3bapplication.cpp (revision 644529) +@@ -153,6 +153,10 @@ + if( processCmdLineArgs() ) + KTipDialog::showTip( m_mainWindow ); + } ++ ++ // write the current version to make sure checks such as K3bSystemProblemDialog::readCheckSystemConfig ++ // use a proper value ++ generalOptions.writeEntry( "config version", m_core->version() ); + } + + +@@ -401,8 +405,6 @@ + + K3bCore::saveSettings( cnf ); + m_themeManager->saveConfig( cnf ); +- +- KConfigGroup( cnf, "General Options" ).writeEntry( "config version", version() ); + } + + --- k3b-1.0.orig/debian/patches/k3b-svn-r645043-bug137975.diff +++ k3b-1.0/debian/patches/k3b-svn-r645043-bug137975.diff @@ -0,0 +1,56 @@ +Index: k3b/libk3b/projects/datacd/k3bisoimager.cpp +=================================================================== +--- k3b/libk3b/projects/datacd/k3bisoimager.cpp (revision 644725) ++++ k3b/libk3b/projects/datacd/k3bisoimager.cpp (revision 645043) +@@ -600,39 +600,42 @@ + QString s = m_doc->isoOptions().volumeSetId(); + truncateTheHardWay(s, 128); // ensure max length + *m_process << "-volset" << s; +- ++ + s = m_doc->isoOptions().applicationID(); + truncateTheHardWay(s, 128); // ensure max length + *m_process << "-appid" << s; +- ++ + s = m_doc->isoOptions().publisher(); + truncateTheHardWay(s, 128); // ensure max length + *m_process << "-publisher" << s; +- ++ + s = m_doc->isoOptions().preparer(); + truncateTheHardWay(s, 128); // ensure max length + *m_process << "-preparer" << s; +- ++ + s = m_doc->isoOptions().systemId(); + truncateTheHardWay(s, 32); // ensure max length + *m_process << "-sysid" << s; +- ++ + s = m_doc->isoOptions().abstractFile(); + truncateTheHardWay(s, 37); // ensure max length +- *m_process << "-abstract" << s; ++ if ( !s.isEmpty() ) ++ *m_process << "-abstract" << s; + + s = m_doc->isoOptions().copyrightFile(); + truncateTheHardWay(s, 37); // ensure max length +- *m_process << "-copyright" << s; ++ if ( !s.isEmpty() ) ++ *m_process << "-copyright" << s; + + s = m_doc->isoOptions().bibliographFile(); + truncateTheHardWay(s, 37); // ensure max length +- *m_process << "-biblio" << s; ++ if ( !s.isEmpty() ) ++ *m_process << "-biblio" << s; + + int volsetSize = m_doc->isoOptions().volumeSetSize(); + int volsetSeqNo = m_doc->isoOptions().volumeSetNumber(); + if( volsetSeqNo > volsetSize ) { +- kdDebug() << "(K3bIsoImager) invalid volume set sequence number: " << volsetSeqNo ++ kdDebug() << "(K3bIsoImager) invalid volume set sequence number: " << volsetSeqNo + << " with volume set size: " << volsetSize << endl; + volsetSeqNo = volsetSize; + } --- k3b-1.0.orig/debian/patches/kubuntu_103_kdepotpath.diff +++ k3b-1.0/debian/patches/kubuntu_103_kdepotpath.diff @@ -0,0 +1,19 @@ +diff -Nurp k3b-1.0rc2/admin/cvs.sh k3b-1.0rc2-copy/admin/cvs.sh +--- k3b-1.0rc2/admin/cvs.sh 2006-12-13 14:40:56.000000000 +0000 ++++ k3b-1.0rc2-copy/admin/cvs.sh 2006-12-18 14:36:23.000000000 +0000 +@@ -554,10 +554,11 @@ for subdir in $dirs; do + fi + perl -e '$mes=0; while () { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile + +- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +- if ! test -f $kdepotpath; then +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- fi ++ #kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++ #if ! test -f $kdepotpath; then ++ #kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++ #fi ++ kdepotpath=/usr/include/kde/kde.pot + + $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ + XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages --- k3b-1.0.orig/debian/patches/kubuntu_102_rename_dvd+rw-tools.diff +++ k3b-1.0/debian/patches/kubuntu_102_rename_dvd+rw-tools.diff @@ -0,0 +1,11 @@ +--- k3b-1.0rc1/libk3b/core/k3bdefaultexternalprograms.cpp 2006-12-11 16:36:12.000000000 +0000 ++++ k3b-1.0rc1-copy/libk3b/core/k3bdefaultexternalprograms.cpp 2006-12-12 14:54:33.000000000 +0000 +@@ -870,7 +870,7 @@ bool K3bDvdformatProgram::scan( const QS + if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + // different locales make searching for the +- char difficult + // so we simply ignore it. +- int pos = out.output().find( QRegExp("DVD.*RW(/-RAM)? format utility") ); ++ int pos = out.output().find( QRegExp("DVD.*RAM format utility") ); + if( pos < 0 ) + return false; + --- k3b-1.0.orig/debian/patches/k3b-svn-r644089-bug143165.diff +++ k3b-1.0/debian/patches/k3b-svn-r644089-bug143165.diff @@ -0,0 +1,49 @@ +Index: k3b/src/k3bappdevicemanager.cpp +=================================================================== +--- k3b/src/k3bappdevicemanager.cpp (revision 644087) ++++ k3b/src/k3bappdevicemanager.cpp (revision 644089) +@@ -186,28 +186,33 @@ + + void K3bAppDeviceManager::mountDisk() + { +- // FIXME: make this non-blocking +- if( !K3b::isMounted( currentDevice() ) ) +- K3b::mount( currentDevice() ); +- +- emit mountFinished( KIO::findDeviceMountPoint( currentDevice()->blockDeviceName() ) ); ++ if ( currentDevice() ) { ++ // FIXME: make this non-blocking ++ if( !K3b::isMounted( currentDevice() ) ) ++ K3b::mount( currentDevice() ); ++ ++ emit mountFinished( KIO::findDeviceMountPoint( currentDevice()->blockDeviceName() ) ); ++ } + } + + + void K3bAppDeviceManager::unmountDisk() + { +- // FIXME: make this non-blocking +- if( K3b::isMounted( currentDevice() ) ) +- emit unmountFinished( K3b::unmount( currentDevice() ) ); +- else +- emit unmountFinished( true ); ++ if ( currentDevice() ) { ++ // FIXME: make this non-blocking ++ if( K3b::isMounted( currentDevice() ) ) ++ emit unmountFinished( K3b::unmount( currentDevice() ) ); ++ else ++ emit unmountFinished( true ); ++ } + } + + + void K3bAppDeviceManager::ejectDisk() + { + // FIXME: make this non-blocking +- K3b::eject( currentDevice() ); // just ignore errors here ++ if ( currentDevice() ) ++ K3b::eject( currentDevice() ); // just ignore errors here + } + + --- k3b-1.0.orig/debian/patches/kubuntu_104_dont_require_suid_cdrecord_or_cdrdao.diff +++ k3b-1.0/debian/patches/kubuntu_104_dont_require_suid_cdrecord_or_cdrdao.diff @@ -0,0 +1,38 @@ +diff -Nurp k3b-1.0rc4-clean/src/k3bsystemproblemdialog.cpp k3b-1.0rc4/src/k3bsystemproblemdialog.cpp +--- k3b-1.0rc4-clean/src/k3bsystemproblemdialog.cpp 2007-01-09 13:36:40.000000000 +0000 ++++ k3b-1.0rc4/src/k3bsystemproblemdialog.cpp 2007-01-09 17:13:13.000000000 +0000 +@@ -216,6 +216,7 @@ void K3bSystemProblemDialog::checkSystem + i18n("Use K3bSetup to solve this problem."), + true ) ); + } ++/* + else if( !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) && getuid() != 0 ) // not root + problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, + i18n("%1 will be run without root privileges").arg("cdrecord"), +@@ -228,9 +229,9 @@ void K3bSystemProblemDialog::checkSystem + "true when using SuSE's resmgr."), + i18n("Use K3bSetup to solve this problem."), + true ) ); ++*/ + #endif + } +- + if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) { + problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, + i18n("Unable to find %1 executable").arg("cdrdao"), +@@ -238,6 +239,7 @@ void K3bSystemProblemDialog::checkSystem + i18n("Install the cdrdao package."), + false ) ); + } ++/* + else { + #ifdef Q_OS_LINUX + if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "suidroot" ) && getuid() != 0 ) +@@ -250,6 +252,7 @@ void K3bSystemProblemDialog::checkSystem + true ) ); + #endif + } ++*/ + } + + --- k3b-1.0.orig/debian/patches/kubuntu_105_add_iso_burning_to_welcome_screen.diff +++ k3b-1.0/debian/patches/kubuntu_105_add_iso_burning_to_welcome_screen.diff @@ -0,0 +1,12 @@ +diff -Nurp k3b-1.0rc3-clean/src/k3bwelcomewidget.cpp k3b-1.0rc3/src/k3bwelcomewidget.cpp +--- k3b-1.0rc3-clean/src/k3bwelcomewidget.cpp 2006-12-29 20:41:04.000000000 +0000 ++++ k3b-1.0rc3/src/k3bwelcomewidget.cpp 2007-01-08 11:50:52.000000000 +0000 +@@ -313,6 +313,8 @@ void K3bWelcomeWidget::loadConfig( KConf + sl.append( "file_new_data" ); + sl.append( "file_new_dvd" ); + sl.append( "tools_copy_cd" ); ++ sl.append( "tools_write_cd_image" ); ++ sl.append( "tools_write_dvd_iso" ); + } + + QPtrList actions; --- k3b-1.0.orig/debian/patches/kubuntu_107_iso_cue_mimetypes.diff +++ k3b-1.0/debian/patches/kubuntu_107_iso_cue_mimetypes.diff @@ -0,0 +1,14 @@ +diff -Nurp k3b-1.0rc1/src/k3b.desktop k3b-1.0rc1-copy/src/k3b.desktop +--- k3b-1.0rc1/src/k3b.desktop 2006-12-11 16:36:06.000000000 +0000 ++++ k3b-1.0rc1-copy/src/k3b.desktop 2006-12-12 16:29:51.000000000 +0000 +@@ -106,8 +106,8 @@ Name[ar]= K3b + Name[bn]=কে-থ্রি-বি + Name[hi]=के3बी + Name[xx]=xxK3bxx +-MimeType=application/x-k3b ++MimeType=application/x-k3b;application/x-iso;application/x-cue + X-KDE-StartupNotify=true +-X-KDE-NativeMimeType=application/x-k3b;application/x-iso ++X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue + Categories=KDE;Application;AudioVideo;DiscBurning; + X-DCOP-ServiceType=Unique --- k3b-1.0.orig/debian/patches/kubuntu_101_rename_normalize.diff +++ k3b-1.0/debian/patches/kubuntu_101_rename_normalize.diff @@ -0,0 +1,111 @@ +diff -Nurp k3b-1.0rc1/libk3b/core/k3bdefaultexternalprograms.cpp k3b-1.0rc1-copy/libk3b/core/k3bdefaultexternalprograms.cpp +--- k3b-1.0rc1/libk3b/core/k3bdefaultexternalprograms.cpp 2006-12-11 16:36:12.000000000 +0000 ++++ k3b-1.0rc1-copy/libk3b/core/k3bdefaultexternalprograms.cpp 2006-12-12 14:21:32.000000000 +0000 +@@ -715,7 +715,7 @@ bool K3bVcdbuilderProgram::scan( const Q + + + K3bNormalizeProgram::K3bNormalizeProgram() +- : K3bExternalProgram( "normalize" ) ++ : K3bExternalProgram( "normalize-audio" ) + { + } + +@@ -730,7 +730,7 @@ bool K3bNormalizeProgram::scan( const QS + if( fi.isDir() ) { + if( path[path.length()-1] != '/' ) + path.append("/"); +- path.append("normalize"); ++ path.append("normalize-audio"); + } + + if( !QFile::exists( path ) ) +@@ -744,7 +744,7 @@ bool K3bNormalizeProgram::scan( const QS + + vp << path << "--version"; + if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { +- int pos = out.output().find( "normalize" ); ++ int pos = out.output().find( "normalize-audio" ); + if( pos < 0 ) + return false; + +diff -Nurp k3b-1.0rc1/libk3b/projects/audiocd/k3baudionormalizejob.cpp k3b-1.0rc1-copy/libk3b/projects/audiocd/k3baudionormalizejob.cpp +--- k3b-1.0rc1/libk3b/projects/audiocd/k3baudionormalizejob.cpp 2006-12-11 16:36:16.000000000 +0000 ++++ k3b-1.0rc1-copy/libk3b/projects/audiocd/k3baudionormalizejob.cpp 2006-12-12 14:23:51.000000000 +0000 +@@ -52,10 +52,10 @@ void K3bAudioNormalizeJob::start() + connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); + connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); + +- const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize" ); ++ const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" ); + + if( !bin ) { +- emit infoMessage( i18n("Could not find normalize executable."), ERROR ); ++ emit infoMessage( i18n("Could not find normalize-audio executable."), ERROR ); + jobFinished(false); + return; + } +@@ -82,8 +82,8 @@ void K3bAudioNormalizeJob::start() + if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + // something went wrong when starting the program + // it "should" be the executable +- kdDebug() << "(K3bAudioNormalizeJob) could not start normalize" << endl; +- emit infoMessage( i18n("Could not start normalize."), K3bJob::ERROR ); ++ kdDebug() << "(K3bAudioNormalizeJob) could not start normalize-audio" << endl; ++ emit infoMessage( i18n("Could not start normalize-audio."), K3bJob::ERROR ); + jobFinished(false); + } + } +@@ -106,7 +106,7 @@ void K3bAudioNormalizeJob::slotStdLine( + + // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) ); + +- emit debuggingOutput( "normalize", line ); ++ emit debuggingOutput( "normalize-audio", line ); + + // wenn "% done" drin: + // wenn ein --% drin ist, so beginnt ein neuer track +@@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessEx + break; + default: + if( !m_canceled ) { +- emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize").arg(p->exitStatus()), ++ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()), + K3bJob::ERROR ); + emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); + emit infoMessage( i18n("Error while normalizing tracks."), ERROR ); +diff -Nurp k3b-1.0rc1/src/projects/k3baudioburndialog.cpp k3b-1.0rc1-copy/src/projects/k3baudioburndialog.cpp +--- k3b-1.0rc1/src/projects/k3baudioburndialog.cpp 2006-12-11 16:36:02.000000000 +0000 ++++ k3b-1.0rc1-copy/src/projects/k3baudioburndialog.cpp 2006-12-12 14:28:32.000000000 +0000 +@@ -298,11 +298,11 @@ void K3bAudioBurnDialog::slotNormalizeTo + { + if( on ) { + // we are not able to normalize in on-the-fly mode +- if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) { +- KMessageBox::sorry( this, i18n("

External program normalize is not installed." +- "

K3b uses normalize (http://www1.cs.columbia.edu/~cvaill/normalize/) " ++ if( !k3bcore->externalBinManager()->foundBin( "normalize-audio" ) ) { ++ KMessageBox::sorry( this, i18n("

External program normalize-audio is not installed." ++ "

K3b uses normalize-audio (http://www1.cs.columbia.edu/~cvaill/normalize/) " + "to normalize audio tracks. In order to " +- "use this functionality, please install it first.") ); ++ "use this functionality, please install it first. (sudo apt-get install normalize-audio)") ); + m_checkNormalize->setChecked( false ); + } + else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) { +diff -Nurp k3b-1.0rc1/src/projects/k3bmixedburndialog.cpp k3b-1.0rc1-copy/src/projects/k3bmixedburndialog.cpp +--- k3b-1.0rc1/src/projects/k3bmixedburndialog.cpp 2006-12-11 16:36:03.000000000 +0000 ++++ k3b-1.0rc1-copy/src/projects/k3bmixedburndialog.cpp 2006-12-12 14:29:27.000000000 +0000 +@@ -309,10 +309,10 @@ void K3bMixedBurnDialog::slotNormalizeTo + if( on ) { + // we are not able to normalize in on-the-fly mode + if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) { +- KMessageBox::sorry( this, i18n("

External program normalize is not installed." +- "

K3b uses normalize (http://www1.cs.columbia.edu/~cvaill/normalize/) " ++ KMessageBox::sorry( this, i18n("

External program normalize-audio is not installed." ++ "

K3b uses normalize-audio (http://www1.cs.columbia.edu/~cvaill/normalize/) " + "to normalize audio tracks. In order to " +- "use this functionality, please install it first.") ); ++ "use this functionality, please install it first (sudo apt-get install normalize-audio.") ); + m_checkNormalize->setChecked( false ); + } + else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) { --- k3b-1.0.orig/debian/patches/kubuntu_110_disable_no_problems_found_popup.diff +++ k3b-1.0/debian/patches/kubuntu_110_disable_no_problems_found_popup.diff @@ -0,0 +1,12 @@ +diff -Nurp k3b-1.0rc5-clean/src/k3bsystemproblemdialog.cpp k3b-1.0rc5/src/k3bsystemproblemdialog.cpp +--- k3b-1.0rc5-clean/src/k3bsystemproblemdialog.cpp 2007-01-27 11:27:49.000000000 +0000 ++++ k3b-1.0rc5/src/k3bsystemproblemdialog.cpp 2007-02-05 17:00:52.000000000 +0000 +@@ -580,7 +580,7 @@ void K3bSystemProblemDialog::checkSystem + } + if( problems.isEmpty() ) { + kdDebug() << " - none - " << endl; +- K3bPassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System Problems") ); ++ //K3bPassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System Problems") ); + } + else { + static K3bSystemProblemDialog* s_openDlg = 0; --- k3b-1.0.orig/debian/patches/kubuntu_108_add_specify_device_arg_on_cmd_line.diff +++ k3b-1.0/debian/patches/kubuntu_108_add_specify_device_arg_on_cmd_line.diff @@ -0,0 +1,33 @@ +diff -Nurp k3b-1.0rc3-clean/src/k3bapplication.cpp k3b-1.0rc3/src/k3bapplication.cpp +--- k3b-1.0rc3-clean/src/k3bapplication.cpp 2006-12-29 20:41:04.000000000 +0000 ++++ k3b-1.0rc3/src/k3bapplication.cpp 2007-01-08 11:55:35.000000000 +0000 +@@ -59,6 +59,7 @@ + #include + #include + ++#include + + K3bApplication::Core* K3bApplication::Core::s_k3bAppCore = 0; + +@@ -248,6 +249,10 @@ bool K3bApplication::processCmdLineArgs( + m_mainWindow->slotWriteCdImage( url ); + } + } ++ else if( args->isSet("device") && args->count() == 1 ) { ++ showTips = false; ++ m_mainWindow->mainWindow()->showDevice( m_core->deviceManager()->deviceByName( args->arg(0) ) ); ++ } + else if( args->isSet("copycd") ) { + showTips = false; + dialogOpen = true; +diff -Nurp k3b-1.0rc3-clean/src/main.cpp k3b-1.0rc3/src/main.cpp +--- k3b-1.0rc3-clean/src/main.cpp 2006-12-29 20:41:37.000000000 +0000 ++++ k3b-1.0rc3/src/main.cpp 2007-01-08 11:56:11.000000000 +0000 +@@ -69,6 +69,7 @@ static KCmdLineOptions options[] = + { "lang ", I18N_NOOP("Set the GUI language"), 0 }, + { "nosplash", I18N_NOOP("Disable the splash screen"), 0 }, + { "ao ", I18N_NOOP("Set the audio output method (like arts or alsa depending on the installed plugins)"), 0 }, ++ { "device", I18N_NOOP("Open k3b using the given device"), 0 }, + KCmdLineLastOption + }; + --- k3b-1.0.orig/debian/watch +++ k3b-1.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://qa.debian.org/watch/sf.php?project=k3b k3b-([\d.]*).tar.bz2 --- k3b-1.0.orig/debian/k3b_extract_audiocd.desktop +++ k3b-1.0/debian/k3b_extract_audiocd.desktop @@ -0,0 +1,47 @@ +[Desktop Entry] +ServiceTypes=media/audiocd +Actions=Extract; +X-KDE-Priority=TopLevel + +[Desktop Action Extract] +Name=Extract and Encode Audio Tracks +Name[bg]=Извличане и кодиране на аудио диск +Name[bs]=Ripujte i kodirajte audio CDove +Name[ca]=Extracció i codificació de pistes d'àudio +Name[cs]=Získat a enkódovat zvukové stopy +Name[da]=Udtræk og indkod lydspor +Name[de]=Musikstücke auslesen und kodieren. +Name[el]=Εξαγωγή και κωδικοποίηση Κομματιών ήχου +Name[es]=Extrae y codifica pistas de audio +Name[et]=Ekstrakti ja kodeeri audiorajad +Name[eu]=Erauzi eta kodetu audio pistak +Name[fa]=استخراج و کد بندی شیارهای صوتی +Name[fi]=Siirrä ja koodaa ääniraitoja +Name[fr]=Extrait et encode des pistes audio +Name[he]=הוצאה וקידוד רצועות שמע +Name[hu]=Hangsávok kinyerése és tömörítése +Name[is]=Afrita og kóða hljóðspor +Name[it]=Estrai e comprimi le tracce audio +Name[ja]=オーディオトラックを取り出しエンコード +Name[km]=ស្រង់ចេញ និង អ៊ិនកូដ​បទ​អូឌីយ៉ូ +Name[lt]=Nuskaityti ir įkoduoti audio takelius +Name[nb]=Pakk ut og dekod lydfiler +Name[nds]=Musikstücken utlesen un koderen +Name[nl]=Audio-tracks rippen en coderen +Name[nn]=Hent og kod lydspor +Name[pa]=ਆਡੀਓ ਟਰੈਕ ਖੋਲੋ ਅਤੇ ਇੰਕੋਡ +Name[pl]=Odzyskaj i przekoduj ścieżki audio +Name[pt]=Extracção e Codificação de Faixas de Áudio +Name[pt_BR]=Extracção e Codificação de Faixas de Áudio +Name[ru]=Извлечь и закодировать дорожки +Name[sk]=Vytiahnuť a zakódovať audio stopy +Name[sl]=Zajemite in zakodirajte glasbo +Name[sr]=Издваја и кодира аудио стазе +Name[sr@Latn]=Izdvaja i kodira audio staze +Name[sv]=Hämta och koda ljudspår +Name[uk]=Витягає і кодує звукові доріжки +Name[zh_CN]=提取并编码音轨 +Name[zh_HK]=擷取並將音軌編碼 +Name[zh_TW]=展開並編碼音軌 +Exec=bash kubuntu-media-k3b %u +Icon=k3b --- k3b-1.0.orig/debian/README.Debian +++ k3b-1.0/debian/README.Debian @@ -0,0 +1,49 @@ +Users must be members of the "cdrom" group +------------------------------------------ + +To be able to access the CD/DVD burner, users must be members of the "cdrom" +group. To check whether you are a member of that group, run the following +command: + + groups + +If you don't see the "cdrom" group, ask the administrator to be added to that +group or run the following command as root: + + adduser [username] cdrom + +If you are already a member of the "cdrom" group and are experiencing problems, +then you may need to give SUID privileges to wodim. To do this, run the +following command as root: + + dpkg-statoverride --add root cdrom 04710 /usr/bin/wodim + + -- Francois Marier , Fri, 3 Dec 2006 16:38:14 -0500 + + +Ripping DVD using transcode +--------------------------- + +K3b can use transcode in order to rip dvd if you properly setup the "Options" +tab that allows you to configure the location of additional tools. Some of +these tools (tccat, tcdecode, tcextract) are provided by the transcode program. +However, transcode is not currently available in Debian due to legal issues and +probably never will be. If you want to use transcode you can find it on +http://debian.video.free.fr, to have apt use it as an additional source add the +line corresponding to your debian version in your your /etc/apt/sources.list + +For stable: + deb http://www.debian-multimedia.org stable main + +For testing: + deb http://www.debian-multimedia.org testing main + +For unstable: + deb http://www.debian-multimedia.org sid main + +Notice, however, that the above packages are neither official nor +supported by Debian. Moreover, the binary packages are only available +for a limited set of architectures and not for all the architectures +supported by Debian. + + -- Jean-Michel Kelbert , Thu, 20 Feb 2003 17:23:39 -0500 --- k3b-1.0.orig/debian/menu +++ k3b-1.0/debian/menu @@ -0,0 +1,6 @@ +?package(k3b):\ + needs="X11"\ + section="Apps/Tools"\ + title="k3b"\ + command="/usr/bin/k3b"\ + icon="/usr/share/pixmaps/k3b.xpm" --- k3b-1.0.orig/debian/libk3b2.files +++ k3b-1.0/debian/libk3b2.files @@ -0,0 +1,24 @@ +usr/lib/*.so.* +usr/lib/libk3baudio*.{so,la} +usr/lib/kde3/libk3balsaoutputplugin.la +usr/lib/kde3/libk3balsaoutputplugin.so +usr/lib/kde3/libk3bartsoutputplugin.la +usr/lib/kde3/libk3bartsoutputplugin.so +usr/lib/kde3/libk3bexternalencoder.la +usr/lib/kde3/libk3bexternalencoder.so +usr/lib/kde3/libk3bflacdecoder.la +usr/lib/kde3/libk3bflacdecoder.so +usr/lib/kde3/libk3bmpcdecoder.la +usr/lib/kde3/libk3bmpcdecoder.so +usr/lib/kde3/libk3boggvorbisdecoder.la +usr/lib/kde3/libk3boggvorbisdecoder.so +usr/lib/kde3/libk3boggvorbisencoder.la +usr/lib/kde3/libk3boggvorbisencoder.so +usr/lib/kde3/libk3bsoxencoder.la +usr/lib/kde3/libk3bsoxencoder.so +usr/lib/kde3/libk3bwavedecoder.la +usr/lib/kde3/libk3bwavedecoder.so +usr/lib/kde3/libk3baudioprojectcddbplugin.so +usr/lib/kde3/libk3baudioprojectcddbplugin.la +usr/lib/kde3/libk3baudiometainforenamerplugin.so +usr/lib/kde3/libk3baudiometainforenamerplugin.la --- k3b-1.0.orig/debian/docs +++ k3b-1.0/debian/docs @@ -0,0 +1,3 @@ +FAQ +README +TODO --- k3b-1.0.orig/debian/copyright +++ k3b-1.0/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Jean-Michel Kelbert on +Wed, 19 Feb 2003 23:53:45 -0500. + +It was downloaded from http://k3b.sourceforge.net/ + +Upstream Authors: + +Sebastian Trueg +Thomas Froescher +Christian Kvasny +Klaus-Dieter Krannich + +Copyright: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- k3b-1.0.orig/debian/libk3b2-mp3.files +++ k3b-1.0/debian/libk3b2-mp3.files @@ -0,0 +1 @@ +usr/lib/kde3/libk3bmaddecoder.* --- k3b-1.0.orig/debian/control +++ k3b-1.0/debian/control @@ -0,0 +1,63 @@ +Source: k3b +Section: kde +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Francois Marier +Uploaders: Jean-Michel Kelbert +Build-Depends: debhelper (>> 4.1.0), kdelibs4-dev, libqt3-compat-headers, libflac++-dev (>= 1.1.2-1), flac, libdbus-qt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath +Standards-Version: 3.7.2 + +Package: k3b +Architecture: any +Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, kdelibs-data (>= 4:3.1.4-2), kdebase-bin, cdrdao (>= 1.1.7-5) +Recommends: vcdimager (>= 0.7), dvd+rw-tools, kdebase-kio-plugins, kcontrol +Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2, libk3b2-mp3 +Description: A sophisticated KDE CD burning application + K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord. + Its aim is to provide a very user friendly interface to all the tasks + that come with cd recording. + . + It can be used to copy CDs and burn: + - audio CDs (from wav, mp3 or ogg vorbis files) + - data CDs and DVDs + - mixed-mode CDs (CD-Extra support) + - VCDs (1.1, 2.0 and SVCD) + - ISO files (Joliet/Rockridge and El Torito support) + - eMovix CDs + . + For more information, visit the homepage at http://www.k3b.org + +Package: libk3b-dev +Conflicts: libk3bcore-dev, libk3bplugin-dev, libk3btools-dev, libk3bproject-dev, k3blibs-dev, k3blibs +Section: libdevel +Architecture: any +Depends: libk3b2 (= ${Source-Version}) +Description: The KDE cd burning application library - development files + K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. + Its aim is to provide a very user friendly interface to all the tasks + that come with cd recording and a lot more. + . + This package contains development files. + +Package: libk3b2 +Section: libs +Architecture: any +Conflicts: libk3bcore, libk3bplugin, libk3btools, libk3bproject, k3blibs +Depends: ${shlibs:Depends} +Description: The KDE cd burning application library - runtime files + K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. + Its aim is to provide a very user friendly interface to all the tasks + that come with cd recording and a lot more. + . + This package contains runtime libraries. + +Package: libk3b2-mp3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: The KDE cd burning application library - MP3 decoder + K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. + Its aim is to provide a very user friendly interface to all the tasks + that come with cd recording and a lot more. + . + This package contains runtime libraries for the MP3 decoder plugin --- k3b-1.0.orig/debian/k3b.files +++ k3b-1.0/debian/k3b.files @@ -0,0 +1,3 @@ +usr/share/* +usr/bin/* +etc/* --- k3b-1.0.orig/debian/k3b.xpm +++ k3b-1.0/debian/k3b.xpm @@ -0,0 +1,49 @@ +/* XPM */ +static char *k3b[] = { +/* columns rows colors chars-per-pixel */ +"32 32 11 1", +" c #7F0000", +". c #7F007F", +"X c #666667", +"o c gray50", +"O c red", +"+ c magenta", +"@ c gray60", +"# c #B2B2B2", +"$ c gray80", +"% c gray90", +"& c gray100", +/* pixels */ +" O.O.O.O.O.O.O .OO.OO O.O.O.OO.O", +"O.O O.. O O.. O.O.O..O.O.O.O .O ", +".O.O.OOO.OO.OO.OO. .O.OOOO.O.O.O", +"O.&#O.O.O. O.O@%&OO$$$%$$$$$$.O.", +" .&%oO.OO.O.O#&&& O$%$#$$#$$$O.O", +"OO&&&@O O..O%&&&%.O$$$$$$$##$O. ", +".O$&&&$..Oo&&&&@O.O$$$$##$$$%.O.", +"O.Oo&&&&O#&&&$.O O.%$##$#$$$$O O", +".O.O.%&&&&&&#OO.O.O$$##$$##$$O.O", +"O O.O$&&&&&&#..O O.$#$$$$$$##OO.", +".O$$#$@&&&%. O.OO.O$$$$$#$$$%O O", +"O &&&&&&&&&&&&&&&OO$$#$$$##$$.O.", +".O%%&&&&&&&&&&&&&.O%%$$$$$$%$O.O", +"O.@o@..@Oo.@Oo.ooO.OO.O.O.OOO.O ", +"..OOOO.O.O.O.O.OO.O. OO .OO .O.O", +"O &&@OO@&&oOO#&&oOOo&&&&&&%.O.O.", +".O&&#O.O&&@O.O&&.O.@&&&&&&&$O.O.", +"O &&@ O+&%@ Oo&&@O.O&&#.@%&&.O.O", +".O&&O.O@&&+O.@&&@OO@&&@OO.&&@.O ", +"O.&&@O.O&&@.OO&&@ O+&%@.O@&&OOO.", +"..&&+O @&&.O.@&&O.O@&&#O#&&%.O.O", +"O &&@.O@&&@.OO&&@O.O&&&&&&&OO.O ", +".O&&OO.O&&OO.@&&+O.@&&&&&&&%XO.O", +"O &&@.Oo&&@.O.&&O O#&&#.O#&&%.O.", +".O&&oO.@&&oO.@&&@OO@&&@..O#%& .O", +"O.&&.O.O&&O..O&&..O#&&OOO..&&OO.", +" O&&@.O#&&o.O@%&@O.O&&.O.O$&&O O", +"O.&&OOO@&&OOO#&&@OOo&&%$$%&&%.O.", +"O &&@O.@&&o.O@&&+O.@&&&&&&&%.O O", +"..O.O.OO.OOO. O.O O.O O .O.O.O.", +"O..O.O.OO.. O..OO.O.O.. O..O O.O", +" OO.O O..OOO.O O.O.O.OOO.OOO..O." +}; --- k3b-1.0.orig/debian/kubuntu-media-k3b +++ k3b-1.0/debian/kubuntu-media-k3b @@ -0,0 +1,15 @@ +#/bin/bash + +DEVICE=$@ + +if [ -n "$DEVICE" ];then + if [ ${DEVICE:0:7} = "audiocd" ]; then + k3b --device ${DEVICE#*=} + elif [ ${DEVICE:0:1} = "/" ]; then + k3b --device `dcop kded mediamanager fullList | grep -B1 $DEVICE | head -n1` + else + k3b --device /dev/cdrom + fi +else + k3b --device /dev/cdrom +fi --- k3b-1.0.orig/debian/k3b.1 +++ k3b-1.0/debian/k3b.1 @@ -0,0 +1,207 @@ +.TH K3B "1" "December 2002" KDE "KDE Application" +.SH NAME +k3b \- KDE CD burning program +.SH SYNOPSIS +.B k3b +[\fIQt-options\fR] [\fIKDE-options\fR] [\fIFile\fR] +.SH DESCRIPTION +This manual page documents briefly the +.B k3b +KDE Application. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +K3b is a CD burning program that has two aims: +usability and as many features as possible. +.P +This program is part of the official KDE extra gear #1 module. +.SH OPTIONS +.SS "Arguments:" +.TP +File(s) +file(s) to open +.SS "General Options" +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v\fR, \fB\-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS "Options:" +.B \-\-datacd +Create a new data CD project and add all given files +.TP +.B \-\-audiocd +Create a new audio CD project and add all given files +.TP +.B \-\-videocd +Create a new video CD project and add all given files +.TP +.B \-\-mixedcd +Create a new mixed mode CD project and add all given files +.TP +.B \-\-emovixcd +Create a new eMovix CD project and add all given files +.TP +.B \-\-datadvd +Create a new data DVD project and add all given files +.TP +.B \-\-emovixdvd +Create a new eMovix DVD project and add all given files +.TP +.B \-\-copycd +Open the CD copy dialog +.TP +.B \-\-clonecd +Open the CD cloning dialog +.TP +.B \-\-cdimage +Write an ISO image or Bin/Cue image to cd +.TP +.B \-\-erasecd +Erase a CDRW +.TP +.B \-\-formatdvd +Format a DVD-RW or DVD+RW +.TP +.BI \-\-lang \ language +Set the GUI language +.SS "Qt options:" +.TP +.BI \-\-display \ displayname +Use the X-server display \fIdisplayname\fP. +.TP +.BI \-\-session \ sessionId +Restore the application for the given \fIsessionId\fP. +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8-bit display. +.TP +.BI \-\-ncols \ count +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification. +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard. +.TP +.B \-\-dograb +running under a debugger can cause an implicit +.B \-nograb, use \fB\-dograb\fR to override. +.TP +.B \-\-sync +switches to synchronous mode for debugging. +.TP +.BI "\-\-fn\fR, \fP\-\-font" \ fontname +defines the application font. +.TP +.BI "-\-bg\fR, \fB\-\-background" \ color +sets the default background color and an +application palette (light and dark shades are +calculated). +.TP +.BI "\-\-fg\fR, \fB\-\-foreground" \ color +sets the default foreground color. +.TP +.BI \-\-btn\fR, \fB\-\-button \ color +sets the default button color. +.TP +.BI \-\-name \ name +sets the application name. +.TP +.BI \-\-title \ title +sets the application title (caption). +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8-bit display. +.TP +.BI \-\-inputstyle \ inputstyle +sets XIM (X Input Method) input style. Possible +values are +.BR onthespot ", " overthespot ", " offthespot and root . +.TP +.BI \-\-im " XIM-server" +set XIM server. +.TP +.B \-\-noxim +disable XIM. +.TP +.B \-\-reverse +mirrors the whole layout of widgets. +.SS "KDE options:" +.TP +.BI \-\-caption \ caption +Use \fIcaption\fP as name in the titlebar. +.TP +.BI \-\-icon \ icon +Use \fIicon\fP as the application icon. +.TP +.BI \-\-miniicon \ icon +Use \fIicon\fP as the icon in the titlebar. +.TP +.BI \-\-config \ filename +Use alternative configuration file. +.TP +.BI \-\-dcopserver \ server +Use the DCOP Server specified by \fIserver\fP. +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps. +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager. +.TP +.BI \-\-style \ style +sets the application GUI style. +.TP +.BI \-\-geometry \ geometry +sets the client geometry of the main widget. +.SH AUTHOR +K3b was written by +.nh +.ad l +Sebastian Trueg +and Thomas Froescher . +.hy +.br +Please use http://bugs.kde.org to report bugs, do not mail the authors directly. +.br +This manual page was prepared by +.nh +.ad l +Karolina Lindqvist +.hy +for the Debian GNU/Linux system (but may be used by others). +.SH "SEE ALSO" +If the +.B khelpcenter +program is properly installed at your site, the command +.IP +.B khelpcenter help:/k3b +.PP +should give you access to the complete manual. +.P +Alternatively the manual can be browsed in +.B konqueror +giving it the URL help:/k3b + --- k3b-1.0.orig/debian/libk3b-dev.files +++ k3b-1.0/debian/libk3b-dev.files @@ -0,0 +1,3 @@ +usr/include/* +usr/lib/*.la +usr/lib/*.so --- k3b-1.0.orig/debian/rules +++ k3b-1.0/debian/rules @@ -0,0 +1,189 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatibility version to use. +export DH_COMPAT=4 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g3 +CXXFLAGS = -Wall -g3 -fpermissive + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 + CXXFLAGS += -O0 +else + CFLAGS += -O2 + CXXFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE) + + +-include debian/debiandirs + +debian/debiandirs: admin/debianrules + perl -w admin/debianrules echodirs > debian/debiandirs + +configure: configure-stamp +configure-stamp: + dh_testdir + + +# for i in `find $(CURDIR)`; do \ +# touch -d "Jan 01 2003" $$i; \ +# done + + # Apply Debian specific patches + if test ! -f patch-stamp; then \ + for patch in $(CURDIR)/debian/patches/*.diff ;\ + do \ + echo APPLYING PATCH\: $${patch##*/};\ + patch -p1 < $$patch ;\ + done ;\ + touch patch-stamp ;\ + fi + + # make build directory + mkdir $(objdir) + + # run configure with build tree $(objdir) + cd $(objdir) && \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ../configure $(configkde) --without-resmgr --without-k3bsetup + + touch configure-stamp + + +#Architecture +build: build-arch build-indep + +build-arch: build-arch-stamp +build-arch-stamp: configure-stamp + + cd $(objdir) && \ + $(MAKE) + + touch build-arch-stamp + +build-indep: build-indep-stamp +build-indep-stamp: configure-stamp + + # Add here commands to compile the indep part of the package. + #$(MAKE) doc + mkdir -p po + XGETTEXT=/usr/bin/kde-xgettext sh admin/cvs.sh extract-messages + for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + + touch build-indep-stamp + +clean: clean1 + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp configure-stamp debian/debiandirs + + # Remove build tree + rm -rf $(objdir) + rm -rf po/*pot + + # Remove Debian specific patches + if test -f patch-stamp; then \ + for patch in $(CURDIR)/debian/patches/*.diff ;\ + do \ + echo REMOVING PATCH\: $${patch##*/};\ + patch -p1 -R < $$patch ;\ + done ;\ + rm -f patch-stamp ;\ + fi + + dh_clean + +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + #dh_clean -k -i + #dh_installdirs -i + + # Add here commands to install the indep part of the package into + # debian/-doc. + #INSTALLDOC# + + #dh_install -i --list-missing + +install-arch: + dh_testdir + dh_testroot + dh_clean -k -s + dh_installdirs -s + + cd $(objdir) && \ + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + rm -f $(CURDIR)/debian/tmp/usr/share/mimelnk/application/x-cue.desktop + rm -f $(CURDIR)/debian/tmp/usr/share/mimelnk/application/x-iso.desktop + rm -rf $(CURDIR)/debian/tmp/usr/share/applnk/.hidden + + chrpath -d $(CURDIR)/debian/tmp/usr/bin/k3b + chrpath -d $(CURDIR)/debian/tmp/usr/lib/libk3b*so* + chrpath -d $(CURDIR)/debian/tmp/usr/lib/kde3/libk3b*so + + mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps/ + install -m 644 $(CURDIR)/debian/k3b.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/ + + install -m 644 $(CURDIR)/debian/k3b_extract_audiocd.desktop $(CURDIR)/debian/tmp/usr/share/apps/konqueror/servicemenus/ + install -m 755 $(CURDIR)/debian/kubuntu-media-k3b $(CURDIR)/debian/tmp/usr/bin/ + + dh_install -s --list-missing + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_movefiles + dh_installdocs + dh_installexamples + dh_installmenu + dh_installinfo + dh_link + dh_installchangelogs ChangeLog + dh_iconcache + dh_strip + dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2 + dh_fixperms + dh_makeshlibs -V + dh_installdeb + dh_shlibdeps -ldebian/libk3b2/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build-indep install-indep +# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build-arch install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +binary: binary-arch binary-indep +.PHONY: build binary-indep binary-arch binary install install-indep install-arch clean clean1 configure --- k3b-1.0.orig/debian/changelog +++ k3b-1.0/debian/changelog @@ -0,0 +1,888 @@ +k3b (1.0-0ubuntu1) feisty; urgency=low + + * New upstream release + * debian/control: Change Maintainer/XSBC-Original-Maintainer field. + * debian/patches/kubuntu_106_no_splash.diff: drop patch, will be done + in kubuntu-default-settings + * Include some bug-fixes from upstream SVN: + * KDE #143193: DVD copy when reading from a DVD+RW (off-by-one sector) + debian/patches/k3b-svn-r644087-bug143193.diff + * KDE #143165: Crash when using the Device menu without a selected device + debian/patches/k3b-svn-r644089-bug143165.diff + * KDE #143181: Cannot set burning speed manually + debian/patches/k3b-svn-r644118-bug143181.diff + * KDE #143107: Crash during DVD ripping + debian/patches/k3b-svn-r644133-bug143107.diff + * KDE #143236: Cannot add files to VIDEO_TS folder + debian/patches/k3b-svn-r644512-bug143236.diff + * KDE #143238: Problem dialog does not respect "do not show this again" + debian/patches/k3b-svn-r644528-bug143238.diff + * KDE #137975: Empty bibliography/abstract/copyright result in bad burn + debian/patches/k3b-svn-r645043-bug137975.diff + + -- Luka Renko Wed, 28 Mar 2007 18:00:56 +0200 + +k3b (1.0~rc5-0ubuntu1) feisty; urgency=low + + * New upstream release + * removed k3b.postinst due to being redundant + * updated and removed redundant patches, current patches are: + kubuntu_101_rename_normalize.diff + - normalize is called normalize-audio in debian + kubuntu_102_rename_dvd+rw-tools.diff + - change regex for dvd+rw-format utility + kubuntu_103_kdepotpath.diff + - hardcode kdepotpath to avoid buildd problems + kubuntu_104_dont_require_suid_cdrecord_or_cdrdao.diff + - remove warnings about cdrecord and cdrdao not being suid + kubuntu_105_add_iso_burning_to_welcome_screen.diff + - add icons for cd and dvd iso burning to welcome screen + kubuntu_106_no_splash.diff + - disable splash screen on startup + kubuntu_107_iso_cue_mimetypes.diff + - add application/x-iso and application/x-cue to MimeType and + X-KDE-NativeMimeType + kubuntu_108_add_specify_device_arg_on_cmd_line.diff + - add an optional command line argument to specify the writer device + kubuntu_109_disable_firstrun.diff + - disable the first run dialog and tests + kubuntu_110_disable_no_problems_found_popup.diff + - disable passive popup saying no configuration problems found + * Sync with debian (SVN 217) wodim changes not necessary from 1.0rc5 + + -- Kenny Duffus Tue, 6 Feb 2007 10:36:17 +0000 + +k3b (0.12.17-9) unstable; urgency=low + + * Fix a typo in the manpage (--datacd instead of --datadvd). + * Add Data DVD to the Konqueror actions menu. Thanks to Adriano Bonat! + * Depend on cdrdao instead of recommending it (closes: #369930) + + -- Francois Marier Sun, 28 Jan 2007 21:15:39 -0500 + +k3b (0.12.17-8) unstable; urgency=medium + + * Remove a wrong version check for readom (follow-up to bug #401739) + + -- Francois Marier Thu, 14 Dec 2006 09:23:25 -0500 + +k3b (0.12.17-7) unstable; urgency=medium + + * Support for "readom" which is the new renamed "readcd" (closes: #401739) + + -- Francois Marier Tue, 12 Dec 2006 21:27:29 -0500 + +k3b (0.12.17-6) unstable; urgency=low + + * Use genisoimage instead of mkisofs. + * Add a note regarding being part of the "cdrom" group to README.Debian + + -- Francois Marier Sun, 3 Dec 2006 16:41:49 -0500 + +k3b (0.12.17-5) unstable; urgency=low + + * Hack version checks to support wodim version numbers (closes: #397836, + #399090) + * Stop building k3bsetup since K3b should be working out of the box on + Debian, otherwise it's a bug that needs to be fixed, not worked around + with a utility. (closes: #393216, #397267, #385878) + + -- Francois Marier Sat, 18 Nov 2006 00:06:09 -0500 + +k3b (0.12.17-4) unstable; urgency=low + + * Remove unnecessary version check for cdrtools (closes: #397836) + * Remove the deprecated /usr/share/applnk (closes: #398443) + * Allow the use of cdrskin as an alternative to wodim (closes: #398398) + * Set myself as maintainer with Jean-Michel's permission. + + -- Francois Marier Wed, 15 Nov 2006 21:13:20 -0500 + +k3b (0.12.17-3) unstable; urgency=low + + * Remove the cdrecord and cdrdao warnings (closes: #390083) + * Support DEB_BUILD_OPTIONS="noopt" properly (via CXXFLAGS, + not just CFLAGS) thanks to Modestas Vainius! (closes: #394276) + * Fix a crash when changing the default for the last external + application, thanks to Pier Luigi Pau! (closes: #386688) + * Fix the watch file to use qa.debian.org + + -- Francois Marier Sat, 21 Oct 2006 15:24:15 -0400 + +k3b (0.12.17-2) unstable; urgency=low + + * Update transcode apt source (closes: #386080), thanks Eric! + * Switch from cdrecord to wodim (closes: #386327), thanks Sune! + * Fix the calls to dpkg-statoverride (closes: #381170), thanks Dirk! + + -- Francois Marier Wed, 6 Sep 2006 16:50:03 -0400 + +k3b (0.12.17-1ubuntu4) feisty; urgency=low + + * Add kubuntu_09_iso_cue_mimetypes.diff for iso files association + * Add kubuntu_10_device_arg.diff, k3b_extract_audiocd.desktop + and kubuntu-media-k3b for good KDE integration + + -- Anthony Mercatante Fri, 20 Oct 2006 18:56:32 +0200 + +k3b (0.12.17-1ubuntu3) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Wed, 30 Aug 2006 13:12:25 +0200 + +k3b (0.12.17-1ubuntu2) edgy; urgency=low + + * removed versioning of kdelibs4-dev depend (malone 57602) + * added kubuntu_08_dont_complain_about_non_suid_cdrecord.diff (malone 57105) + + -- Kenny Duffus Fri, 25 Aug 2006 17:25:34 +0100 + +k3b (0.12.17-1ubuntu1) edgy; urgency=low + + * removed debian_153_plugins_are_plugins.diff as fixed upstream + * sync with Debian (SVN 185) + + -- Kenny Duffus Thu, 24 Aug 2006 15:13:53 +0100 + +k3b (0.12.17-1) unstable; urgency=low + + * New upstream release + * Remove RPATHs using chrpath to get rid of lintian warnings + + -- Francois Marier Wed, 23 Aug 2006 19:04:42 -0400 + +k3b (0.12.16-1ubuntu3) edgy; urgency=low + + * tidied kubuntu_07_k3bsetup_override.diff + * changed Section to kde + + -- Kenny Duffus Tue, 22 Aug 2006 11:54:28 +0100 + +k3b (0.12.16-1ubuntu2) edgy; urgency=low + + * Replaced_162_k3bsetup_overide.diff by kubuntu_07_k3bsetup_override.diff + to let k3bsetup apply permissions correctly (closing #21359) + Patch from Tom Albers + + -- Anthony Mercatante Sat, 19 Aug 2006 17:26:46 +0200 + +k3b (0.12.16-1ubuntu1) edgy; urgency=low + + * update kubuntu_03_open_iso_files.diff to take account of new language + * Sync with Debian (SVN 172) + + -- Kenny Duffus Tue, 4 Jul 2006 12:10:46 +0100 + +k3b (0.12.16-1) unstable; urgency=low + + * New upstream release (closes: #375323) + - fixed mixed-mode CD copy (closes: #367494) + - fixed some SCSI device detection problems + * Apply Romain Lenglet's patch to preserve k3setup's changes + during package upgrades (closes: #367473) + * Bump Standards-Version up to 3.7.2 (no changes) + + -- Francois Marier Sun, 25 Jun 2006 14:59:26 -0400 + +k3b (0.12.16-0ubuntu2) edgy; urgency=low + + * Reupload with build-dep on latest kdelibs, fix Qt binary compatibility break + + -- Jonathan Riddell Wed, 28 Jun 2006 16:07:54 +0000 + +k3b (0.12.16-0ubuntu1) edgy; urgency=low + + * New upstream release + * Sync with Debian (SVN 164) + - except standards version kept as 3.6.2 + * Split debian patches out into seperate files (number coresponds to + SVN revision on http://svn.debian.org/wsvn/pkg-k3b) + - debian_023_k3bsetup_shbang_at_top.diff + - debian_029_031_053_rename_normalize.diff + - debian_029_rename_dvd+rw-tools.diff + - debian_153_plugins_are_plugins.diff + - debian_162_k3bsetup_overide.diff + + -- Kenny Duffus Fri, 23 Jun 2006 11:34:46 +0100 + +k3b (0.12.15-3) UNRELEASED; urgency=low + + * Apply Romain Lenglet's patch to preserve k3setup's changes + during package upgrades (closes: #367473) + * Bump Standards-Version up to 3.7.2 (no changes) + + -- Francois Marier Thu, 22 Jun 2006 12:50:55 -0400 + +k3b (0.12.15-2) unstable; urgency=low + + * Restore libk3b (closes: #355477) + * Fix lintian warnings (thanks to James Thorniley!) + + -- Francois Marier Sun, 23 Apr 2006 23:35:09 -0400 + +k3b (0.12.15-1) unstable; urgency=low + + * New upstream release + - improved error message (closes: #229051) + - warn about shortened filenames (closes: #277155) + - SCSI IO fix (closes: #339871) + * Build without resmgr (closes: #362818) + * Restore k3bsetup (closes: #360378, #296257) + + -- Francois Marier Sun, 23 Apr 2006 00:44:50 -0400 + +k3b (0.12.14-1) unstable; urgency=low + + * New upstream release + * Move kcontrol to recommends to reduce the KDE dependency (closes: #353335) + * Fix Ubuntu patch to k3bsetup2.desktop (closes: #353826) + + -- Francois Marier Fri, 24 Mar 2006 17:24:54 -0500 + +k3b (0.12.12-1) unstable; urgency=low + + * New upstream release + * Remove the unused libk3b-dev package + * Fix the file lists to include all libraries + + -- Francois Marier Thu, 16 Feb 2006 00:13:15 -0500 + +k3b (0.12.11-1) unstable; urgency=low + + * New upstream release (closes: #348929) + * Fix the watch file (.gz -> .bz2) + * Merge Ubuntu patch (kubuntu_01_hide_k3bsetup) + + -- Francois Marier Sun, 12 Feb 2006 13:31:47 -0500 + +k3b (0.12.10-2) unstable; urgency=low + + * Rename the menu file so that it shows up in the Debian menu system + and install the freedesktop menu item into /usr/share/applications + directly instead of /usr/share/applications/kde so that it shows up in the + GNOME menu (closes: #345989) + * Update the build dependencies for KDE 3.5, dbus 0.6 and the new hal + (closes: #337882) + * Remove unnecessary lines from debian/rules + * Merge Ubuntu patches: + - kubuntu_03_open_iso_files + - kubuntu_04_add_iso_burning_to_welcome_screen + * Remove the versioned dependency on k3b-i18n + + -- Francois Marier Sun, 8 Jan 2006 14:15:24 -0500 + +k3b (0.12.10-1) unstable; urgency=low + + * New upstream release + - fixed Auto multisession mode in DVD projects + - fixed crash in dcop call directBurn in case no valid burner device was set + - fixed verification of datacd projects when using the MaxIso9660 option + without the OmitVersionNumber option + * Add libmad0-dev to the build dependencies + + -- Francois Marier Fri, 16 Dec 2005 12:47:27 -0500 + +k3b (0.12.14-0ubuntu7) dapper; urgency=low + + * Run gettext in build target not install target, needed + earlier by pkgstriptranslations + + -- Jonathan Riddell Mon, 22 May 2006 18:38:37 +0100 + +k3b (0.12.14-0ubuntu6) dapper; urgency=low + + * debian/rules: + - added dh_iconcache. + + -- Daniel Holbach Thu, 18 May 2006 15:11:52 +0200 + +k3b (0.12.14-0ubuntu5) dapper; urgency=low + + * Alter debian/rules to mark .po files as UTF-8 + + -- Jonathan Riddell Thu, 27 Apr 2006 19:13:50 +0100 + +k3b (0.12.14-0ubuntu4) dapper; urgency=low + + * Reverting to first kubuntu_06_hide_k3bsetup.diff patch: + - Changing the Category field prevents from using k3bsetup again. + - k3bsetup will be deactivated in SystemSettings from the + kde-systemsettings package. + + -- Raphaël Pinson Fri, 17 Mar 2006 14:55:09 +0100 + +k3b (0.12.14-0ubuntu3) dapper; urgency=low + + * Remove X-KDE-settings-system; from Categories in + kubuntu_06_hide_k3bsetup.diff so the module doesn't show in SystemSettings. + + -- Raphaël Pinson Thu, 16 Mar 2006 22:57:23 +0100 + +k3b (0.12.14-0ubuntu2) dapper; urgency=low + + * Remove kubuntu_01_hide_k3bsetup.diff patch and replace it with + kubuntu_06_hide_k3bsetup.diff: + - Remove NoDisplay=true to prevent hiding k3bsetup in kcmshell + (Closes: Malone #23007, KDE Bug #117455, Debian #353826) + - Change the Category field so k3bsetup doesn't appear in the KDE menu + (Was the goal of the original patch) + - Rename to kubuntu_06 to prevent having two kubuntu_01 patches + + -- Raphaël Pinson Thu, 16 Mar 2006 15:46:39 +0100 + +k3b (0.12.14-0ubuntu1) dapper; urgency=low + + * New upstream release + * closes malone #31578 + + -- Kenny Duffus Wed, 15 Mar 2006 10:44:46 +0000 + +k3b (0.12.10-0ubuntu5) dapper; urgency=low + + * Update kubuntu_02_no_require_cdrdao.diff now that cdrdao + is installed by default, but not setuid root + + -- Jonathan Riddell Thu, 23 Feb 2006 14:20:21 +0000 + +k3b (0.12.10-0ubuntu4) dapper; urgency=low + + * Rebuild because of libXft.la is gone + + -- Stephan Hermann Sat, 14 Jan 2006 05:19:13 +0100 + +k3b (0.12.10-0ubuntu3) dapper; urgency=low + + * rebuild for latest dbus, updated dependencies accordingly + + -- Michael Vogt Tue, 20 Dec 2005 21:35:10 +0100 + +k3b (0.12.10-0ubuntu2) dapper; urgency=low + + * Don't build-dep on libresmgr-dev + + -- Jonathan Riddell Sat, 17 Dec 2005 22:15:56 +0000 + +k3b (0.12.10-0ubuntu1) dapper; urgency=low + + * New upstream release + + -- Jonathan Riddell Sat, 17 Dec 2005 21:45:34 +0000 + +k3b (0.12.9-1ubuntu2) dapper; urgency=low + + * Add build-dep on libmad0-dev + + -- Jonathan Riddell Thu, 15 Dec 2005 19:30:51 +0000 + +k3b (0.12.9-1ubuntu1) dapper; urgency=low + + * Sync with Debian + * Change debian/rules to apply patches + * k3b-mp3 changed to libk3b2-mp3, follows libk3b2 + * Add kubuntu_05_no_splash.diff get rid of splash screen + + -- Jonathan Riddell Thu, 15 Dec 2005 17:45:27 +0000 + +k3b (0.12.9-1) unstable; urgency=low + + * New upstream release: + - warn about incorrectly encoded filenanes (closes: #303572) + - support the media:// protocol (closes: #342648) + - stop with an error instead of overwriting read medium (closes: #338274) + - new Alsa plugin + - new set of icons + * Add a watch file + * Rename k3blibs and k3blibs-dev packages to libk3b2 and libk3b-dev + (closes: #341765) + + -- Francois Marier Mon, 12 Dec 2005 23:03:32 -0500 + +k3b (0.12.8-1ubuntu1) dapper; urgency=low + + * Sync with Debian + * Rebuild for libstdc++ transition + * Add kubuntu_01_kdepot.diff and modify debian/rules for .pot generation + + -- Jonathan Riddell Tue, 6 Dec 2005 22:42:57 +0000 + +k3b (0.12.8-1) unstable; urgency=low + + * New upstream release (minor bug fixes): + - Load index0 value in audio project. + - Ignore case in cue files. + - Fixed "eject media" setting. + - Fixed a bug in the mp3 decoder which caused it to miss + some perfectly valid mp3 files. + * Updated README.Debian with a section about running k3b as root (thanks to + Ross Boylan for the suggestion) + + -- Francois Marier Fri, 25 Nov 2005 12:02:49 -0500 + +k3b (0.12.7-1ubuntu1) dapper; urgency=low + + [ Martin Meredith ] + * Resync with Debian + * Added patch to add ISO file burning to welcome screen (kubuntu_04_add_iso_burning_to_welcome_screen.diff) + * Changed B-D to libdbus-qt-1-dev + + [ Jonathan Riddell ] + * Add build-dep on libmpcdec-dev for musepack support + + -- Jonathan Riddell Sat, 5 Nov 2005 02:22:43 +0000 + +k3b (0.12.7-1) unstable; urgency=low + + * New upstream release (closes: #336756, #336676) + + -- Francois Marier Wed, 2 Nov 2005 09:03:15 -0500 + +k3b (0.12.6-1) unstable; urgency=low + + * New upstream release + * Remove duplicate item in GNOME menu (closes: #335226) + + -- Francois Marier Sat, 29 Oct 2005 17:23:22 -0400 + +k3b (0.12.5-1) unstable; urgency=low + + * New upstream release + * Add kdebase-kio-plugins to the recommended packages to enable features + like file deletion in the built-in browser (thanks to Nikita Youshchenko + for the suggestion) + * Update the version dependency on k3b-i18n + + -- Francois Marier Wed, 19 Oct 2005 14:43:27 -0400 + +k3b (0.12.4a-3) unstable; urgency=low + + * Fix the name of normalize-audio (closes: #298686) + * Fix the long name of dvd+rw-tools (closes: #328589) + * Add menu item in GNOME (closes: #331212) + + -- Francois Marier Wed, 5 Oct 2005 12:15:36 -0400 + +k3b (0.12.4a-2) unstable; urgency=low + + * Remove unnecessary libid3 from the Build-Depends (closes: #329199) + * Restore the lost changelog entry (from 0.12.1-3) + + -- Francois Marier Tue, 20 Sep 2005 12:24:17 -0400 + +k3b (0.12.4a-1) unstable; urgency=low + + [ Jean-Michel Kelbert ] + * Apply and adapt a patch provided by Javier Fernández-Sanguino Peña for the + README.Debian. + (closes: #303433) + * Don't change date of all files anymore during build. + (closes: #288677) + * Depend on libflac++-dev (>= 1.1.2-1) to ensure that the package is build + with the new version. + (closes: #325941, #320514) + + [ Francois Marier ] + * New upstream release (closes: #328979) + * Bump Standards-Version up to 3.6.2 (no changes) + * Update FSF address in debian/copyright + * Add myself to the Uploaders fields in debian/control to reflect + co-maintainership + * Fix lintian warnings related to the Debian menu item + * Shorten and reformat package description (closes: #249910) + + -- Francois Marier Sun, 18 Sep 2005 23:45:44 -0400 + +k3b (0.12.2-0ubuntu2) breezy; urgency=low + + * Add suggests on k3b for k3b-mp3, closes http://bugzilla.ubuntu.com/15660 + + -- Jonathan Riddell Sat, 17 Sep 2005 21:51:42 +0100 + +k3b (0.12.2-0ubuntu1) breezy; urgency=low + + * New upstream release + * Added support for .iso files to be automatically opened by k3b + * Sponsored upload for Martin Meredith + + -- Jonathan Riddell Tue, 5 Jul 2005 00:31:42 +0100 + +k3b (0.12.1-3) unstable; urgency=low + + * Upgrade build dependancy on dbus-qt-1-dev to build with a C++ + transitioned version. (closes: #322084) + + -- Jean-Michel Kelbert Tue, 30 Aug 2005 22:54:44 +0200 + +k3b (0.12.1-2) unstable; urgency=low + + * Add to Build-Depends: + - dbus-qt-1-dev, libhal-dev, libhal-storage-dev, libpopt-dev for DBus/Hal support + - libmpcdec-dev for Musepack support + - libresmgr-dev for Resmgr support + - libtag1-dev for audio meta data reading with Taglib + - libmusicbrainz4-dev for tag guessing using MusicBrainz + - flac to avoid configure errors + (closes: #315613) + * Add *.la and *.so files to the k3blibs-dev package + + -- Jean-Michel Kelbert Tue, 28 Jun 2005 11:49:11 +0200 + +k3b (0.12.1-1ubuntu2) breezy; urgency=low + + * Removed flac patch and added flac as Build-Depend + (oversight in previous package) + * Add kubuntu_01_hide_k3bsetup.diff to hide k3bsetup + from menu + * Add kubuntu_02_no_require_cdrdao.diff to stop it warning + if cdrdao is not installed + * Sponsored upload for Martin Meredith + + -- Jonathan Riddell Wed, 29 Jun 2005 00:34:01 +0100 + +k3b (0.12.1-1ubuntu1) breezy; urgency=low + + * Sync with Debian + * Build for Breezy + * Added libxi-dev as Build-Depends + * Add Build-Depends on libtag1-dev, libmusicbrainz4-dev, libhal-dev, libmad0-dev, libdbus-qt-1-dev + * Create package k3b-mp3 with MP3 decoder plugins + * Fixed Bug/error in FLAC decoder plugin + * Sponsored upload for Martin Meredith + + -- Jonathan Riddell Mon, 27 Jun 2005 02:27:54 +0100 + +k3b (0.12.1-1) unstable; urgency=low + + * New upstream release + + -- Jean-Michel Kelbert Mon, 20 Jun 2005 17:16:46 +0200 + +k3b (0.11.24-0ubuntu1) breezy; urgency=low + + * New upstream release + * Built for breezy + * Fix typo in k3b.files (mimlnk -> mimelnk) + * Sponsored upload for Martin Meredith + + -- Jonathan Riddell Mon, 13 Jun 2005 11:33:54 +0100 + +k3b (0.11.23-0ubuntu4) breezy; urgency=low + + * Rebuilt for Breezy and Patched to fix build error + + -- Martin Meredith Mon, 13 Jun 2005 03:16:47 +0100 + +k3b (0.11.23-0ubuntu3) hoary; urgency=low + + * Replaced libmad, libmad-dev + * Changed cdrdao as a suggests + * configure runs now with k3bsetup=no + + -- Andreas Mueller Mon, 4 Apr 2005 23:50:28 +0200 + +k3b (0.11.23-0ubuntu2) hoary; urgency=low + + * Added libmad0 build depends (Hoary: 8052) + * Added cdrdao as a new install depends (Hoary: 7877) + * Added a README.Ubuntu about restricted formats + * Removed k3bsetup, man page and his desktop file (Hosry: 8011) + + -- Andreas Mueller Sat, 1 Apr 2005 19:46:18 +0200 + +k3b (0.11.23-0ubuntu1) hoary; urgency=low + + * Added sox, movixmaker-2 as a suggestion + * Fixed session import. + * Fixed seldom crash in the welcome widget. + * Flac 1.1.2 compile fix. + * Little fix in capabilities detection (only affects buggy firmwares) + * Properly detect the Philips 2600 + * Made multisession selection in DVD project visible. + * Fixed crash when importing session failed. + * Fixed compilation with flac 1.1.2 + * New upstream release + + -- Andreas Mueller Sun, 27 Mar 2005 18:08:33 +0200 + +k3b (0.11.20-2) unstable; urgency=low + + * Rename normalize to normalize-audio. + (closes: #267052) + * Apply a patch to update man page. Thanks to Stuart Prescott. + (closes: #266005) + * Move menu entry in Applications/Tools. + (closes: #270444) + * Apply a patch to prevent the ripping progress icon from flickering + heavily. Thanks to Eike Sauer. + (closes: #294230) + * Add sox and movixmaker-2 to Suggests. + (closes: #249278) + + -- Jean-Michel Kelbert Fri, 4 Mar 2005 21:44:10 +0100 + +k3b (0.11.20-1) unstable; urgency=low + + * New upstream release + + -- Jean-Michel Kelbert Fri, 11 Feb 2005 23:25:28 +0000 + +k3b (0.11.20-0ubuntu2) hoary; urgency=low + + * Add hidden=true to k3bsetup2.desktop + + -- Jonathan Riddell Thu, 17 Mar 2005 01:25:59 +0000 + +k3b (0.11.20-0ubuntu1) hoary; urgency=low + + * New upstream release + * removed debian-patch, upstream fixed it now. + + -- Andreas Mueller Sat, 12 Feb 2005 20:45:59 +0100 + +k3b (0.11.19-1) unstable; urgency=low + + * New upstream release + + -- Jean-Michel Kelbert Thu, 27 Jan 2005 09:56:51 +0100 + +k3b (0.11.18-2ubuntu1) hoary; urgency=low + + * Rebuild with new libflac (no changes) + * Move patch for burn crash into debian/patches + + -- Jonathan Riddell Sat, 15 Jan 2005 22:37:07 +0000 + +k3b (0.11.18-2) unstable; urgency=high + + * Apply a patch to prevent k3b from crashing when pressing "Burn". That's + why a set urgency to high. + (closes: #289440) + * Rebuild with newer FLAC. + (closes: #289372) + + -- Jean-Michel Kelbert Tue, 11 Jan 2005 20:50:31 +0100 + +k3b (0.11.18-1) unstable; urgency=low + + * New upstream release + + -- Jean-Michel Kelbert Sun, 26 Dec 2004 22:38:48 +0100 + +k3b (0.11.18-1ubuntu1) hoary; urgency=low + + * New upstream release + * added missing build-depend + + -- Andreas Mueller Wed, 5 Jan 2005 17:03:27 +0100 + +k3b (0.11.17-1) unstable; urgency=low + + * New upstream release + + -- Jean-Michel Kelbert Thu, 23 Sep 2004 21:33:09 +0200 + +k3b (0.11.16-1) unstable; urgency=low + + * New upstream release + (closes: #267338, #271780, #272122, #269736) + + -- Jean-Michel Kelbert Sun, 19 Sep 2004 10:27:06 +0200 + +k3b (0.11.14-2) unstable; urgency=low + + * Recompile k3b to prevent it from crashing when the configure diaglog is + closed. + (closes: #269741, #266086) + + -- Jean-Michel Kelbert Sat, 11 Sep 2004 15:00:23 +0200 + +k3b (0.11.14-1) unstable; urgency=low + + * New upstream release. + (closes: #264943) + * Move kcontrol do Depends. + (closes: #252984) + * Change the burning group to "cdrom". + (closes: #263948) + + -- Jean-Michel Kelbert Wed, 11 Aug 2004 20:00:12 +0200 + +k3b (0.11.13-1) unstable; urgency=low + + * New upstream release + (closes: #261025, #257570, #253266, #252984, #249411, #248185, #240460, #260271, #253177, #249338) + + -- Jean-Michel Kelbert Wed, 4 Aug 2004 15:18:37 +0200 + +k3b (0.11.12-1) unstable; urgency=low + + * New upstream release + + -- Jean-Michel Kelbert Sat, 26 Jun 2004 17:18:49 +0200 + +k3b (0.11.11-1) unstable; urgency=low + + * New upstream release + + -- Jean-Michel Kelbert Tue, 15 Jun 2004 13:30:01 +0200 + +k3b (0.11.10-1) unstable; urgency=low + + * New upstream release + (closes: #252291) + + -- Jean-Michel Kelbert Wed, 26 May 2004 22:38:48 +0200 + +k3b (0.11.9-2) unstable; urgency=low + + * Depends now on kdebase-bin. + (closes: #245566) + * Suggests normalize and toolame. + (closes: #240770) + * Correct typos in description. + (closes: #232004) + * Remove references to wrong documentation in the manpage. + (closes: #225758) + + -- Jean-Michel Kelbert Sat, 1 May 2004 11:22:30 +0000 + +k3b (0.11.9-1) unstable; urgency=low + + * New upstream release. Wouh, two releases today, I don't have time to + package the first one. + + -- Jean-Michel Kelbert Mon, 29 Mar 2004 23:05:45 +0200 + +k3b (0.11.7-1) unstable; urgency=low + + * New upstream release + * Remove dpatch commands from debian/rules + (closes: #239832) + + -- Jean-Michel Kelbert Sun, 28 Mar 2004 12:56:43 +0200 + +k3b (0.11.6-1) unstable; urgency=low + + * New upstream release. + (closes: #229898, #226858) + * Add libflac++-dec to Build-Depends. + * Merge libraries packages. + + -- Jean-Michel Kelbert Tue, 9 Mar 2004 15:36:23 +0100 + +k3b (0.10.3-5) unstable; urgency=low + + * Add kdebase-bin to Suggests in debian/control + (closes: #227254) + * Apply a patch to let cdrdao working with ATAPI drives on kernel 2.6 + (closes: #227336) + + -- Jean-Michel Kelbert Wed, 14 Jan 2004 22:22:22 +0100 + +k3b (0.10.3-4) unstable; urgency=low + + * Add plugins to libk3plugins + (closes: #225553, #225600) + + -- Jean-Michel Kelbert Tue, 6 Jan 2004 08:54:15 +0100 + +k3b (0.10.3-3) unstable; urgency=low + + * Add libkcm_k3bsetup2.la to libk3bcore. + (closes: #225566, #225589, #225985) + + -- Jean-Michel Kelbert Sun, 4 Jan 2004 01:27:35 +0100 + +k3b (0.10.3-2) unstable; urgency=low + + * Fix missing depends on k3b libs. + (closes: #225457, #225459) + * Change icons location under kde. + (closes: #224820) + + -- Jean-Michel Kelbert Thu, 1 Jan 2004 19:10:45 +0100 + +k3b (0.10.3-1) unstable; urgency=low + + * New upstream release + (closes: #218063) + + -- Jean-Michel Kelbert Tue, 9 Dec 2003 19:57:45 +0100 + +k3b (0.9-4) unstable; urgency=low + + * Add a patch to inform user to use 'dpkg-reconfigure cdrecord' instead of + k3bsetup when k3b detect that cdrecord isn't setuid. + * Add kcontrol to Recommands. + (closes: #206753) + * Add kdelibs-data to Depends since + usr/share/mimelnk/application/x-iso.desktop and + usr/share/mimelnk/application/x-cue.desktop which where conflicting with + arson package are now included in it. + (closes: #204532) + * Add a patch for solving a syntax problem in some German entries. + (closes: #212238) + * Add the patch provided by Chris Cheney to clean debian/rules. Adapt the + resulting debian/rules to k3b.(Thanks to Chris) + (closes: #214509) + + -- Jean-Michel Kelbert Fri, 10 Oct 2003 22:47:29 +0200 + +k3b (0.9-3.1) unstable; urgency=low + + * NMU + * Removed x-cue.desktop and x-iso.desktop since they are now a part of + kdelibs-data. + + -- Christopher L Cheney Mon, 6 Oct 2003 22:00:00 -0500 + +k3b (0.9-3) unstable; urgency=low + + * Change the previous changelog entry. Thanks to Rene Engelhard. + * Add a patch for adding group read permission on cdrecord in k3bsetup. The + patch concerns src/k3bsetup/k3bsetup.cpp. Thanks to Matthew A. Nicholson. + (closes: #201393, #203819) + + -- Jean-Michel Kelbert Sun, 3 Aug 2003 21:20:13 +0200 + +k3b (0.9-2) unstable; urgency=low + + * Add a patch for changing dlopen() libcdda_interface.so.0 instead of + libcdda_interface.so. The patch concerns src/tools/k3bcdparanoialib.cpp. + (closes: #199819) + + -- Jean-Michel Kelbert Sun, 3 Aug 2003 11:06:25 +0200 + +k3b (0.9-1) unstable; urgency=low + + * New upstream release. + (closes: #195684, #202359) + * Use -fpermissive to allow compilation with gcc 3.3.1. + * Split the package in three because there is now a library: libk3bcore. + * Added k3b-i18n in Suggest. + + -- Jean-Michel Kelbert Thu, 24 Jul 2003 00:17:05 +0200 + +k3b (0.8.1-3) unstable; urgency=low + + * Made some changes in the dependancies. + * Compile against kdelibs4-dev (>= 3.1.1) in order to depend on the new + libvorbis. + + -- Jean-Michel Kelbert Sat, 15 Mar 2003 00:57:14 -0500 + +k3b (0.8.1-2) unstable; urgency=low + + * Added a line debian/rules to change the date of admin/config.guess, so + that the package will compile from sources. + + -- Jean-Michel Kelbert Thu, 13 Mar 2003 22:43:17 -0500 + +k3b (0.8.1-1) unstable; urgency=low + + * Initial Release. + (closes: #165264) + * Thanks to Karolina Lindqvist for manpages + + -- Jean-Michel Kelbert Wed, 19 Feb 2003 23:53:45 -0500 +