diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/gtk3_define.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/source/format | 1 |
5 files changed, 27 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 1c6eb6f..7d83d08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,18 @@ -indicator-sound (0.7.1-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.7.2-0ubuntu1) oneiric; urgency=low * New upstream release. - "Sound Preferences..." should be "Sound Settings" (LP: #785571) - Not obvious what track info menu item does (LP: #699899) * debian/patches/lp_750823.patch - Dropped patch, merged upstream + * debian/patches/gtk3_define.patch + - Wrap another gtk3 block in an ifdef * debian/control - Updated standards version to 3.9.2 - Cleaned up description to quiet lintian + - Added quilt build dep - -- Ken VanDine <ken.vandine@canonical.com> Thu, 16 Jun 2011 21:21:27 -0400 + -- Ken VanDine <ken.vandine@canonical.com> Tue, 28 Jun 2011 10:51:51 -0400 indicator-sound (0.7.0-0ubuntu1) oneiric; urgency=low diff --git a/debian/control b/debian/control index 899dcbb..03cf365 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com> Build-Depends: debhelper (>= 7), cdbs (>= 0.4.41), + quilt, autotools-dev, libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), diff --git a/debian/patches/gtk3_define.patch b/debian/patches/gtk3_define.patch new file mode 100644 index 0000000..373aad7 --- /dev/null +++ b/debian/patches/gtk3_define.patch @@ -0,0 +1,19 @@ +=== modified file 'src/metadata-widget.c' +--- old/src/metadata-widget.c 2011-06-28 10:39:16 +0000 ++++ new/src/metadata-widget.c 2011-06-28 14:57:26 +0000 +@@ -59,12 +59,14 @@ + static void metadata_widget_set_style (GtkWidget* button, GtkStyle* style); + static void metadata_widget_set_twin_item (MetadataWidget* self, + DbusmenuMenuitem* twin_item); ++#if GTK_CHECK_VERSION(3, 0, 0) + static void metadata_get_preferred_width (GtkWidget *widget, + gint *minimal_width, + gint *natural_width); + static void metadata_get_preferred_height (GtkWidget *widget, + gint *minimal_width, + gint *natural_width); ++#endif + + + // keyevent consumers + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..949d73d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +gtk3_define.patch diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) |