[neon/kde/k3b/Neon/stable] debian: lint me green
Carlos De Maine
null at kde.org
Sat Jan 20 05:54:47 GMT 2024
Git commit bd002cfb0c2d719e691e26d0ff7a6db6e982807c by Carlos De Maine.
Committed on 20/01/2024 at 06:54.
Pushed by carlosdem into branch 'Neon/stable'.
lint me green
M +1 -1 debian/control
A +5 -0 debian/k3b.lintin-overrides
D +0 -206 debian/patches/101_rename_normalize.diff
D +0 -38 debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
D +0 -15 debian/patches/110_disable_no_problems_found_popup.diff
D +0 -16 debian/patches/111_advice_debian_libk3b3-extracodes.diff
D +0 -22 debian/patches/112_dont_require_mp3.diff
D +0 -12 debian/patches/series
https://invent.kde.org/neon/kde/k3b/-/commit/bd002cfb0c2d719e691e26d0ff7a6db6e982807c
diff --git a/debian/control b/debian/control
index f451c42..ed0f8a5 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,7 @@ Depends: cdparanoia,
cdrskin,
genisoimage,
k3b-data (= ${source:Version}),
- libk3b7 (= ${binary:Version}),
+ libk3b8 (= ${binary:Version}),
udisks2 [linux-any],
wodim,
${misc:Depends},
diff --git a/debian/k3b.lintin-overrides b/debian/k3b.lintin-overrides
new file mode 100644
index 0000000..b81786d
--- /dev/null
+++ b/debian/k3b.lintin-overrides
@@ -0,0 +1,5 @@
+k3b: executable-not-elf-or-script usr/share/kio/servicemenus/k3b_create_audio_cd.desktop
+k3b: executable-not-elf-or-script usr/share/kio/servicemenus/k3b_create_data_project.desktop
+k3b: executable-not-elf-or-script usr/share/kio/servicemenus/k3b_create_video_cd.desktop
+k3b: executable-not-elf-or-script usr/share/kio/servicemenus/k3b_write_bin_image.desktop
+k3b: executable-not-elf-or-script usr/share/kio/servicemenus/k3b_write_iso_image.desktop
\ No newline at end of file
diff --git a/debian/patches/101_rename_normalize.diff b/debian/patches/101_rename_normalize.diff
deleted file mode 100644
index 9633af3..0000000
--- a/debian/patches/101_rename_normalize.diff
+++ /dev/null
@@ -1,206 +0,0 @@
-Description: normalize is named "normalize-audio" in Debian.
- Change that everywhere.... for real this time
-Reviewed-by: Didier Raboud <didier at raboud.com>
-Updated-by: Roderick B. Greening <roderick.greening at gmail.com>
-Updated-by: Pino Toscano <pino at debian.org>
-Last-Update: 2012-02-20
-
----
- libk3b/core/k3bdefaultexternalprograms.cpp | 8 +++++++-
- libk3b/core/k3bdefaultexternalprograms.h | 3 +++
- libk3b/projects/audiocd/k3baudiodoc.cpp | 4 ++--
- libk3b/projects/audiocd/k3baudionormalizejob.cpp | 12 ++++++------
- src/k3bprojectmanager.cpp | 4 ++--
- src/projects/k3baudioburndialog.cpp | 12 ++++++------
- src/projects/k3bmixedburndialog.cpp | 12 ++++++------
- 7 files changed, 32 insertions(+), 23 deletions(-)
-
---- a/libk3b/core/k3bdefaultexternalprograms.cpp
-+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -427,11 +427,17 @@ QString K3b::VcdbuilderProgram::versionI
-
-
- K3b::NormalizeProgram::NormalizeProgram()
-- : K3b::SimpleExternalProgram( "normalize" )
-+ : K3b::SimpleExternalProgram( "normalize-audio" )
- {
- }
-
-
-+QString K3b::NormalizeProgram::versionIdentifier( const ExternalBin& /*bin*/ ) const
-+{
-+ return QLatin1String( "normalize" );
-+}
-+
-+
- K3b::GrowisofsProgram::GrowisofsProgram()
- : K3b::SimpleExternalProgram( "growisofs" )
- {
---- a/libk3b/projects/audiocd/k3baudiodoc.cpp
-+++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
-@@ -590,7 +590,7 @@ bool K3b::AudioDoc::loadDocumentData( QD
- return false;
- }
-
-- else if( e.nodeName() == "normalize" )
-+ else if( e.nodeName() == "normalize-audio" )
- setNormalize( e.text() == "yes" );
-
- else if( e.nodeName() == "hide_first_track" )
-@@ -792,7 +792,7 @@ bool K3b::AudioDoc::saveDocumentData( QD
- saveGeneralDocumentData( docElem );
-
- // add normalize
-- QDomElement normalizeElem = doc.createElement( "normalize" );
-+ QDomElement normalizeElem = doc.createElement( "normalize-audio" );
- normalizeElem.appendChild( doc.createTextNode( normalize() ? "yes" : "no" ) );
- docElem->appendChild( normalizeElem );
-
---- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
-+++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
-@@ -50,10 +50,10 @@ void K3b::AudioNormalizeJob::start()
- connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
- connect( m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotProcessExited(int, QProcess::ExitStatus)) );
-
-- const K3b::ExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize" );
-+ const K3b::ExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" );
-
- if( !bin ) {
-- emit infoMessage( i18n("Could not find normalize executable."), MessageError );
-+ emit infoMessage( i18n("Could not find normalize-audio executable."), MessageError );
- jobFinished(false);
- return;
- }
-@@ -80,8 +80,8 @@ void K3b::AudioNormalizeJob::start()
- if( !m_process->start( KProcess::OnlyStderrChannel ) ) {
- // something went wrong when starting the program
- // it "should" be the executable
-- kDebug() << "(K3b::AudioNormalizeJob) could not start normalize";
-- emit infoMessage( i18n("Could not start normalize."), K3b::Job::MessageError );
-+ kDebug() << "(K3b::AudioNormalizeJob) could not start normalize-audio";
-+ emit infoMessage( i18n("Could not start normalize-audio."), K3b::Job::MessageError );
- jobFinished(false);
- }
- }
-@@ -104,7 +104,7 @@ void K3b::AudioNormalizeJob::slotStdLine
-
- // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)",t,tt,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
-@@ -183,7 +183,7 @@ void K3b::AudioNormalizeJob::slotProcess
- break;
- default:
- if( !m_canceled ) {
-- emit infoMessage( i18n("%1 returned an unknown error (code %2).",QString("normalize"), exitCode),
-+ emit infoMessage( i18n("%1 returned an unknown error (code %2).",QString("normalize-audio"), exitCode),
- K3b::Job::MessageError );
- emit infoMessage( i18n("Please send me an email with the last output."), K3b::Job::MessageError );
- emit infoMessage( i18n("Error while normalizing tracks."), MessageError );
---- a/src/k3bprojectmanager.cpp
-+++ b/src/k3bprojectmanager.cpp
-@@ -293,7 +293,7 @@ void K3b::ProjectManager::loadDefaults(
-
- audioDoc->writeCdText( c.readEntry( "cd_text", true ) );
- audioDoc->setHideFirstTrack( c.readEntry( "hide_first_track", false ) );
-- audioDoc->setNormalize( c.readEntry( "normalize", false ) );
-+ audioDoc->setNormalize( c.readEntry( "normalize-audio", false ) );
- audioDoc->setAudioRippingParanoiaMode( c.readEntry( "paranoia mode", 0 ) );
- audioDoc->setAudioRippingRetries( c.readEntry( "read retries", 128 ) );
- audioDoc->setAudioRippingIgnoreReadErrors( c.readEntry( "ignore read errors", false ) );
-@@ -364,7 +364,7 @@ void K3b::ProjectManager::loadDefaults(
- K3b::MixedDoc* mixedDoc = static_cast<K3b::MixedDoc*>(doc);
-
- mixedDoc->audioDoc()->writeCdText( c.readEntry( "cd_text", true ) );
-- mixedDoc->audioDoc()->setNormalize( c.readEntry( "normalize", false ) );
-+ mixedDoc->audioDoc()->setNormalize( c.readEntry( "normalize-audio", false ) );
-
- // load mixed type
- if( c.readEntry( "mixed_type" ) == "last_track" )
---- a/src/projects/k3baudioburndialog.cpp
-+++ b/src/projects/k3baudioburndialog.cpp
-@@ -186,7 +186,7 @@ void K3b::AudioBurnDialog::loadSettings(
-
- m_cdtextWidget->setChecked( c.readEntry( "cd_text", true ) );
- m_checkHideFirstTrack->setChecked( c.readEntry( "hide_first_track", false ) );
-- m_checkNormalize->setChecked( c.readEntry( "normalize", false ) );
-+ m_checkNormalize->setChecked( c.readEntry( "normalize-audio", false ) );
-
- m_comboParanoiaMode->setCurrentIndex( c.readEntry( "paranoia mode", 0 ) );
- m_checkAudioRippingIgnoreReadErrors->setChecked( c.readEntry( "ignore read errors", true ) );
-@@ -202,7 +202,7 @@ void K3b::AudioBurnDialog::saveSettings(
-
- c.writeEntry( "cd_text", m_cdtextWidget->isChecked() );
- c.writeEntry( "hide_first_track", m_checkHideFirstTrack->isChecked() );
-- c.writeEntry( "normalize", m_checkNormalize->isChecked() );
-+ c.writeEntry( "normalize-audio", m_checkNormalize->isChecked() );
-
- c.writeEntry( "paranoia mode", m_comboParanoiaMode->currentText() );
- c.writeEntry( "ignore read errors", m_checkAudioRippingIgnoreReadErrors->isChecked() );
-@@ -283,11 +283,11 @@ void K3b::AudioBurnDialog::slotNormalize
- {
- if( on ) {
- // we are not able to normalize in on-the-fly mode
-- if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {
-- KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize</em> is not installed.</b>"
-- "<p>K3b uses <em>normalize</em> (http://normalize.nongnu.org/) "
-+ if( !k3bcore->externalBinManager()->foundBin( "normalize-audio" ) ) {
-+ KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize-audio</em> is not installed.</b>"
-+ "<p>K3b uses <em>normalize-audio</em> (http://normalize.nongnu.org/) "
- "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() ) {
---- a/src/projects/k3bmixedburndialog.cpp
-+++ b/src/projects/k3bmixedburndialog.cpp
-@@ -201,7 +201,7 @@ void K3b::MixedBurnDialog::loadSettings(
- K3b::ProjectBurnDialog::loadSettings( c );
-
- m_cdtextWidget->setChecked( c.readEntry( "cd_text", false ) );
-- m_checkNormalize->setChecked( c.readEntry( "normalize", false ) );
-+ m_checkNormalize->setChecked( c.readEntry( "normalize-audio", false ) );
-
- // load mixed type
- if( c.readEntry( "mixed_type" ) == "last_track" )
-@@ -225,7 +225,7 @@ void K3b::MixedBurnDialog::saveSettings(
- K3b::ProjectBurnDialog::saveSettings(c);
-
- c.writeEntry( "cd_text", m_cdtextWidget->isChecked() );
-- c.writeEntry( "normalize", m_checkNormalize->isChecked() );
-+ c.writeEntry( "normalize-audio", m_checkNormalize->isChecked() );
-
- // save mixed type
- switch( m_comboMixedModeType->selectedValue() ) {
-@@ -289,11 +289,11 @@ void K3b::MixedBurnDialog::slotNormalize
- {
- if( on ) {
- // we are not able to normalize in on-the-fly mode
-- if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {
-- KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize</em> is not installed.</b>"
-- "<p>K3b uses <em>normalize</em> (http://normalize.nongnu.org/) "
-+ if( !k3bcore->externalBinManager()->foundBin( "normalize-audio" ) ) {
-+ KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize-audio</em> is not installed.</b>"
-+ "<p>K3b uses <em>normalize-audio</em> (http://normalize.nongnu.org/) "
- "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() ) {
---- a/libk3b/core/k3bdefaultexternalprograms.h
-+++ b/libk3b/core/k3bdefaultexternalprograms.h
-@@ -123,6 +123,9 @@ namespace K3b {
- {
- public:
- NormalizeProgram();
-+
-+ protected:
-+ virtual QString versionIdentifier( const ExternalBin& bin ) const;
- };
-
-
diff --git a/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff b/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
deleted file mode 100644
index 9d6e6c3..0000000
--- a/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- src/k3bsystemproblemdialog.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/k3bsystemproblemdialog.cpp
-+++ b/src/k3bsystemproblemdialog.cpp
-@@ -221,6 +221,7 @@ void K3b::SystemProblemDialog::checkSyst
- i18n("Install a more recent version of the cdrtools.") ) );
- }
-
-+/*
- #ifdef Q_OS_LINUX
-
- //
-@@ -257,6 +258,7 @@ void K3b::SystemProblemDialog::checkSyst
- }
- #endif // CDRECORD_SUID_ROOT_CHECK
- #endif
-+*/
- }
-
- if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
-@@ -265,6 +267,7 @@ void K3b::SystemProblemDialog::checkSyst
- i18n("K3b uses cdrdao to actually write CDs."),
- i18n("Install the cdrdao package.") ) );
- }
-+/*
- else {
- #ifdef Q_OS_LINUX
- #ifdef CDRECORD_SUID_ROOT_CHECK
-@@ -280,6 +283,7 @@ void K3b::SystemProblemDialog::checkSyst
- #endif // CDRECORD_SUID_ROOT_CHECK
- #endif
- }
-+*/
- }
-
-
diff --git a/debian/patches/110_disable_no_problems_found_popup.diff b/debian/patches/110_disable_no_problems_found_popup.diff
deleted file mode 100644
index 8e8bf80..0000000
--- a/debian/patches/110_disable_no_problems_found_popup.diff
+++ /dev/null
@@ -1,15 +0,0 @@
----
- src/k3bsystemproblemdialog.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/k3bsystemproblemdialog.cpp
-+++ b/src/k3bsystemproblemdialog.cpp
-@@ -593,7 +593,7 @@ void K3b::SystemProblemDialog::checkSyst
- if( problems.isEmpty() ) {
- kDebug() << " - none - ";
- if( level == AlwaysNotify ) {
-- K3b::PassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System configured properly") );
-+// K3b::PassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System configured properly") );
- }
- }
- else {
diff --git a/debian/patches/111_advice_debian_libk3b3-extracodes.diff b/debian/patches/111_advice_debian_libk3b3-extracodes.diff
deleted file mode 100644
index a480ca5..0000000
--- a/debian/patches/111_advice_debian_libk3b3-extracodes.diff
+++ /dev/null
@@ -1,16 +0,0 @@
----
- src/k3bsystemproblemdialog.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/src/k3bsystemproblemdialog.cpp
-+++ b/src/k3bsystemproblemdialog.cpp
-@@ -526,8 +526,7 @@ void K3b::SystemProblemDialog::checkSyst
- "include MP3 support for legal reasons."),
- i18n("To enable MP3 support, please install the MAD MP3 decoding library as well as the "
- "K3b MAD MP3 decoder plugin (the latter may already be installed but not functional "
-- "due to the missing libmad). Some distributions allow installation of MP3 support "
-- "via an online update tool.") ) );
-+ "due to the missing libmad). To get MP3 support, please install the package libk3b6-extracodecs.") ) );
- }
-
- #ifdef HAVE_ICONV_H
diff --git a/debian/patches/112_dont_require_mp3.diff b/debian/patches/112_dont_require_mp3.diff
deleted file mode 100644
index 21e4394..0000000
--- a/debian/patches/112_dont_require_mp3.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- src/k3bsystemproblemdialog.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/src/k3bsystemproblemdialog.cpp
-+++ b/src/k3bsystemproblemdialog.cpp
-@@ -509,6 +509,7 @@ void K3b::SystemProblemDialog::checkSyst
- // Way too many users are complaining about K3b not being able to decode mp3 files. So just warn them about
- // the legal restrictions with many distros
- //
-+/*
- QList<K3b::Plugin*> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" );
- bool haveMp3Decoder = false;
- for( QList<K3b::Plugin*>::const_iterator it = plugins.constBegin();
-@@ -528,6 +529,7 @@ void K3b::SystemProblemDialog::checkSyst
- "K3b MAD MP3 decoder plugin (the latter may already be installed but not functional "
- "due to the missing libmad). To get MP3 support, please install the package libk3b6-extracodecs.") ) );
- }
-+*/
-
- #ifdef HAVE_ICONV_H
- char* codec = nl_langinfo( CODESET );
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d9fcd78..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,12 +0,0 @@
-#101_rename_normalize.diff
-#104_dont_require_suid_cdrecord_or_cdrdao.diff
-#110_disable_no_problems_found_popup.diff
-##111_advice_debian_libk3b3-extracodes.diff
-##112_dont_require_mp3.diff
-#113_initial_preference.diff
-#cmake-duplicate-doc.diff
-#kubuntu_02_kubuntu_restricted.diff
-#kubuntu_03_no_missing_mp3_warn.diff
-#kubuntu_01_no_system_settings.diff
-#kubuntu_07_quicklists.diff
-#audio_video_categories.diff
More information about the Neon-commits
mailing list