[SCM] gmusicbrowser/master: Make changelog entry

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

The following commit has been merged in the master branch:
commit 93f60ea743d795edb00fdfc35ea4aea0fb479a33
Author: Jackson Doak (Noskcaj) <noskcaj at ubuntu.com>
Date:   Sun Feb 16 09:14:35 2014 +1100

    Make changelog entry

diff --git a/debian/changelog b/debian/changelog
index 6452b70..f9337d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmusicbrowser (1.1.12-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Sun, 16 Feb 2014 09:13:33 +1100
+
 gmusicbrowser (1.1.11-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/shimmer-layouts b/debian/patches/shimmer-layouts
index 5948478..eb49062 100644
--- a/debian/patches/shimmer-layouts
+++ b/debian/patches/shimmer-layouts
@@ -14,10 +14,10 @@ Subject: [PATCH] shimmer-layouts update
 
 --- a/gmbrc.default
 +++ b/gmbrc.default
-@@ -9,6 +9,16 @@
- # of the plugin found at the top of the plugin file :
+@@ -10,6 +10,16 @@
  PLUGIN_LYRICS: 1
  PLUGIN_FETCHCOVER: 1
+ PLUGIN_AUTOSAVE: 1
 +PLUGIN_ARTISTINFO: 1
 +PLUGIN_MPRIS2: 1
 +
@@ -33,7 +33,7 @@ Subject: [PATCH] shimmer-layouts update
  #Layout: Small player
 --- a/gmusicbrowser.pl
 +++ b/gmusicbrowser.pl
-@@ -497,9 +497,9 @@ our @cMenuAA=
+@@ -500,9 +500,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}); },
  	},
@@ -105,7 +105,7 @@ Subject: [PATCH] shimmer-layouts update
  		event	=> 'Picture_artist',
  		update	=> \&Layout::AAPicture::Changed,
  		noinit	=> 1,
-@@ -1588,7 +1601,7 @@ use base 'Gtk2::Window';
+@@ -1594,7 +1607,7 @@ use base 'Gtk2::Window';
  sub new
  {	my ($class,$layout,%options)=@_;
  	my @original_args=@_;
@@ -145,7 +145,7 @@ Subject: [PATCH] shimmer-layouts update
  }
  
  ### selected functions
-@@ -1591,6 +1591,7 @@ our %Pages=
+@@ -1593,6 +1593,7 @@ our %Pages=
  our @MenuMarkupOptions=
  (	"%a",
  	"<b>%a</b>%Y\n<small>%s <small>%l</small></small>",
@@ -153,7 +153,7 @@ Subject: [PATCH] shimmer-layouts update
  	"<b>%a</b>%Y\n<small>%b</small>",
  	"<b>%a</b>%Y\n<small>%b</small>\n<small>%s <small>%l</small></small>",
  	"<b>%y %a</b>",
-@@ -1607,6 +1608,7 @@ my @mpicsize_menu=
+@@ -1609,6 +1610,7 @@ my @mpicsize_menu=
  	_("medium size")	=> 64,
  	_("big size")		=> 96,
  	_("huge size")		=> 128,
@@ -161,7 +161,7 @@ Subject: [PATCH] shimmer-layouts update
  );
  my @cloudstats_menu=
  (	_("number of songs")	=> 'count',
-@@ -3309,7 +3311,7 @@ sub new
+@@ -3312,7 +3314,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");
@@ -170,7 +170,7 @@ Subject: [PATCH] shimmer-layouts update
  	}
  
  	my $drgsrc=$aa eq 'album' ? ::DRAG_ALBUM : ::DRAG_ARTIST;
-@@ -4601,6 +4603,16 @@ sub button_press_cb
+@@ -4598,6 +4600,16 @@ sub button_press_cb
  		else	{ $self->{pressed}=1; }
  		return 0;
  	}
@@ -187,7 +187,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})
-@@ -5526,7 +5538,7 @@ sub new
+@@ -5522,7 +5534,7 @@ sub new
  	my $default= $::Options{"DefaultOptions_$name"} || {};
  
  	%$opt=( @DefaultOptions, %$default, %$opt );
@@ -196,7 +196,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;
-@@ -5592,6 +5604,16 @@ sub new
+@@ -5588,6 +5600,16 @@ sub new
  	$self->AddColumn($_) for split / +/,$opt->{cols};
  	unless ($self->{cells}) { $self->AddColumn('title'); } #to ensure there is at least 1 column
  

-- 
gmusicbrowser packaging