[Pkg-cli-apps-commits] r4012 - in /packages/muine/trunk/debian: changelog patches/11_disambiguate_volumebutton.diff patches/series rules

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

Author: diocles-guest
Date: Sat Jun 21 16:07:33 2008
New Revision: 4012

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4012
Log:
Import diff from muine 0.8.8-2 QA upload by Albin Tonnerre.

Added:
    packages/muine/trunk/debian/patches/11_disambiguate_volumebutton.diff
Modified:
    packages/muine/trunk/debian/changelog
    packages/muine/trunk/debian/patches/series
    packages/muine/trunk/debian/rules

Modified: packages/muine/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/changelog?rev=4012&op=diff
==============================================================================
--- packages/muine/trunk/debian/changelog (original)
+++ packages/muine/trunk/debian/changelog Sat Jun 21 16:07:33 2008
@@ -1,3 +1,13 @@
+muine (0.8.8-2) unstable; urgency=high
+
+  * QA Upload
+  * Fix debian/rules to prevent FTBFS (Closes: #469895)
+  * debian/patches/11_disambiguate_volumebutton.diff
+    - Added, taken from upstream SVN, gnome bug 518828. Thanks Diego
+      Escalante Urrelo. (Closes: #471631)
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com>  Sun, 01 Jun 2008 20:12:31 +0200
+
 muine (0.8.8-1) unstable; urgency=low
 
   * QA upload.

Added: packages/muine/trunk/debian/patches/11_disambiguate_volumebutton.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/11_disambiguate_volumebutton.diff?rev=4012&op=file
==============================================================================
--- packages/muine/trunk/debian/patches/11_disambiguate_volumebutton.diff (added)
+++ packages/muine/trunk/debian/patches/11_disambiguate_volumebutton.diff Sat Jun 21 16:07:33 2008
@@ -1,0 +1,20 @@
+--- trunk/src/PlaylistWindow.cs	2008/02/26 21:35:12	1176
++++ trunk/src/PlaylistWindow.cs	2008/02/26 21:37:01	1177
+@@ -176,7 +176,7 @@
+ 		[Glade.Widget] private Button       add_song_button   ;
+ 		[Glade.Widget] private Button       add_album_button  ;		
+ 
+-		private VolumeButton volume_button;
++		private Bacon.VolumeButton volume_button;
+ 
+ 		// Widgets :: Player
+ 		[Glade.Widget] private Label song_label;
+@@ -869,7 +869,7 @@
+ 			add_album_button  .Clicked += OnAddAlbumButtonClicked;
+ 
+ 			// Volume
+-			volume_button = new VolumeButton ();
++			volume_button = new Bacon.VolumeButton ();
+ 			volume_button_container.Add (volume_button);
+ 			volume_button.Visible = true;
+ 			volume_button.VolumeChanged += OnVolumeChanged;

Modified: packages/muine/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/series?rev=4012&op=diff
==============================================================================
--- packages/muine/trunk/debian/patches/series (original)
+++ packages/muine/trunk/debian/patches/series Sat Jun 21 16:07:33 2008
@@ -1,1 +1,2 @@
 10_desktop_encoding.diff
+11_disambiguate_volumebutton.diff

Modified: packages/muine/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/rules?rev=4012&op=diff
==============================================================================
--- packages/muine/trunk/debian/rules (original)
+++ packages/muine/trunk/debian/rules Sat Jun 21 16:07:33 2008
@@ -50,7 +50,7 @@
 	dh_clean -k
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-binary-indep: build install
+binary-indep:
 	dh_testdir
 	dh_testroot
 	dh_install -i --list-missing
@@ -68,7 +68,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch:
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_install -a --list-missing