On Sun, Nov 28, 2010 at 12:39:53PM +0000, Neil McGovern wrote: > Hi Peter, thanks for getting in touch > > On Sun, Nov 28, 2010 at 02:13:56PM +0200, Peter Pentchev wrote: > > Package: release.debian.org > > Severity: normal > > User: release.debian.org@packages.debian.org > > Usertags: unblock > > > > Thanks for your efforts towards great Debian releases! > > > > I've made some changes towards a new version of my wmanager package, > > mainly to close #605043 that the submitter kindly placed at "normal" > > severity, although I think that for everyone using wmanagerrc-update > > in non-English locales with translated update-alternatives messages > > it pretty much makes this little part of wmanager quite unusable. > > (I never noticed it since update-alternatives does not have Bulgarian > > message translations) > > Seems like it also removes user data, so should be RC. > > > Would this be considered a good enough reason to unblock wmanager-0.2.1-9 > > for Squeeze? > > Yes, but.. > > > I've not uploaded it yet, and I've also taken the liberty of making > > some other changes that should be no-ops from a usability and > > buildability (to coin a word) standpoint; you may find them in the > > attached debdiff: > > These other changes woudn't. Debhelper is especially worrying, it can > introduce strange behaviour on some cases. Fair enough. > Could we have just the #605043 fix? Okay. Attached are two more debdiffs :) Truth be told, from the order I made the commits (yes, my fault for going after low-hanging fruit first), I'd slightly prefer to also include the Standards-Version bump; but the other debdiff has only the RC bugfix. Either one would be fine with me to upload. Thanks for your time and analysis! G'luck, Peter -- Peter Pentchev roam@space.bg roam@ringlet.net roam@FreeBSD.org PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553 This would easier understand fewer had omitted.
diffstat for wmanager-0.2.1 wmanager-0.2.1
changelog | 8 ++++++++
control | 2 +-
wmanagerrc-update | 6 +++---
3 files changed, 12 insertions(+), 4 deletions(-)
diff -Nru wmanager-0.2.1/debian/changelog wmanager-0.2.1/debian/changelog
--- wmanager-0.2.1/debian/changelog 2010-06-29 00:29:46.000000000 +0300
+++ wmanager-0.2.1/debian/changelog 2010-11-28 15:19:38.000000000 +0200
@@ -1,3 +1,11 @@
+wmanager (0.2.1-9) unstable; urgency=low
+
+ * Bump Standards-Version to 3.9.1 with no changes.
+ * Let wmanagerrc-update use update-alternatives --query, not --display,
+ to fix its operation with non-English text. Closes: #605043
+
+ -- Peter Pentchev <roam@ringlet.net> Sun, 28 Nov 2010 13:08:34 +0200
+
wmanager (0.2.1-8) unstable; urgency=low
* Bump Standards-Version to 3.9.0 with no changes.
diff -Nru wmanager-0.2.1/debian/control wmanager-0.2.1/debian/control
--- wmanager-0.2.1/debian/control 2010-06-29 10:07:28.000000000 +0300
+++ wmanager-0.2.1/debian/control 2010-11-28 15:19:38.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Peter Pentchev <roam@ringlet.net>
DM-Upload-Allowed: yes
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7~), libfltk1.1-dev
Homepage: http://www.daemogorgon.net/software/wmanager/
Vcs-Svn: http://svn.ringlet.net/svn/ringlet/x11/wmanager/trunk/wmanager-pkg/debian/
diff -Nru wmanager-0.2.1/debian/wmanagerrc-update wmanager-0.2.1/debian/wmanagerrc-update
--- wmanager-0.2.1/debian/wmanagerrc-update 2008-07-02 18:22:02.000000000 +0300
+++ wmanager-0.2.1/debian/wmanagerrc-update 2010-11-28 15:19:38.000000000 +0200
@@ -21,10 +21,10 @@
{
cat "$HOME/.wmanagerrc.user" 2>/dev/null || true
[ ! -x /usr/sbin/update-alternatives ] ||
- /usr/sbin/update-alternatives --display x-window-manager \
+ /usr/sbin/update-alternatives --query x-window-manager \
|perl -ne '
- m{^(/.*) - priority (\d+)$} or next;
- push @{$p{$2}}, $1;
+ m{^Alternative:\s+([/\w]+)$} and $alt = $1;
+ m{^Priority:\s+(\d+)$} and push @{$p{$1}}, $alt;
END {
print map {"$_\000"}
diffstat for wmanager-0.2.1 wmanager-0.2.1
changelog | 7 +++++++
wmanagerrc-update | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff -Nru wmanager-0.2.1/debian/changelog wmanager-0.2.1/debian/changelog
--- wmanager-0.2.1/debian/changelog 2010-06-29 00:29:46.000000000 +0300
+++ wmanager-0.2.1/debian/changelog 2010-11-28 15:23:06.000000000 +0200
@@ -1,3 +1,10 @@
+wmanager (0.2.1-9) unstable; urgency=low
+
+ * Let wmanagerrc-update use update-alternatives --query, not --display,
+ to fix its operation with non-English text. Closes: #605043
+
+ -- Peter Pentchev <roam@ringlet.net> Sun, 28 Nov 2010 13:08:34 +0200
+
wmanager (0.2.1-8) unstable; urgency=low
* Bump Standards-Version to 3.9.0 with no changes.
diff -Nru wmanager-0.2.1/debian/wmanagerrc-update wmanager-0.2.1/debian/wmanagerrc-update
--- wmanager-0.2.1/debian/wmanagerrc-update 2008-07-02 18:22:02.000000000 +0300
+++ wmanager-0.2.1/debian/wmanagerrc-update 2010-11-28 15:19:38.000000000 +0200
@@ -21,10 +21,10 @@
{
cat "$HOME/.wmanagerrc.user" 2>/dev/null || true
[ ! -x /usr/sbin/update-alternatives ] ||
- /usr/sbin/update-alternatives --display x-window-manager \
+ /usr/sbin/update-alternatives --query x-window-manager \
|perl -ne '
- m{^(/.*) - priority (\d+)$} or next;
- push @{$p{$2}}, $1;
+ m{^Alternative:\s+([/\w]+)$} and $alt = $1;
+ m{^Priority:\s+(\d+)$} and push @{$p{$1}}, $alt;
END {
print map {"$_\000"}
Attachment:
signature.asc
Description: Digital signature