[Pkg-cli-apps-commits] r5329 - in /packages/muine/trunk/debian: changelog control patches/ patches/01_fix_old_GTK-calls_FTBFS patches/series source/ source/format

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

Author: laney-guest
Date: Sat May  8 14:35:14 2010
New Revision: 5329

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5329
Log:
Merge changes from sebner to fix FTBFS

* debian/patches/01_fix_old_GTK-calls_FTBFS: Added to fix FTBFS
  (Closes: #577351)
* debian/control:
  + Add quilt dependency
  + Bump Standards-Version to 3.8.4
* debian/source/format: Specify 1.0 explicitly

Added:
    packages/muine/trunk/debian/patches/
    packages/muine/trunk/debian/patches/01_fix_old_GTK-calls_FTBFS
    packages/muine/trunk/debian/patches/series
    packages/muine/trunk/debian/source/
    packages/muine/trunk/debian/source/format
Modified:
    packages/muine/trunk/debian/changelog
    packages/muine/trunk/debian/control

Modified: packages/muine/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/changelog?rev=5329&op=diff
==============================================================================
--- packages/muine/trunk/debian/changelog (original)
+++ packages/muine/trunk/debian/changelog Sat May  8 14:35:14 2010
@@ -1,8 +1,17 @@
 muine (0.8.11-4) UNRELEASED; urgency=low
 
+  [ Iain Lane ]
   * debian/control: Remove myself from the uploaders list
 
- -- Iain Lane <laney at ubuntu.com>  Sat, 08 May 2010 13:42:25 +0100
+  [ Stefan Ebner ]
+  * debian/patches/01_fix_old_GTK-calls_FTBFS: Added to fix FTBFS
+    (Closes: #577351)
+  * debian/control:
+    + Add quilt dependency
+    + Bump Standards-Version to 3.8.4
+  * debian/source/format: Specify 1.0 explicitly
+
+ -- Stefan Ebner <sebner at ubuntu.com>  Sat, 08 May 2010 15:51:27 +0200
 
 muine (0.8.11-3) unstable; urgency=low
 

Modified: packages/muine/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/control?rev=5329&op=diff
==============================================================================
--- packages/muine/trunk/debian/control (original)
+++ packages/muine/trunk/debian/control Sat May  8 14:35:14 2010
@@ -27,8 +27,9 @@
  cli-common-dev (>= 0.5.7),
  monodoc-base (>= 1.1.10),
  libnotify-dev,
- libmusicbrainz4-dev
-Standards-Version: 3.8.3
+ libmusicbrainz4-dev,
+ quilt (>= 0.46-7~)
+Standards-Version: 3.8.4
 Homepage: http://muine-player.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/muine/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/

Added: packages/muine/trunk/debian/patches/01_fix_old_GTK-calls_FTBFS
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/01_fix_old_GTK-calls_FTBFS?rev=5329&op=file
==============================================================================
--- packages/muine/trunk/debian/patches/01_fix_old_GTK-calls_FTBFS (added)
+++ packages/muine/trunk/debian/patches/01_fix_old_GTK-calls_FTBFS Sat May  8 14:35:14 2010
@@ -1,0 +1,24 @@
+From: Stefan Ebner <sebner at ubuntu.com>
+Subject: Fix FTBFS because of obsolete GTK calls
+Origin: upstream, http://git.gnome.org/browse/muine/commit/?id=86e885f1f17db2ec3caa31b0ff7955dfe2b4e543
+Bug-Debian: http://bugs.debian.org/577351
+
+--- muine-0.8.11.orig/libmuine/rb-cell-renderer-pixbuf.c
++++ muine-0.8.11/libmuine/rb-cell-renderer-pixbuf.c
+@@ -295,14 +295,14 @@
+ 
+   if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
+     {
+-      if (GTK_WIDGET_HAS_FOCUS (widget))
++      if (gtk_widget_has_focus (widget))
+         state = GTK_STATE_SELECTED;
+       else
+         state = GTK_STATE_ACTIVE;
+     }
+   else
+     {
+-      if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
++      if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE)
+         state = GTK_STATE_INSENSITIVE;
+       else
+         state = GTK_STATE_NORMAL;

Added: packages/muine/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/series?rev=5329&op=file
==============================================================================
--- packages/muine/trunk/debian/patches/series (added)
+++ packages/muine/trunk/debian/patches/series Sat May  8 14:35:14 2010
@@ -1,0 +1,1 @@
+01_fix_old_GTK-calls_FTBFS

Added: packages/muine/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/source/format?rev=5329&op=file
==============================================================================
--- packages/muine/trunk/debian/source/format (added)
+++ packages/muine/trunk/debian/source/format Sat May  8 14:35:14 2010
@@ -1,0 +1,1 @@
+1.0