--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi,
I just noticed that a new version of nama has been uploaded before
1.063-1 migrated to testing to fix a FTBFS. On the good side the new
upstream release is just a small bug fix so it should be safe to allow
the new version to testing, on the bad side the upload also introduces a
Recommends: on a package just accepted into unstable today (and thus not
part of squeeze).
I see two possible solutions to include the RC bug fix in Squeeze:
a) Allow both nama/1.064-1 and the (new) libaudio-ecasound-perl to
migrate to testing. However I guess the release team is not happy about
including new packages at this point.
b) Preparing a -2 revision of nama that drops the new Recommends and
allowing it to migrate.
A diffstat and diff from 1.063-1 (uploaded to unstable before the
freeze) to 1.064-1 is attached below.
Regards,
Ansgar
PS: Please Cc debian-perl@l.d.o in replies.
Changes | 3 +++
META.yml | 3 ++-
Makefile.PL | 1 +
debian/changelog | 6 ++++++
debian/control | 5 +++--
lib/Audio/Nama.pm | 8 ++++++--
lib/Audio/Nama/Assign.pm | 8 ++++++--
7 files changed, 27 insertions(+), 7 deletions(-)
Index: debian/control
===================================================================
--- debian/control (revision 61450)
+++ debian/control (revision 61451)
@@ -7,7 +7,7 @@
libfile-find-rule-perl, libanyevent-perl, libevent-perl,
libfile-copy-link-perl, libyaml-tiny-perl, libparse-recdescent-perl,
libterm-readline-gnu-perl, libdata-section-perl, libtest-pod-perl,
- libtest-pod-coverage-perl
+ libtest-pod-coverage-perl, libfile-homedir-perl,
Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/nama
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/nama
@@ -21,7 +21,8 @@
libgraph-perl, libtext-format-perl, libmodern-perl-perl,
libfile-find-rule-perl, libanyevent-perl, libevent-perl,
libfile-copy-link-perl, libyaml-tiny-perl, libparse-recdescent-perl,
- libterm-readline-gnu-perl, libdata-section-perl
+ libterm-readline-gnu-perl, libdata-section-perl, libfile-homedir-perl,
+Recommends: libaudio-ecasound-perl
Suggests: perl-tk
Description: Ecasound-based multitrack recorder/mixer
Nama is a text-based application for multitrack
Index: debian/changelog
===================================================================
--- debian/changelog (revision 61450)
+++ debian/changelog (revision 61451)
@@ -1,3 +1,9 @@
+nama (1.064-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Joel Roth <joelz@pobox.com> Sun, 08 Aug 2010 20:47:48 -1000
+
nama (1.063-1) unstable; urgency=low
* Team Upload.
Index: META.yml
===================================================================
--- META.yml (revision 61450)
+++ META.yml (revision 61451)
@@ -19,6 +19,7 @@
Event: 0
File::Copy::Link: 0
File::Find::Rule: 0
+ File::HomeDir: 0
File::Temp: 0
Graph: 0
IO::All: 0
@@ -34,4 +35,4 @@
perl: 5.10.0
resources:
license: http://dev.perl.org/licenses/
-version: 1.063
+version: 1.064
Index: lib/Audio/Nama.pm
===================================================================
--- lib/Audio/Nama.pm (revision 61450)
+++ lib/Audio/Nama.pm (revision 61451)
@@ -26,7 +26,7 @@
package Audio::Nama;
require 5.10.0;
use vars qw($VERSION);
-$VERSION = 1.063;
+$VERSION = 1.064;
use Modern::Perl;
#use Carp::Always;
no warnings qw(uninitialized syntax);
@@ -4548,6 +4548,9 @@
sub command_process {
my $input = shift;
my $input_was = $input;
+
+ # parse repeatedly until all input is consumed
+
while ($input =~ /\S/) {
$debug and say "input: $input";
$parser->meta(\$input) or print("bad command: $input_was\n"), last;
@@ -8193,7 +8196,8 @@
1;
}
bunch_spec: text
-meta: text semicolon(?) { $Audio::Nama::parser->do_part($item{text}) }
+meta: nosemi(s /\s*;\s*/) semicolon(?)
+nosemi: text { $Audio::Nama::parser->do_part($item{text}) }
text: /[^;]+/
semicolon: ';'
do_part: track_spec command
Index: lib/Audio/Nama/Assign.pm
===================================================================
--- lib/Audio/Nama/Assign.pm (revision 61450)
+++ lib/Audio/Nama/Assign.pm (revision 61451)
@@ -7,6 +7,7 @@
use Carp;
use YAML::Tiny;
use IO::All;
+use File::HomeDir;
use Storable;
#use Devel::Cycle;
@@ -351,13 +352,16 @@
sub expand_tilde {
my $path = shift;
+ my $home = File::HomeDir->my_home;
+
+
# ~bob -> /home/bob
$path =~ s(
^ # beginning of line
~ # tilde
(\w+) # username
)
- (/home/$1)x;
+ (File::HomeDir->users_home($1))ex;
# ~/something -> /home/bob/something
$path =~ s(
@@ -365,7 +369,7 @@
~ # tilde
/ # slash
)
- ($ENV{HOME}/)x;
+ ($home/)x;
$path
}
sub read_file {
Index: Makefile.PL
===================================================================
--- Makefile.PL (revision 61450)
+++ Makefile.PL (revision 61451)
@@ -16,6 +16,7 @@
Event => 0,
File::Find::Rule => 0,
File::Copy::Link => 0,
+ File::HomeDir => 0,
File::Temp => 0,
Graph => 0,
IO::All => 0,
Index: Changes
===================================================================
--- Changes (revision 61450)
+++ Changes (revision 61451)
@@ -1,5 +1,8 @@
Changes to Audio::Nama
+1.064 August 6, 2010
+ - fix Bug rt.cpan.org #60024: Audio::Nama::Assign::expand_tilde()
+
1.063 August 2, 2010
- various minor improvements
--- End Message ---