Bug#691188: unblock: [pre-approval] ncmpcpp/0.5.10-1.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Hi all!
I would really like to get #676627 fixed for wheezy. Although it
might not be strictly RC I think failing to display the content (when
no configuration is present and Playlist should be shown in column
mode) is really confusing and there exists a small patch applied
upstream that works for the package in unstable (I built and tested
it). Is the attached diff OK for a freeze exception? If yes I would
work with the maintainer to get it uploaded or push an NMU.
Regards
Christoph
unblock ncmpcpp/0.5.10-1.1
==========
diff -Nru ncmpcpp-0.5.10/debian/changelog ncmpcpp-0.5.10/debian/changelog
--- ncmpcpp-0.5.10/debian/changelog 2012-05-27 22:20:23.000000000 -0700
+++ ncmpcpp-0.5.10/debian/changelog 2012-10-22 11:59:17.000000000 -0700
@@ -1,3 +1,12 @@
+ncmpcpp (0.5.10-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix displaying of playlist in column mode if no config file is present
+ using the patch applied upstream (See upstream bug #3490 / commit
+ 6126def6). (Closes: #676627)
+
+ -- Christoph Egger <christoph@debian.org> Mon, 22 Oct 2012 11:48:45 -0700
+
ncmpcpp (0.5.10-1) unstable; urgency=low
* New upstream release:
diff -Nru ncmpcpp-0.5.10/debian/patches/column-mode.patch ncmpcpp-0.5.10/debian/patches/column-mode.patch
--- ncmpcpp-0.5.10/debian/patches/column-mode.patch 1969-12-31 16:00:00.000000000 -0800
+++ ncmpcpp-0.5.10/debian/patches/column-mode.patch 2012-10-22 11:50:50.000000000 -0700
@@ -0,0 +1,53 @@
+From 6126def6c5b339c7f43d99c47501dde21d4943b3 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <electricityispower@gmail.com>
+Date: Mon, 16 Jul 2012 00:20:25 +0200
+Subject: [PATCH 1/1] settings: fix columns generation without configuration file (ticket #3490)
+
+---
+ src/ncmpcpp.cpp | 2 ++
+ src/settings.cpp | 6 +++++-
+ src/settings.h | 1 +
+ 3 files changed, 8 insertions(+), 1 deletions(-)
+
+Index: ncmpcpp-0.5.10/src/ncmpcpp.cpp
+===================================================================
+--- ncmpcpp-0.5.10.orig/src/ncmpcpp.cpp 2012-04-01 09:49:09.000000000 -0700
++++ ncmpcpp-0.5.10/src/ncmpcpp.cpp 2012-10-22 11:50:44.836885069 -0700
+@@ -249,6 +249,8 @@
+ Config.Read();
+ Key.Read();
+
++ Config.GenerateColumns();
++
+ if (getenv("MPD_HOST"))
+ Mpd.SetHostname(getenv("MPD_HOST"));
+ if (getenv("MPD_PORT"))
+Index: ncmpcpp-0.5.10/src/settings.cpp
+===================================================================
+--- ncmpcpp-0.5.10.orig/src/settings.cpp 2012-04-01 09:49:09.000000000 -0700
++++ ncmpcpp-0.5.10/src/settings.cpp 2012-10-22 11:50:44.846885787 -0700
+@@ -1330,7 +1330,11 @@
+ }
+ }
+ f.close();
+-
++}
++
++void NcmpcppConfig::GenerateColumns()
++{
++ columns.clear();
+ std::string width;
+ while (!(width = GetLineValue(song_list_columns_format, '(', ')', 1)).empty())
+ {
+Index: ncmpcpp-0.5.10/src/settings.h
+===================================================================
+--- ncmpcpp-0.5.10.orig/src/settings.h 2012-04-01 09:49:09.000000000 -0700
++++ ncmpcpp-0.5.10/src/settings.h 2012-10-22 11:50:44.846885787 -0700
+@@ -149,6 +149,7 @@
+
+ void SetDefaults();
+ void Read();
++ void GenerateColumns();
+
+ std::string ncmpcpp_directory;
+ std::string lyrics_directory;
diff -Nru ncmpcpp-0.5.10/debian/patches/series ncmpcpp-0.5.10/debian/patches/series
--- ncmpcpp-0.5.10/debian/patches/series 2012-05-27 22:20:23.000000000 -0700
+++ ncmpcpp-0.5.10/debian/patches/series 2012-10-22 11:50:29.000000000 -0700
@@ -2,3 +2,4 @@
check-return-value-of-system.patch
fix-typo.patch
fix-manpage.patch
+column-mode.patch
Reply to: