[SCM] gmusicbrowser/master: Refresh remaining patches.

[unit193-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4ba4cc41cc5600a4d13eef5ed7addb2e192439e8
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Fri Mar 20 19:40:57 2015 -0400

    Refresh remaining patches.

diff --git a/debian/patches/shimmer-layouts b/debian/patches/shimmer-layouts
index 3cf51e6..a47009c 100644
--- a/debian/patches/shimmer-layouts
+++ b/debian/patches/shimmer-layouts
@@ -12,15 +12,17 @@ Subject: [PATCH] shimmer-layouts update
  plugins/fetch_cover.pm  |    4 ++-
  6 files changed, 114 insertions(+), 14 deletions(-)
 
---- a/gmbrc.default
-+++ b/gmbrc.default
-@@ -10,7 +10,16 @@
+Index: gmusicbrowser/gmbrc.default
+===================================================================
+--- gmusicbrowser.orig/gmbrc.default
++++ gmusicbrowser/gmbrc.default
+@@ -10,8 +10,17 @@
  PLUGIN_LYRICS: 1
  PLUGIN_FETCHCOVER: 1
  PLUGIN_AUTOSAVE: 1
 +PLUGIN_ARTISTINFO: 1
  PLUGIN_MPRIS2: 1
-+
+ 
 +UseTray: 0
 +
 +Layout: Shimmer Desktop
@@ -28,12 +30,15 @@ Subject: [PATCH] shimmer-layouts update
 +LayoutT: Shimmer Traytip
 +LayoutF: Shimmer Party
 +
- 
++
  # default player layout
  #Layout: Small player
---- a/gmusicbrowser.pl
-+++ b/gmusicbrowser.pl
-@@ -569,9 +569,9 @@ our @cMenuAA=
+ # default browser layout
+Index: gmusicbrowser/gmusicbrowser.pl
+===================================================================
+--- gmusicbrowser.orig/gmusicbrowser.pl
++++ gmusicbrowser/gmusicbrowser.pl
+@@ -616,9 +616,9 @@ our @cMenuAA=
  (	{ label => _"Lock",	code => sub { ToggleLock($_[0]{lockfield}); }, check => sub { $::TogLock && $::TogLock eq $_[0]{lockfield}}, mode => 'P',
  	  test	=> sub { $_[0]{field} eq $_[0]{lockfield} || $_[0]{gid} == Songs::Get_gid($::SongID,$_[0]{lockfield}); },
  	},
@@ -46,8 +51,10 @@ Subject: [PATCH] shimmer-layouts update
  	{ label => _"Filter",		code => sub { Select(filter => Songs::MakeFilterFromGID($_[0]{field},$_[0]{gid})); },	stockicon => 'gmb-filter', mode => 'P' },
  	{ label => \&SongsSubMenuTitle,		submenu => \&SongsSubMenu, },
  	{ label => sub {$_[0]{mode} eq 'P' ? _"Display Songs" : _"Filter"},	code => \&FilterOnAA,
---- a/gmusicbrowser_layout.pm
-+++ b/gmusicbrowser_layout.pm
+Index: gmusicbrowser/gmusicbrowser_layout.pm
+===================================================================
+--- gmusicbrowser.orig/gmusicbrowser_layout.pm
++++ gmusicbrowser/gmusicbrowser_layout.pm
 @@ -7,6 +7,7 @@
  
  use strict;
@@ -102,7 +109,7 @@ Subject: [PATCH] shimmer-layouts update
  		event	=> 'Picture_artist',
  		update	=> \&Layout::AAPicture::Changed,
  		noinit	=> 1,
-@@ -1649,7 +1661,7 @@ use base 'Gtk2::Window';
+@@ -1663,7 +1675,7 @@ use base 'Gtk2::Window';
  sub new
  {	my ($class,$layout,%options)=@_;
  	my @original_args=@_;
@@ -111,8 +118,10 @@ Subject: [PATCH] shimmer-layouts update
  	my $opt0={};
  	if (my $opt= $layout=~m/^[^(]+\(.*=/)
  	{	($layout,$opt0)= $layout=~m/^([^(]+)\((.*)\)$/; #separate layout id and options
---- a/gmusicbrowser_list.pm
-+++ b/gmusicbrowser_list.pm
+Index: gmusicbrowser/gmusicbrowser_list.pm
+===================================================================
+--- gmusicbrowser.orig/gmusicbrowser_list.pm
++++ gmusicbrowser/gmusicbrowser_list.pm
 @@ -195,8 +195,8 @@ sub Update
  	if (!$array)	{ $tip=$text=_"error"; }
  	else		{ $text.= ::CalcListLength($array,$self->{format}); }
@@ -137,8 +146,8 @@ Subject: [PATCH] shimmer-layouts update
  sub list_Update
  {	my $self=shift;
  	my $array=::GetSongArray($self) || return;
--	return _("Listed : "), $array,  ::__('%d song','%d songs',scalar@$array);
-+	return _("Listed : "), $array,  ::__('%d song listed','%d songs listed',scalar@$array);
+-	return _("Listed : "), $array,  ::__n('%d song','%d songs',scalar@$array);
++	return _("Listed : "), $array,  ::__n('%d song listed','%d songs listed',scalar@$array);
  }
  
  ### selected functions
@@ -158,7 +167,7 @@ Subject: [PATCH] shimmer-layouts update
  );
  my @cloudstats_menu=
  (	_("number of songs")	=> 'count',
-@@ -3346,7 +3348,7 @@ sub new
+@@ -3350,7 +3352,7 @@ sub new
  		my $BAlblist=::NewIconButton('gmb-playlist',undef,undef,'none');
  		$BAlblist->signal_connect(button_press_event => \&AlbumListButton_press_cb);
  		$BAlblist->set_tooltip_text(_"Choose Album From this Artist");
@@ -167,7 +176,7 @@ Subject: [PATCH] shimmer-layouts update
  	}
  
  	my $drgsrc=$aa eq 'album' ? ::DRAG_ALBUM : ::DRAG_ARTIST;
-@@ -4628,6 +4630,16 @@ sub button_press_cb
+@@ -4690,6 +4692,16 @@ sub button_press_cb
  		else	{ $self->{pressed}=1; }
  		return 0;
  	}
@@ -184,7 +193,7 @@ Subject: [PATCH] shimmer-layouts update
  	if ($but==3)
  	{	my ($i,$j,$key)=$self->coord_to_index($event->get_coords);
  		if (defined $key && !exists $self->{selected}{$key})
-@@ -5551,7 +5563,7 @@ sub new
+@@ -5613,7 +5625,7 @@ sub new
  	my $default= $::Options{"DefaultOptions_$name"} || {};
  
  	%$opt=( @DefaultOptions, %$default, %$opt );
@@ -193,7 +202,7 @@ Subject: [PATCH] shimmer-layouts update
  
  	#create widgets used to draw the songtree as a treeview, would be nice to do without but it's not possible currently
  	$self->{stylewidget}=Gtk2::TreeView->new;
-@@ -5614,6 +5626,16 @@ sub new
+@@ -5676,6 +5688,16 @@ sub new
  	$self->AddColumn($_) for split / +/,$opt->{cols};
  	unless ($self->{cells}) { $self->AddColumn('title'); } #to ensure there is at least 1 column
  
@@ -210,8 +219,10 @@ Subject: [PATCH] shimmer-layouts update
  	$self->{selected}='';
  	$self->{lastclick}=$self->{startgrow}=-1;
  	$self->set_head_columns;
---- a/layouts/songtree.layout
-+++ b/layouts/songtree.layout
+Index: gmusicbrowser/layouts/songtree.layout
+===================================================================
+--- gmusicbrowser.orig/layouts/songtree.layout
++++ gmusicbrowser/layouts/songtree.layout
 @@ -1,6 +1,37 @@
  #SongTree Group & Columns definitions
  #####################################
@@ -299,8 +310,10 @@ Subject: [PATCH] shimmer-layouts update
  
  {Column right_aligned_folder}
  menutitle = _"Folder (right-aligned)"
---- a/plugins/fetch_cover.pm
-+++ b/plugins/fetch_cover.pm
+Index: gmusicbrowser/plugins/fetch_cover.pm
+===================================================================
+--- gmusicbrowser.orig/plugins/fetch_cover.pm
++++ gmusicbrowser/plugins/fetch_cover.pm
 @@ -46,15 +46,17 @@ my %Sites=
  );
  

-- 
gmusicbrowser packaging