[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#685411: marked as done (unblock (pre-approval): k3b/2.0.2-6)

Your message dated Sun, 26 Aug 2012 03:57:26 +0200
with message-id <20120826015726.GK19361@mraw.org>
and subject line Re: Bug#685411: unblock (pre-approval): k3b/2.0.2-6
has caused the Debian Bug report #685411,
regarding unblock (pre-approval): k3b/2.0.2-6
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
685411: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685411
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi RT! I'm writing to ask for pre-approval of the inblock of k3b/2.0.2-6.
The changes are:

- Fix sox >= 14.4.0 detection with fix-sox-detection-with-sox-14.4.0.patch,
 imported from upstream. This closes #675737
- Compress k3b-data and k3b-i18n with xz.
- Enable the lame-based MP3 encoding plugin:
    - build depend on libmp3lame-dev
    - install the new plugin (and its configuration) in libk3b6-extracodecs

I'm attaching the debdiff for this package.

Kinds regards, Lisandro.

unblock k3b/2.0.2-6

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.0.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=es_AR.UTF-8, LC_CTYPE=es_AR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru k3b-2.0.2/debian/changelog k3b-2.0.2/debian/changelog
--- k3b-2.0.2/debian/changelog	2012-06-01 07:30:15.000000000 -0300
+++ k3b-2.0.2/debian/changelog	2012-08-20 12:38:31.000000000 -0300
@@ -1,3 +1,17 @@
+k3b (2.0.2-6) unstable; urgency=low
+
+  * Team upload.
+
+  [ Pino Toscano ]
+  * Compress k3b-data and k3b-i18n as xz.
+  * Add fix-sox-detection-with-sox-14.4.0.patch (backported from upstream
+    branch 2.0) to fix the detection of sox >= 14.4. (Closes: #675737)
+  * Enable the lame-based MP3 encoding plugin:
+    - build depend on libmp3lame-dev
+    - install the new plugin (and its configuration) in libk3b6-extracodecs
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Mon, 20 Aug 2012 12:38:28 -0300
+
 k3b (2.0.2-5) unstable; urgency=low
 
   * Team upload.
diff -Nru k3b-2.0.2/debian/control k3b-2.0.2/debian/control
--- k3b-2.0.2/debian/control	2012-06-01 06:55:56.000000000 -0300
+++ k3b-2.0.2/debian/control	2012-08-20 11:54:27.000000000 -0300
@@ -7,7 +7,8 @@
  kdelibs5-dev (>= 4:4.4.4), libavformat-dev, libdvdread-dev, libflac++-dev,
  libflac-dev, libkcddb-dev, libmad0-dev, libmpcdec-dev,
  libqtwebkit-dev, libsamplerate0-dev, libsndfile1-dev, libtag1-dev,
- shared-mime-info, libvorbis-dev, libcam-dev [kfreebsd-any]
+ shared-mime-info, libvorbis-dev, libcam-dev [kfreebsd-any],
+ libmp3lame-dev
 Standards-Version: 3.9.3
 Homepage: http://www.k3b.org
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/k3b/trunk/
diff -Nru k3b-2.0.2/debian/libk3b6-extracodecs.install k3b-2.0.2/debian/libk3b6-extracodecs.install
--- k3b-2.0.2/debian/libk3b6-extracodecs.install	2012-02-20 06:40:28.000000000 -0300
+++ k3b-2.0.2/debian/libk3b6-extracodecs.install	2012-08-20 11:54:27.000000000 -0300
@@ -1,3 +1,7 @@
 usr/lib/kde4/k3bffmpegdecoder.so
+usr/lib/kde4/k3blameencoder.so
 usr/lib/kde4/k3bmaddecoder.so
+usr/lib/kde4/kcm_k3blameencoder.so
 usr/lib/kde4/kio_videodvd.so
+usr/share/kde4/services/k3blameencoder.desktop
+usr/share/kde4/services/kcm_k3blameencoder.desktop
diff -Nru k3b-2.0.2/debian/patches/fix-sox-detection-with-sox-14.4.0.patch k3b-2.0.2/debian/patches/fix-sox-detection-with-sox-14.4.0.patch
--- k3b-2.0.2/debian/patches/fix-sox-detection-with-sox-14.4.0.patch	1969-12-31 21:00:00.000000000 -0300
+++ k3b-2.0.2/debian/patches/fix-sox-detection-with-sox-14.4.0.patch	2012-08-20 11:54:27.000000000 -0300
@@ -0,0 +1,32 @@
+From 2b672a2928d57b1132644ee4da1d6c664050bce1 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sun, 8 Jul 2012 22:20:15 +0200
+Subject: [PATCH] fix sox detection with sox >= 14.4.0
+
+sox 1.14.0 changed the string that is printed out on --version, breaking the simply string matching done;
+add a new case to cover also this new version
+
+BUG: 301544
+
+(cherry picked from commit 79cd49cac3a6b7031556aae53ce3ecff8c360cb9)
+---
+ plugins/encoder/sox/k3bsoxencoder.cpp |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
+index 62d2bcd..72a3dc0 100644
+--- a/plugins/encoder/sox/k3bsoxencoder.cpp
++++ b/plugins/encoder/sox/k3bsoxencoder.cpp
+@@ -69,6 +69,9 @@ public:
+             if ( pos >= 0 ) {
+                 pos += 17;
+             }
++            else if ( ( pos = out.indexOf( "sox:      SoX v" ) ) >= 0 ) {
++                pos += 15;
++            }
+             else if ( ( pos = out.indexOf( "sox: SoX v" ) ) >= 0 ) {
+                 pos += 10;
+             }
+-- 
+1.7.10.4
+
diff -Nru k3b-2.0.2/debian/patches/series k3b-2.0.2/debian/patches/series
--- k3b-2.0.2/debian/patches/series	2012-02-20 08:19:33.000000000 -0300
+++ k3b-2.0.2/debian/patches/series	2012-08-20 11:54:27.000000000 -0300
@@ -8,3 +8,4 @@
 114_bug587996_bdr_capacity_fix.diff
 k3bscsicommand_bsd-Do-not-access-the-scsi_sense_data.patch
 k3bsetup-put-the-shebang-in-the-first-line.patch
+fix-sox-detection-with-sox-14.4.0.patch
diff -Nru k3b-2.0.2/debian/rules k3b-2.0.2/debian/rules
--- k3b-2.0.2/debian/rules	2012-06-01 07:24:41.000000000 -0300
+++ k3b-2.0.2/debian/rules	2012-08-20 11:54:27.000000000 -0300
@@ -5,10 +5,17 @@
 
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
+# packages to compress as xz
+pkgs_xz := k3b-data k3b-i18n
+
 %:
 	dh $@ --parallel --dbg-package=k3b-dbg --list-missing --with kde
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DK3B_ENABLE_HAL_SUPPORT=OFF
 
+override_dh_builddeb:
+	dh_builddeb $(addprefix -p,$(pkgs_xz)) -- -Zxz
+	dh_builddeb --remaining-packages
+
 .PHONY: override_dh_auto_test

--- End Message ---
--- Begin Message --- 
Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> (23/08/2012):
> On Thu 23 Aug 2012 10:48:03 Lisandro Damián Nicanor Pérez Meyer escribió:
> > Hi KiBi!
> [snip]
> > Totally :-) I think I'll do the upload during the weekend. I'll ping this
> > bug after doing it.
> 
> I got to upload it today. k3b 2.0.2-6 should be in the archive in some hours.

Thanks, unblocked.

Mraw,
KiBi.

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: