rev 18926 - in kde-extras/k3b/trunk/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Tue Sep 13 05:34:49 UTC 2011


Author: fabo
Date: 2011-09-13 05:34:48 +0000 (Tue, 13 Sep 2011)
New Revision: 18926

Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/control
   kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
   kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
   kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
   kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
   kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
   kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff
   kde-extras/k3b/trunk/debian/patches/114_bug587996_bdr_capacity_fix.diff
   kde-extras/k3b/trunk/debian/patches/Fixed_compilation_with_new_FFMPEG.patch
   kde-extras/k3b/trunk/debian/rules
Log:
* Update debian/control: fix hardcoded list of kFreeBSD architectures.
  (Closes: 634736)
* Update debian/rules: turn off HAL support using
  K3B_ENABLE_HAL_SUPPORT=OFF.


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/changelog	2011-09-13 05:34:48 UTC (rev 18926)
@@ -1,6 +1,9 @@
-k3b (2.0.2-3) UNRELEASED; urgency=low
+k3b (2.0.2-3) unstable; urgency=low
 
   * Add Fixed_compilation_with_new_FFMPEG.patch. (Closes: #638546)
+  * Update debian/control: fix hardcoded list of kFreeBSD architectures.
+    (Closes: 634736)
+  * Update debian/rules: turn off HAL support using K3B_ENABLE_HAL_SUPPORT=OFF.
 
  -- Fathi Boudra <fabo at debian.org>  Mon, 12 Sep 2011 20:11:56 +0300
 

Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/control	2011-09-13 05:34:48 UTC (rev 18926)
@@ -7,7 +7,7 @@
  kdelibs5-dev (>= 4:4.4.4), libavformat-dev, libdvdread-dev, libflac++-dev,
  libflac-dev, libkcddb-dev, libmad0-dev, libmpcdec-dev, libmusicbrainz4-dev,
  libqtwebkit-dev, libsamplerate0-dev, libsndfile1-dev, libtag1-dev,
- shared-mime-info, libvorbis-dev, libcam-dev [kfreebsd-i386 kfreebsd-amd64]
+ shared-mime-info, libvorbis-dev, libcam-dev [kfreebsd-any]
 Standards-Version: 3.9.2
 Homepage: http://www.k3b.org
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/k3b/trunk/

Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2011-09-13 05:34:48 UTC (rev 18926)
@@ -4,6 +4,15 @@
 Updated-by: Roderick B. Greening <roderick.greening at gmail.com>
 Last-Update: 2009-09-30
 
+---
+ libk3b/core/k3bdefaultexternalprograms.cpp       |    2 +-
+ 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 ++++++------
+ 6 files changed, 23 insertions(+), 23 deletions(-)
+
 --- a/libk3b/core/k3bdefaultexternalprograms.cpp
 +++ b/libk3b/core/k3bdefaultexternalprograms.cpp
 @@ -427,7 +427,7 @@ QString K3b::VcdbuilderProgram::versionI

Modified: kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff	2011-09-13 05:34:48 UTC (rev 18926)
@@ -1,3 +1,7 @@
+---
+ 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

Modified: kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff	2011-09-13 05:34:48 UTC (rev 18926)
@@ -1,3 +1,7 @@
+---
+ 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

Modified: kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff	2011-09-13 05:34:48 UTC (rev 18926)
@@ -1,3 +1,7 @@
+---
+ 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

Modified: kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff	2011-09-13 05:34:48 UTC (rev 18926)
@@ -1,3 +1,7 @@
+---
+ 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

Modified: kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff	2011-09-13 05:34:48 UTC (rev 18926)
@@ -1,6 +1,10 @@
 Description: set K3b as the default handler for iso files rather than ark
 Author: Jonathan Thomas <echidnaman at kubuntu.org>
 
+---
+ src/k3b.desktop |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/src/k3b.desktop
 +++ b/src/k3b.desktop
 @@ -142,3 +142,4 @@ X-KDE-StartupNotify=true

Modified: kde-extras/k3b/trunk/debian/patches/114_bug587996_bdr_capacity_fix.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/114_bug587996_bdr_capacity_fix.diff	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/patches/114_bug587996_bdr_capacity_fix.diff	2011-09-13 05:34:48 UTC (rev 18926)
@@ -6,6 +6,10 @@
 Origin: other, http://bugsfiles.kde.org/attachment.cgi?id=51896
 Last-Update: 2010-12-29
 
+---
+ libk3bdevice/k3bdevice_mmc.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/libk3bdevice/k3bdevice_mmc.cpp
 +++ b/libk3bdevice/k3bdevice_mmc.cpp
 @@ -322,7 +322,7 @@ bool K3b::Device::Device::readTrackInfor

Modified: kde-extras/k3b/trunk/debian/patches/Fixed_compilation_with_new_FFMPEG.patch
===================================================================
--- kde-extras/k3b/trunk/debian/patches/Fixed_compilation_with_new_FFMPEG.patch	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/patches/Fixed_compilation_with_new_FFMPEG.patch	2011-09-13 05:34:48 UTC (rev 18926)
@@ -7,8 +7,10 @@
     BUG: 274817
     FIXED-IN: 2.0.3
 
-diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-index 0ad59fc..0c5f366 100644
+---
+ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |   38 ++++++++++++++++++++++------
+ 1 file changed, 31 insertions(+), 7 deletions(-)
+
 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
 +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
 @@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
@@ -26,7 +28,7 @@
          kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
          return false;
      }
-@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
+@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() con
  QString K3bFFMpegFile::title() const
  {
      // FIXME: is this UTF8 or something??

Modified: kde-extras/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/trunk/debian/rules	2011-09-12 17:15:28 UTC (rev 18925)
+++ kde-extras/k3b/trunk/debian/rules	2011-09-13 05:34:48 UTC (rev 18926)
@@ -6,4 +6,7 @@
 %:
 	dh $@ --parallel --dbg-package=k3b-dbg --list-missing --with kde
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DK3B_ENABLE_HAL_SUPPORT=OFF
+
 .PHONY: override_dh_auto_test




More information about the pkg-kde-commits mailing list