Hi Adam! On Tue, Aug 10, 2010 at 08:44:04PM +0100, Adam D. Barratt wrote: > Hi, > > On Tue, 2010-08-10 at 21:23 +0200, Salvatore Bonaccorso wrote: > > (Please Cc debian-perl on replies) > > Done.
Thanks! > > Would it be possible to unblock libconfig-model-tkui-perl once > > uploaded to unstable? 1.308 is affected from a bug, that hid help text > > from the graphical interface. I attach to this request the planned > > debdiff and diffstat for this. > [...] > > 24 files changed, 518 insertions(+), 463 deletions(-) > > > > It seems a really big change, but this is not right true, becouse in > > the debdiff there are too many 'spaces' diffs. > > Would it be possible to regenerate the debdiff using "debdiff -w" so > that it only contains the real changes? Sure! Here is the diffstat now, and attached the debdiff! ChangeLog | 7 ++++++- MANIFEST | 1 + MANIFEST.SKIP | 2 ++ META.yml | 26 ++++++++++++++++++++++++++ debian/changelog | 7 +++++++ debian/control | 2 +- lib/Config/Model/Tk/AnyViewer.pm | 12 ++++++------ lib/Config/Model/Tk/CheckListEditor.pm | 6 ++++-- lib/Config/Model/Tk/CheckListViewer.pm | 14 ++++++++++++-- lib/Config/Model/Tk/HashEditor.pm | 2 +- lib/Config/Model/Tk/HashViewer.pm | 2 +- lib/Config/Model/Tk/LeafEditor.pm | 6 ++++-- lib/Config/Model/Tk/LeafViewer.pm | 2 +- lib/Config/Model/Tk/ListEditor.pm | 2 +- lib/Config/Model/Tk/ListViewer.pm | 2 +- lib/Config/Model/Tk/NodeEditor.pm | 2 +- lib/Config/Model/Tk/NodeViewer.pm | 2 +- lib/Config/Model/Tk/NoteEditor.pm | 2 +- lib/Config/Model/Tk/Wizard.pm | 2 +- lib/Config/Model/TkUI.pm | 9 ++++----- t/big_model.pm | 1 + 21 files changed, 83 insertions(+), 28 deletions(-) Thanks, Salvatore
diff -Nru -w libconfig-model-tkui-perl-1.308/ChangeLog libconfig-model-tkui-perl-1.309/ChangeLog --- libconfig-model-tkui-perl-1.308/ChangeLog 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/ChangeLog 2010-08-09 19:49:45.000000000 +0200 @@ -1,4 +1,9 @@ -2010-07-22 Dominique Dumont <domi.dum...@free.fr> +2010-08-08 Dominique Dumont <domi.dum...@free.fr> 1.309 + + * lib/Config/Model/Tk/AnyViewer.pm (add_help): Fix bug that hid + summary and help text + +2010-07-22 Dominique Dumont <domi.dum...@free.fr> 1.308 * MANIFEST.SKIP: added libconfig to avoid accidental upload of Debian test packages diff -Nru -w libconfig-model-tkui-perl-1.308/MANIFEST libconfig-model-tkui-perl-1.309/MANIFEST --- libconfig-model-tkui-perl-1.308/MANIFEST 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/MANIFEST 2010-08-09 19:49:45.000000000 +0200 @@ -3,6 +3,7 @@ LICENSE MANIFEST MANIFEST.SKIP +META.yml README examples/model.pl lib/Config/Model/Tk/AnyViewer.pm diff -Nru -w libconfig-model-tkui-perl-1.308/MANIFEST.SKIP libconfig-model-tkui-perl-1.309/MANIFEST.SKIP --- libconfig-model-tkui-perl-1.308/MANIFEST.SKIP 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/MANIFEST.SKIP 2010-08-09 19:49:45.000000000 +0200 @@ -2,4 +2,6 @@ libconfig ~$ \.old$ +\.orig$ +_build dist.ini diff -Nru -w libconfig-model-tkui-perl-1.308/META.yml libconfig-model-tkui-perl-1.309/META.yml --- libconfig-model-tkui-perl-1.308/META.yml 1970-01-01 01:00:00.000000000 +0100 +++ libconfig-model-tkui-perl-1.309/META.yml 2010-08-09 19:49:45.000000000 +0200 @@ -0,0 +1,26 @@ +--- +abstract: 'Tk GUI to edit config data through Config::Model' +author: + - 'Dominique Dumont' +build_requires: + Module::Build: 0.3601 +configure_requires: + Module::Build: 0.3601 +dynamic_config: 0 +generated_by: 'Dist::Zilla version 4.101900, CPAN::Meta::Converter version 2.101670' +license: lgpl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Config-Model-TkUI +recommends: + Tk::ObjScanner: 0 +requires: + Config::Model: 1.202 + Exception::Class: 0 + Log::Log4perl: 1.11 + Pod::POM: 0 + Tk: 0 + Tk::DirSelect: 0 + Tk::Tree: 0 +version: 1.309 diff -Nru -w libconfig-model-tkui-perl-1.308/debian/changelog libconfig-model-tkui-perl-1.309/debian/changelog --- libconfig-model-tkui-perl-1.308/debian/changelog 2010-07-23 12:34:56.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/debian/changelog 2010-08-10 13:10:59.000000000 +0200 @@ -1,3 +1,10 @@ +libconfig-model-tkui-perl (1.309-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Salvatore Bonaccorso <salvatore.bonacco...@gmail.com> Tue, 10 Aug 2010 13:10:54 +0200 + libconfig-model-tkui-perl (1.308-1) unstable; urgency=low * New upstream release diff -Nru -w libconfig-model-tkui-perl-1.308/debian/control libconfig-model-tkui-perl-1.309/debian/control --- libconfig-model-tkui-perl-1.308/debian/control 2010-07-23 12:34:56.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/debian/control 2010-08-10 08:40:10.000000000 +0200 @@ -14,7 +14,7 @@ Uploaders: Dominique Dumont <dominique.dum...@hp.com>, Jonathan Yu <jaw...@cpan.org>, gregor herrmann <gre...@debian.org>, Salvatore Bonaccorso <salvatore.bonacco...@gmail.com> -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 Homepage: http://search.cpan.org/dist/Config-Model-TkUI/ Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libconfig-model-tkui-perl/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libconfig-model-tkui-perl/ diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/AnyViewer.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/AnyViewer.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/AnyViewer.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/AnyViewer.pm 2010-08-09 19:49:45.000000000 +0200 @@ -27,7 +27,7 @@ package Config::Model::Tk::AnyViewer ; BEGIN { - $Config::Model::Tk::AnyViewer::VERSION = '1.308'; + $Config::Model::Tk::AnyViewer::VERSION = '1.309'; } use strict; @@ -148,7 +148,7 @@ ->pack( -fill => 'x'); } - return $widget ; + return wantarray ? ($help_frame,$widget) : $help_frame ; } sub add_summary { @@ -156,7 +156,7 @@ my $p = $elt_obj->parent ; my $name = $elt_obj->element_name ; - $cw->add_help( Summary => $p->get_help(summary => $name)) ; + return $cw->add_help( Summary => $p->get_help(summary => $name)) ; } sub add_description { @@ -164,14 +164,14 @@ my $p = $elt_obj->parent ; my $name = $elt_obj->element_name ; - $cw->add_help( Description => $p->get_help(description => $name)) ; + return $cw->add_help( Description => $p->get_help(description => $name)) ; } # returns a widget that must be packed sub add_annotation { my ($cw, $obj) = @_ ; - $cw->add_help('Note', $obj->annotation) ; + return $cw->add_help('Note', $obj->annotation) ; } sub add_editor_button { @@ -181,7 +181,7 @@ $cw->parent->parent->parent->parent -> create_element_widget( edit => $path) ; } ; - $cw->Button(-text => 'Edit ...', -command => $sub) ; + return $cw->Button(-text => 'Edit ...', -command => $sub) ; } # do nothing by default diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/CheckListEditor.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/CheckListEditor.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/CheckListEditor.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/CheckListEditor.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::CheckListEditor ; BEGIN { - $Config::Model::Tk::CheckListEditor::VERSION = '1.308'; + $Config::Model::Tk::CheckListEditor::VERSION = '1.309'; } use strict; @@ -99,7 +99,9 @@ $cw->ConfigModelNoteEditor( -object => $leaf )->pack(@fbe1) ; $cw->add_summary($leaf)->pack(@fx) ; $cw->add_description($leaf)->pack(@fx) ; - $cw->{value_help_widget} = $cw->add_help(value => '',1)->pack(@fx); + my ($help_frame, $help_widget) = $cw->add_help(value => '',1); + $help_frame->pack(@fx); + $cw->{value_help_widget} = $help_widget ; $cw->add_info_button()->pack(@fxe1) ; $b_sub->() ; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/CheckListViewer.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/CheckListViewer.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/CheckListViewer.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/CheckListViewer.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::CheckListViewer ; BEGIN { - $Config::Model::Tk::CheckListViewer::VERSION = '1.308'; + $Config::Model::Tk::CheckListViewer::VERSION = '1.309'; } use strict; @@ -61,7 +61,9 @@ $cw->add_annotation($leaf)->pack(@fx) ; $cw->add_summary($leaf)->pack(@fx) ; - $cw->{value_help_widget} = $cw->add_help(value => '',1)->pack(@fx); + my ($help_frame, $help_widget) = $cw->add_help(value => '',1); + $help_frame->pack(@fx); + $cw->{value_help_widget} = $help_widget ; $cw->set_value_help($leaf->get_checked_list); $cw->add_description($leaf)->pack(@fx) ; @@ -69,6 +71,14 @@ $cw->add_info_button()->pack(@fxe1, -side => 'left') ; $cw->add_editor_button($path)-> pack(@fxe1, -side => 'right') ; + $cw->ConfigSpecs( + #-fill => [ qw/SELF fill Fill both/], + #-expand => [ qw/SELF expand Expand 1/], + -relief => [qw/SELF relief Relief groove/ ], + -borderwidth => [qw/SELF borderwidth Borderwidth 2/] , + DEFAULT => [ qw/SELF/ ], + ); + $cw->SUPER::Populate($args) ; } diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/HashEditor.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/HashEditor.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/HashEditor.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/HashEditor.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::HashEditor ; BEGIN { - $Config::Model::Tk::HashEditor::VERSION = '1.308'; + $Config::Model::Tk::HashEditor::VERSION = '1.309'; } use strict; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/HashViewer.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/HashViewer.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/HashViewer.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/HashViewer.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::HashViewer ; BEGIN { - $Config::Model::Tk::HashViewer::VERSION = '1.308'; + $Config::Model::Tk::HashViewer::VERSION = '1.309'; } use strict; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/LeafEditor.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/LeafEditor.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/LeafEditor.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/LeafEditor.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::LeafEditor ; BEGIN { - $Config::Model::Tk::LeafEditor::VERSION = '1.308'; + $Config::Model::Tk::LeafEditor::VERSION = '1.309'; } use strict; @@ -114,7 +114,9 @@ $cw->add_info_button()->pack( @fx,qw/-anchor n/) ; $cw->add_summary($leaf)->pack(@fx) ; $cw->add_description($leaf)->pack(@fx) ; - $cw->{value_help_widget} = $cw->add_help(value => '',1)->pack(@fx); + my ($help_frame, $help_widget) = $cw->add_help(value => '',1); + $help_frame->pack(@fx); + $cw->{value_help_widget} = $help_widget ; $cw->set_value_help ; $cw->ConfigSpecs( diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/LeafViewer.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/LeafViewer.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/LeafViewer.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/LeafViewer.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::LeafViewer ; BEGIN { - $Config::Model::Tk::LeafViewer::VERSION = '1.308'; + $Config::Model::Tk::LeafViewer::VERSION = '1.309'; } use strict; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/ListEditor.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/ListEditor.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/ListEditor.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/ListEditor.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::ListEditor ; BEGIN { - $Config::Model::Tk::ListEditor::VERSION = '1.308'; + $Config::Model::Tk::ListEditor::VERSION = '1.309'; } use strict; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/ListViewer.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/ListViewer.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/ListViewer.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/ListViewer.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::ListViewer ; BEGIN { - $Config::Model::Tk::ListViewer::VERSION = '1.308'; + $Config::Model::Tk::ListViewer::VERSION = '1.309'; } use strict; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/NodeEditor.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/NodeEditor.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/NodeEditor.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/NodeEditor.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::NodeEditor ; BEGIN { - $Config::Model::Tk::NodeEditor::VERSION = '1.308'; + $Config::Model::Tk::NodeEditor::VERSION = '1.309'; } use strict; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/NodeViewer.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/NodeViewer.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/NodeViewer.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/NodeViewer.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::NodeViewer ; BEGIN { - $Config::Model::Tk::NodeViewer::VERSION = '1.308'; + $Config::Model::Tk::NodeViewer::VERSION = '1.309'; } use strict; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/NoteEditor.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/NoteEditor.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/NoteEditor.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/NoteEditor.pm 2010-08-09 19:49:45.000000000 +0200 @@ -9,7 +9,7 @@ # package Config::Model::Tk::NoteEditor ; BEGIN { - $Config::Model::Tk::NoteEditor::VERSION = '1.308'; + $Config::Model::Tk::NoteEditor::VERSION = '1.309'; } use strict; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/Wizard.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/Wizard.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/Tk/Wizard.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/Tk/Wizard.pm 2010-08-09 19:49:45.000000000 +0200 @@ -10,7 +10,7 @@ package Config::Model::Tk::Wizard ; BEGIN { - $Config::Model::Tk::Wizard::VERSION = '1.308'; + $Config::Model::Tk::Wizard::VERSION = '1.309'; } use strict; diff -Nru -w libconfig-model-tkui-perl-1.308/lib/Config/Model/TkUI.pm libconfig-model-tkui-perl-1.309/lib/Config/Model/TkUI.pm --- libconfig-model-tkui-perl-1.308/lib/Config/Model/TkUI.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/lib/Config/Model/TkUI.pm 2010-08-09 19:49:45.000000000 +0200 @@ -11,7 +11,7 @@ package Config::Model::TkUI ; BEGIN { - $Config::Model::TkUI::VERSION = '1.308'; + $Config::Model::TkUI::VERSION = '1.309'; } use strict; @@ -996,10 +996,6 @@ Config::Model::TkUI - Tk GUI to edit config data through Config::Model -=head1 VERSION - -version 1.308 - =head1 SYNOPSIS use Config::Model::TkUI; @@ -1171,3 +1167,6 @@ Config::Model mailing lists on http://sourceforge.net/mail/?group_id=155650 =back \ No newline at end of file + + + diff -Nru -w libconfig-model-tkui-perl-1.308/t/big_model.pm libconfig-model-tkui-perl-1.309/t/big_model.pm --- libconfig-model-tkui-perl-1.308/t/big_model.pm 2010-07-22 11:01:19.000000000 +0200 +++ libconfig-model-tkui-perl-1.309/t/big_model.pm 2010-08-09 19:49:45.000000000 +0200 @@ -121,6 +121,7 @@ cargo => { type => 'leaf', value_type => 'uniline' }, + summary => 'lista and listb are used to yada yada ', }, [qw/hash_a hash_b/] => { type => 'hash', index_type => 'string',
signature.asc
Description: Digital signature
