diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | debian/indicator-sound-gtk2.install | 1 | ||||
| -rw-r--r-- | debian/indicator-sound.install | 1 | ||||
| -rw-r--r-- | debian/patches/gtk3_define.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 25 | ||||
| -rw-r--r-- | debian/source/format | 1 |
8 files changed, 59 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 9694512..7d83d08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,18 @@ -indicator-sound (0.7.1-0ubuntu1) oneiric; 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 7d45ccb..03cf365 100644 --- a/debian/control +++ b/debian/control @@ -5,15 +5,20 @@ 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), + libgtk-3-dev, libdbusmenu-glib-dev (>= 0.3.101), - libdbusmenu-gtk-dev (>= 0.3.101) , + libdbusmenu-gtk-dev (>= 0.3.101), + libdbusmenu-gtk3-dev (>= 0.3.101), libindicator-dev (>= 0.3.19), + libindicator3-dev (>= 0.3.19), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), libido-0.1-dev (>= 0.1.11), + libido3-0.1-dev (>= 0.2.90), libgconf2-dev, libgee-dev, libxml2-dev, @@ -31,3 +36,14 @@ Depends: ${shlibs:Depends}, Description: System sound indicator. System sound indicator which provides easy control of the PulseAudio sound daemon. + +Package: indicator-sound-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + indicator-sound (= ${binary:Version}), + pulseaudio +Replaces: indicator-sound (<< 0.7.1) +Description: System sound indicator. + System sound indicator which provides easy control of the PulseAudio sound + daemon. diff --git a/debian/indicator-sound-gtk2.install b/debian/indicator-sound-gtk2.install new file mode 100644 index 0000000..8d1fc9f --- /dev/null +++ b/debian/indicator-sound-gtk2.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/indicators /usr/lib/ diff --git a/debian/indicator-sound.install b/debian/indicator-sound.install new file mode 100644 index 0000000..19a45de --- /dev/null +++ b/debian/indicator-sound.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr / 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/rules b/debian/rules index d778ba1..7950ed1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,20 +1,23 @@ #!/usr/bin/make -f +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/rules/autoreconf.mk -# List any files which are not installed -include /usr/share/cdbs/1/rules/utils.mk -common-binary-post-install-arch:: list-missing +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_CONFIGURE_EXTRA_FLAGS = --disable-static -DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators +LDFLAGS += -Wl,-z,defs -Wl,--as-needed -binary-install/indicator-sound:: - # remove .a/.la clutter - rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a - rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) +common-install-arch:: + find debian/tmp -name \*.la -delete + find debian/tmp -name \*.a -delete 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) |