--- gnome-media-2.27.3.orig/debian/control +++ gnome-media-2.27.3/debian/control @@ -0,0 +1,104 @@ +Source: gnome-media +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Marco Cabizza +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge +Standards-Version: 3.8.1 +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-media/ubuntu +Build-Depends: cdbs (>= 0.4.41), + gnome-pkg-tools (>= 0.11.3), + dpkg-dev (>= 1.13.19), + debhelper (>= 5.0.0), + intltool (>= 0.35.0), + libglib2.0-dev (>= 2.16), + libgnome2-dev (>= 2.13.7), + libgnomeui-dev (>= 2.13.2), + libbonobo2-dev (>= 2.0.0), + libgstreamer0.10-dev (>= 0.10.3), + libgconf2-dev, + libglade2-dev, + libgstreamer-plugins-base0.10-dev (>= 0.10.3), + libgtk2.0-dev (>= 2.13), + libesd0-dev (>= 0.2.23), + docbook-utils, + gnome-doc-utils, + libxml2-dev (>= 2.5.0), + libnautilus-burn-dev (>= 2.12.2-2), + libgail-dev, + gstreamer0.10-tools, + gstreamer0.10-plugins-base, + gstreamer0.10-plugins-good, + liblaunchpad-integration-dev (>= 0.1.17), + libunique-dev, + libcanberra-gtk-dev, + libpulse-dev (>= 1:0.9.15) + +Package: gnome-media +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gstreamer0.10-alsa | gstreamer0.10-audiosink, + gnome-media-common (>= ${gnome:Version}), + gnome-media-common (<< ${gnome:NextVersion}), + gstreamer0.10-plugins-base, + gstreamer0.10-plugins-good +Description: GNOME media utilities + This package contains a few media utilities for the GNOME desktop: + * the GNOME GStreamer-based audio mixer; + * the GNOME Sound Recorder; + * the GStreamer properties capplet. + +Package: gnome-media-common +Architecture: all +Recommends: gnome-media +Depends: ${misc:Depends} +Replaces: gnome-media (<< 2.12.0-4) +Description: GNOME media utilities - common files + This package contains the common files and internationalization for the + GNOME media utilities. + +Package: libgnome-media0 +Architecture: any +Section: libs +Depends: gnome-media-common (>= ${gnome:Version}), + gnome-media-common (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + ${misc:Depends} +Replaces: gnome-media (<< 2.12.0-4) +Description: runtime libraries for the GNOME media utilities + This package contains media-related libraries used by the GNOME + suite: + * libgnome-media-profiles, which manages a store of media profiles + for software using GStreamer to encode audio data. + +Package: libgnome-media-dev +Architecture: any +Section: libdevel +Depends: libgnome-media0 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + libgconf2-dev, + libgtk2.0-dev (>= 2.10), + libglade2-dev, + libgnome2-dev (>= 2.13.7) +Replaces: gnome-media (<< 2.12.0-4) +Description: development libraries for the GNOME media utilities + This package contains static libraries and development headers for the + GNOME media libraries: + * libgnome-media-profiles, which manages a store of media profiles + for software using GStreamer to encode audio data. + +Package: gnome-volume-control-pulse +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-media-common (>= ${gnome:Version}), + gnome-media-common (<< ${gnome:NextVersion}) +Description: GNOME media utilities - gnome-volume-control + This package contains the following media utilities for the + GNOME desktop: + * gnome-volume-control-settings - A capplet for adjusting sound + preferences. + * gnome-volume-control-applet - An applet that displays in the + notification area for adjusting audio volume. --- gnome-media-2.27.3.orig/debian/libgnome-media-dev.install +++ gnome-media-2.27.3/debian/libgnome-media-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/lib/*.{so,a} +debian/tmp/usr/include --- gnome-media-2.27.3.orig/debian/control.in +++ gnome-media-2.27.3/debian/control.in @@ -0,0 +1,104 @@ +Source: gnome-media +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Marco Cabizza +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.1 +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-media/ubuntu +Build-Depends: cdbs (>= 0.4.41), + gnome-pkg-tools (>= 0.11.3), + dpkg-dev (>= 1.13.19), + debhelper (>= 5.0.0), + intltool (>= 0.35.0), + libglib2.0-dev (>= 2.16), + libgnome2-dev (>= 2.13.7), + libgnomeui-dev (>= 2.13.2), + libbonobo2-dev (>= 2.0.0), + libgstreamer0.10-dev (>= 0.10.3), + libgconf2-dev, + libglade2-dev, + libgstreamer-plugins-base0.10-dev (>= 0.10.3), + libgtk2.0-dev (>= 2.13), + libesd0-dev (>= 0.2.23), + docbook-utils, + gnome-doc-utils, + libxml2-dev (>= 2.5.0), + libnautilus-burn-dev (>= 2.12.2-2), + libgail-dev, + gstreamer0.10-tools, + gstreamer0.10-plugins-base, + gstreamer0.10-plugins-good, + liblaunchpad-integration-dev (>= 0.1.17), + libunique-dev, + libcanberra-gtk-dev, + libpulse-dev (>= 1:0.9.15) + +Package: gnome-media +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gstreamer0.10-alsa | gstreamer0.10-audiosink, + gnome-media-common (>= ${gnome:Version}), + gnome-media-common (<< ${gnome:NextVersion}), + gstreamer0.10-plugins-base, + gstreamer0.10-plugins-good +Description: GNOME media utilities + This package contains a few media utilities for the GNOME desktop: + * the GNOME GStreamer-based audio mixer; + * the GNOME Sound Recorder; + * the GStreamer properties capplet. + +Package: gnome-media-common +Architecture: all +Recommends: gnome-media +Depends: ${misc:Depends} +Replaces: gnome-media (<< 2.12.0-4) +Description: GNOME media utilities - common files + This package contains the common files and internationalization for the + GNOME media utilities. + +Package: libgnome-media0 +Architecture: any +Section: libs +Depends: gnome-media-common (>= ${gnome:Version}), + gnome-media-common (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + ${misc:Depends} +Replaces: gnome-media (<< 2.12.0-4) +Description: runtime libraries for the GNOME media utilities + This package contains media-related libraries used by the GNOME + suite: + * libgnome-media-profiles, which manages a store of media profiles + for software using GStreamer to encode audio data. + +Package: libgnome-media-dev +Architecture: any +Section: libdevel +Depends: libgnome-media0 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + libgconf2-dev, + libgtk2.0-dev (>= 2.10), + libglade2-dev, + libgnome2-dev (>= 2.13.7) +Replaces: gnome-media (<< 2.12.0-4) +Description: development libraries for the GNOME media utilities + This package contains static libraries and development headers for the + GNOME media libraries: + * libgnome-media-profiles, which manages a store of media profiles + for software using GStreamer to encode audio data. + +Package: gnome-volume-control-pulse +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-media-common (>= ${gnome:Version}), + gnome-media-common (<< ${gnome:NextVersion}) +Description: GNOME media utilities - gnome-volume-control + This package contains the following media utilities for the + GNOME desktop: + * gnome-volume-control-settings - A capplet for adjusting sound + preferences. + * gnome-volume-control-applet - An applet that displays in the + notification area for adjusting audio volume. --- gnome-media-2.27.3.orig/debian/changelog +++ gnome-media-2.27.3/debian/changelog @@ -0,0 +1,653 @@ +gnome-media (2.27.3-0ubuntu2) karmic; urgency=low + + * debian/control: Add pulseaudio's epoch to ensure a proper versioned + dependency. + + -- Luke Yelavich Tue, 16 Jun 2009 13:15:24 +1000 + +gnome-media (2.27.3-0ubuntu1) karmic; urgency=low + + * New upstream release: + - General: + - Bug 581630 - Use g_timeout_add_seconds to reduce wakeups + (Javier Jardón) + - Bug 585377 – Don't require volume-control deps if not building + volume-control + - gnome-volume-control: + - Implement LFE: http://www.hadess.net/2009/05/i-really-haz-51.html + (Bastien & Lennart) + - Bug 568936 – Add fade slider (Bastien, Lennart & Matthias Clasen) + - Bug 583483 - Raise PulseAudio dependency to 0.9.15 + - Bug 583485 – fails to build with PA master + - Bug 583486 – incorrect LDADD order + - Bug 574198 – don't show virtual streams + - Bug 583141 – scrollwheel doesn't work when dock is first shown (Bastien) + - Bug 581024 – Move streams to the new default sink (Bastien) + - Bug 574312 – Add mark for base volume instead of 100% (Bastien) + - Bug 581921 – Please show high-level channel mapping string (Bastien) + - Bug 579115 – fix alignment issues with sliders (Matthias Clasen) + - Bug 574312 – Add mark at 100% for inputs (Bastien) + - other fix and improvements + - gst-mixer: + - Bug 585006 – build error: gnome_volume_control_element_whitelist + - Add support for new GStreamer mixer flags (Brian Cameron) + - gnome-audio-profiles: + - Bug 563343 - first stab at profiles documentation + - gnome-sound-recorder: + - Bug 569659 – Previous record discarded without any prompt + - Updated translations: + - el (Sterios Prosiniklis) + - es (Jorge González) + - et (Ivar Smolin) + - nb (Kjartan Maraas) + - ta (Dr.T.Vasudevan) + * debian/control: Bump minimum version of libpulse-dev to 0.9.15 + * Refresh patches: + - debian/patches/05_gst-mix_and_new_gvc_no_conflict.patch + - debian/patches/99_autoconf.patch + + -- Luke Yelavich Tue, 16 Jun 2009 12:11:25 +1000 + +gnome-media (2.27.1-0ubuntu1) karmic; urgency=low + + * New upstream release: (LP: #371952) + - General: + - Now libgnome/ui free (except deprecated parts), bug #567310 + (Jonathan Matthew, Saleem Abdulrasool, Felix Riemann) + - Less deprecated GTK+ symbols, bug #572353 + - Use git-version-gen from autoconf.git to generate version number + (cool stuff other project should use :) + - gnome-volume-control + - Add tabs Alt+N accels, bug #574197 + - Fix cramped appearance of the balance slider (Matthias Clasen) + - Don't show debug output when disabling debugging, bug #493138 + - Inconsistent "Volume" capitlization, bug #579117 + - gst-mixer (gstreamer based g-v-c) + - Fix lunching help, bug #575152 (Chris Coulson) + - Renamed "tracks" to "mixers" for UI consistency, #577921 + - Updated translations + * Rebase on version 2.24.1-3 from debian/unstable, remaining changes: + - debian/control{.in} + - bump build-dep for glib and gtk + - add build-dep on libcanberra-gtk-dev, libunique-dev, libpulse-dev + - add build-dep on liblaunchpad-integration-dev for lpi + - dropped build-dep on scrollkeeper + - debian/gnome-media-common.install: + - install default sounds + - debian/control{.in}, + debian/gnome-media-common.install, + debian/gnome-media.install, + debian/gnome-volume-control-pulse.install, + debian/rules: + - Enable the new gnome-volume-control capplet and gvc-applet + and install these in to a new binary package - + gnome-volume-control-pulse. + - debian/rules: + - don't use scrollkeeper + - enable gst-mixer + - debian/patches/01_lpi.patch + - added to provide launchpad integration + - debian/patches/03_menu_changes.patch + - updated to new version + - debian/patches/05_gst-mix_and_new_gvc_no_conflict.patch + - Make it possible to build the new gnome-volume-control and + gst-mixer at the same time without conflicting, by + renaming the new gnome-volume-control capplet to + gnome-volume-control-settings. + - debian/patches/05_mixer_noprefs.patch.diff + - updated to new version + - debian/patches/99_autoconf.patch + - updated to new version + - debian/patches/99_ltmain.patch + - dropped, no longer needed + + -- Andreas Moog Tue, 05 May 2009 00:59:18 +0200 + +gnome-media (2.24.0.1-3) unstable; urgency=low + + * Add missing dependencies in libgnome-media-dev, corresponding to the + requirements of the pkg-config file. This caused some FTBFSes. + * Standards version is 3.8.1. + + -- Josselin Mouette Fri, 10 Apr 2009 16:23:35 +0200 + +gnome-media (2.24.0.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastian Dröge Sun, 08 Mar 2009 08:09:24 +0100 + +gnome-media (2.24.0.1-1) experimental; urgency=low + + * New upstream release. + + Removes extraneous separator. Closes: #413678. + * Big cleanup in the build-dependencies. + * Improve a bit the long description. + * 02_restore-mixer-track-type.patch, + 03_enable-disable-correct-track.patch, + 04_sort-tracks-by-type.patch: removed, merged upstream. + * Remove vumeter files and references to match the upstream default. + * Pass -O1 to the linker. + * 99_ltmain_as-needed.patch: make --as-needed work with the library as + well. + + -- Josselin Mouette Fri, 26 Dec 2008 23:14:19 +0100 + +gnome-media (2.22.0-3) unstable; urgency=low + + * 05_mixer_noprefs.patch: remove gnome-volume-control from the + settings menu, it is already in AudioVideo. + * Fix sections (libs for the lib, libdevel for the -dev). + * Standards version is 3.8.0. + + -- Josselin Mouette Fri, 18 Jul 2008 17:46:08 +0200 + +gnome-media (2.22.0-2) unstable; urgency=low + + [ Sam Morris ] + * Add 02_restore-mixer-track-type.patch to restore the display of the type + of each track in the volume control preferences. Taken from + . + * Add 03_enable-disable-correct-track.patch to make the volume control + preferences enable and disable the correct tracks. Taken from upstream svn + r3837. Fixes: . + * Add 04_sort-tracks-by-type.patch. Taken from + . + + [ Sven Arvidsson ] + * Disable building of gnome-cd and cddb-slave. These are soon to be + deprecated upstream, and we already ship better alternatives. + - Updated description in control.in + - Deleted icon and man pages + - Removed the gnome-cd menu entry + - Removed the pixmaps dir from gnome-media-common.install + - Removed the gnome-media, idl and bonobo dirs + from libgnome-media0.install + + [ Loic Minier ] + * Let libgnome-media-dev depend on shlibs:Depends. + + -- Sam Morris Tue, 15 Apr 2008 01:23:28 +0100 + +gnome-media (2.22.0-1) unstable; urgency=low + + [ Loic Minier ] + * Add ${misc:Depends}. + * Add ${shlibs:Depends} to libgnome-media0. + + [ Sebastian Dröge ] + * New upstream stable release. + + -- Sebastian Dröge Tue, 11 Mar 2008 08:39:53 +0100 + +gnome-media (2.20.1-3) unstable; urgency=low + + [ Kilian Krause ] + * Use binary:version and source:Version for binnNMU-safe uploads as + added in dpkg-dev 1.13.19. Add to Build-Depends accordingly. + + [ Josselin Mouette ] + * 01_vumeter_nodisplay.patch: don't display icons for the volume + monitor and record monitor. We don't launch esd by default, and + PulseAudio has a better application. Closes: #451727. + + [ Loic Minier ] + * Fix typo in control causing failure to build (bianry:Version). + * Wrap build-deps and deps. + * Cleanup changelog. + * Pass -Wl,-z,defs -Wl,--as-needed in LDFLAGS; build-dep on cdbs >= 0.4.41. + * Bump up Standards-Version to 3.7.3; update menu files. + * Use real descriptions in man pages. + + -- Loic Minier Tue, 18 Dec 2007 16:42:35 +0100 + +gnome-media (2.20.1-1) unstable; urgency=low + + [ Sven Arvidsson ] + * Update man page for gnome-sound-recorder (Closes: #385699) + + [ Sebastian Dröge ] + * New upstream release, with no API changes: + + debian/control.in: + - Add gnome-doc-utils to build depends. + + -- Sebastian Dröge Thu, 20 Sep 2007 10:47:21 +0200 + +gnome-media (2.18.0-2) unstable; urgency=low + + * Upload to unstable, drop check-dist include. + + -- Sebastian Dröge Thu, 19 Apr 2007 14:21:07 +0200 + +gnome-media (2.18.0-1) experimental; urgency=low + + [ Marco Cabizza ] + * New upstream release; no API change. + * Dropping 10_handle-multiple-tracks-with-the-same-name, merged upstream. + + [ Loic Minier ] + * Drop patch 30_kfreebsd, merged upstream. + * Add missing build-deps on libbonobo2-dev (>= 2.0.0), libglade2-dev. + * Bump up libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev + build-deps to >= 0.10.3. + + -- Loic Minier Wed, 21 Mar 2007 16:21:32 +0100 + +gnome-media (2.16.1-2) experimental; urgency=low + + * Fix watch file to track stable releases and use HTTP. + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Merge 2.14.2-3 up to 2.14.2-5; SVN r7774:9131. + - Drop patch 20_pulseaudio, merged upstream. + * Cleanups. + + -- Loic Minier Mon, 19 Mar 2007 10:49:39 +0100 + +gnome-media (2.16.1-1) experimental; urgency=low + + [ Marco Cabizza ] + * New upstream release, targetting experimental: + - Bumping libgtk2.0-dev build-dep to 2.10 because of gnome-cd + - Updating watch file + - Updating debian/patches/* to fit the new upstream release + + [ Loic Minier ] + * Merge the 70_mandatory-automake in + 10_handle-multiple-tracks-with-the-same-name since it only updates one + Makefile.in. + + -- Loic Minier Wed, 27 Sep 2006 07:52:35 +0200 + +gnome-media (2.14.2-5) unstable; urgency=low + + [ Loïc Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + + [ Marco Cabizza ] + * Fix 10_handle-multiple-tracks-with-the-same-name to prevent a segfault + in some audio cards (GNOME #396023). + + [ Loic Minier ] + * Update watch file to track all stable versions and to use HTTP. + * Fix URL in copyright. + + -- Loic Minier Mon, 19 Mar 2007 10:05:34 +0100 + +gnome-media (2.14.2-4) unstable; urgency=low + + * New patch, 30_kfreebsd, with kfreebsd build fixes by Petr Salinger; + GNOME #382770; closes: #401733 + + -- Loic Minier Tue, 5 Dec 2006 22:28:55 +0100 + +gnome-media (2.14.2-3) unstable; urgency=low + + * debian/patches/20_pulseaudio.patch + - Added. Change polyp{src,sink} to pulse{src,sink} in + gstreamer-properties. Makes pulse audio an option for audio input and + output + + -- Sjoerd Simons Mon, 23 Oct 2006 11:38:50 +0200 + +gnome-media (2.14.2-2) unstable; urgency=low + + [ Josselin Mouette ] + * Require gnome-pkg-tools 0.6. + * Use ${gnome:Version} and ${gnome:NextVersion}. + * Include the gnome-versions.mk snippet. + + [ Loic Minier ] + * New patch, 10_handle-multiple-tracks-with-the-same-name, from + GNOME #313495, fixes a bug in gnome-volume-control that prevents it from + handling the case where multiple GstMixerTracks have the same name; thanks + Sam Morris. (Closes: #387097) + * New patch, 70_mandatory-automake, to update the relevant Makefile.in as + required by 10_handle-multiple-tracks-with-the-same-name. + * Fix typo in ${gnome:Version}. + + -- Loic Minier Wed, 13 Sep 2006 13:33:22 +0200 + +gnome-media (2.14.2-1) unstable; urgency=low + + [ Loic Minier ] + * Stop shipping /usr/lib/*.la files in libgnome-media-dev. + [debian/libgnome-media-dev.install] + + [ Josselin Mouette ] + * New upstream release. + + fix implicit pointer conversion (closes: #357411). + * Set correct Replaces: fields (closes: #357608, #360421, #368832, + #368833). + * Make the package binNMU-safe. + + Build-depend on dpkg-dev 1.13.19. + + Use ${source:Version}. + + [ Marco Cabizza ] + * New "human" maintainer (me, replacing the team-maintainership) + * Require GStreamer 0.10, drop GStreamer 0.8 [control, control.in] + * gnome-media-common.gconf-defaults: dropped, gstreamer0.10 already provides + this + * Standards-version is 3.7.2 + * Added the watch file + * Debhelper compatibility bump to 5. + + [ Loic Minier ] + * Simple update will pick the correct libnautilus-burn3 dependency. + (Closes: #372180) + + -- Loic Minier Thu, 8 Jun 2006 21:13:26 +0200 + +gnome-media (2.12.0-4) unstable; urgency=low + + * Split architecture-independent files in gnome-media-common + (closes: #233363). + * Also split libraries in libgnome-media0 (closes: #322531). + * gnome-media.links: removed, it's not useful. + * Remove obsolete conflicts. + * gnome-media-common.gconf-defaults: make ALSA the default sink for + GStreamer 0.8 (closes: #351406). + + -- Josselin Mouette Sun, 5 Mar 2006 21:41:10 +0100 + +gnome-media (2.12.0-3) unstable; urgency=low + + * Upload to unstable. + * Use gstreamer0.8-alsa as the default audio sink. + + -- Josselin Mouette Sun, 8 Jan 2006 01:55:22 +0100 + +gnome-media (2.12.0-2) experimental; urgency=low + + [ Josselin Mouette ] + * Add ${misc:Depends}. + + [ Sjoerd Simons ] + * Build against dbus >= 0.60 + + -- Sjoerd Simons Sun, 18 Dec 2005 21:59:39 +0100 + +gnome-media (2.12.0-1) experimental; urgency=low + + [ Loic Minier ] + * Set maintainer to the pkg-gnome group. + * Add CDBS' utils rule. + + [ Sjoerd Simons ] + * New upstream release + * Ensure it's build againsts nautilus-cd-burner >= 2.12.0 + * Add depend on gstreamer0.8-cdparanoia (Closes: #316325) + + -- Sjoerd Simons Wed, 21 Sep 2005 23:50:32 +0200 + +gnome-media (2.10.2-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Upload to unstable. + + -- Jordi Mallach Fri, 10 Jun 2005 16:48:12 +0200 + +gnome-media (2.10.2-0.1) experimental; urgency=low + + * Non-maintainer upload. + * debian/rules: switch to cdbs. + * debian/control: moved to control.in. + * debian/control.in: + - update build-depends for 2.10. + - add cdbs and gnome-pkg-tools to build-depends. + - add the GNOME team to uploaders. + - slightly improve description. + * debian/rules: rewritten to use cdbs. + * debian/gnome-media.postinst: let debhelper handle schema registration. + + -- Jordi Mallach Sat, 9 Apr 2005 20:48:18 +0200 + +gnome-media (2.8.0-0.4) unstable; urgency=low + + * Non-Maintainer Upload. + * Don't try and dereference an invalid iter (closes: #308536) + + -- Ross Burton Tue, 10 May 2005 21:34:36 +0100 + +gnome-media (2.8.0-0.3) unstable; urgency=low + + * Non-Maintainer Upload. + * Fix a double-free when creating new profiles + + -- Ross Burton Thu, 21 Apr 2005 12:06:53 +0100 + +gnome-media (2.8.0-0.2) unstable; urgency=low + + * Non-Maintainer Upload. + * No changes, just rebuild for unstable. + + -- Jordi Mallach Wed, 24 Nov 2004 20:47:09 +0100 + +gnome-media (2.8.0-0.1) experimental; urgency=low + + * NMU with maintainer approval. + * New upstream release. + * debian/control: + - updated the software's names in the description + (Closes: #268380, #270649). + + -- Sebastien Bacher Tue, 26 Oct 2004 13:54:58 +0200 + +gnome-media (2.6.2-1) unstable; urgency=low + + * Back in action .. + * Acknowledge previous NMUs, thanks J.H.M. and Sebastien. + closes: #262012, #263642, #226811, #232031, #235959, #237819, + #242061, #251461, #259625, #244449, #262296. + + -- Davide Puricelli (evo) Mon, 23 Aug 2004 17:24:01 +0200 + +gnome-media (2.6.2-0.3) unstable; urgency=medium + + * NMU + * [debian/rules] + * Actually honour DEB_BUILD_OPTIONS. + * Ensure at build time that the libraries have no dependencies on + undefined symbols. + * [cddb-slave2/Makefile.am] Applied patch by Russ Allbery + to fix symbol resolution. (Closes: #262012) + * Relibtoolised/auto*ed. + * [debian/control] + * Bumped the gnome-vfs2 build dependency to ensure a build against + libgnutls11. (Closes: #263642) + * Changed "gstreamer0.8-oss | gstreamer-alsa" dependency to + "gstreamer0.8-oss | gstreamer0.8-audiosink". (Closes: #251461, #259625) + * These changes cover everything addressed by + http://no-name-yet.com/patches/gnome-media.patch . (Closes: #262296) + + -- J.H.M. Dassen (Ray) Sat, 7 Aug 2004 16:21:40 +0200 + +gnome-media (2.6.2-0.2) unstable; urgency=low + + * NMU + * Upload to unstable, at Sebastien's request. + + -- J.H.M. Dassen (Ray) Wed, 2 Jun 2004 22:45:23 +0200 + +gnome-media (2.6.2-0.1) experimental; urgency=low + + * New upstream release (Closes: #242061) + + fix XML markup error in Finnish localisation (Closes: #232031). + + fix kernel 2.6 issue (Closes: #226811). + + include a desktop file (Closes: #244449). + * NMU with Maintainer approval. + * debian/control: + + updated Build-Depends. + + updated description (Closes: #235959). + + updated Standards-Version to 3.6.1.0. + * debian/gnome-media.menu: + + added quotes. + * debian/gnome-media.postinst: + + updated schemas liste. + * debian/rules: + + removed workaround for the DTD, now we have a xml catalog. + + removed .a/.la files (Closes: #237819). + + -- Sebastien Bacher Mon, 10 May 2004 22:41:05 +0200 + +gnome-media (2.4.1.1-3) unstable; urgency=medium + + * Fixed implicitly declared functions to avoid major breakage on + 64 bit architectures; closes: #226522. + + -- Davide Puricelli (evo) Thu, 22 Jan 2004 21:44:17 +0100 + +gnome-media (2.4.1.1-2) unstable; urgency=low + + * Depends on "gstreamer-oss | gstreamer-audiosink", not just oss. + closes: #218659. + + -- Davide Puricelli (evo) Sun, 2 Nov 2003 12:04:26 +0100 + +gnome-media (2.4.1.1-1) unstable; urgency=medium + + * New upstream version. + * Now gnome-cd handles multiple cddb matches correctly; closes: #176438. + * Added a Depends on gstreamer-misc and gstreamer-oss; closes: #217579 + + -- Davide Puricelli (evo) Sat, 1 Nov 2003 15:31:51 +0100 + +gnome-media (2.2.2-1) unstable; urgency=medium + + * New maintainer. + * Acknowledge NMU - thanks, Sebastien! closes: #187349. + * Moved cddb-slave2-properties, CDDBSlave2 and cddb-track-editor from + /usr/bin to /usr/lib/gnome-media, they are not meant for + users (removed their manpages, too); closes: #204208. + * Added icons to menu, closes: #121169. + + -- Davide Puricelli (evo) Fri, 29 Aug 2003 13:56:16 +0200 + +gnome-media (2.2.1.1-2.1) unstable; urgency=low + + * NMU to fix a RC bug. + * Explicitly link to libbonobo-2,libORBit-2 and libglib-2.0 (Closes: + #187349). + + -- Sebastien Bacher Thu, 28 Aug 2003 16:43:40 +0200 + +gnome-media (2.2.1.1-2) unstable; urgency=low + + * Fixed Build-Depends; closes: #199087. + * Removed useless entries from Debian menu file; closes: #199383. + * Removed obsolete Conflicts and Provides about tcd; closes: #194750. + + -- Davide Puricelli (evo) Wed, 2 Jul 2003 18:46:31 +0200 + +gnome-media (2.2.1.1-1) unstable; urgency=low + + * New upstream version. + * Recompiled against libgstreamer0.6-0, closes: #180333. + * Enabled Gstreamer capplet. + - Added Build-Depends on gstreamer-core-libs-dev, gstreamer-gconf, + gstreamer-plugin-libs-dev. + * Now gnome-cd handles accented characters, closes: #171057. + * Added a manpage for gstreamer-properties. + + -- Davide Puricelli (evo) Mon, 10 Feb 2003 12:59:47 +0100 + +gnome-media (2.1.5-1) unstable; urgency=low + + * New upstream release + * Compiled with g++ 3.2.2 + + -- Norbert Veber Sun, 12 Jan 2003 21:16:15 -0500 + +gnome-media (2.1.0-3) unstable; urgency=high + + * Config.guess and config.sub are updated before building the package. + closes: #168527. + * Removed alsa support; unfortunately gnome-media still doesn't compile + against libasound2, we hope to have a working alsa mixer in a near + future, for the moment please bear with us (or send us a patch :) + closes: #166691, #166834, #167165. + * Updated all the manpages; closes: #167823. + * Mouse wheel works for both mixer levels and panel applet; closes: #58069. + * Fixed a problem with muted and locked channels; closes: #166409. + + -- Davide Puricelli (evo) Sun, 10 Nov 2002 22:53:31 +0100 + +gnome-media (2.1.0-2) unstable; urgency=low + + * First upload to unstable! + * Removed any external DTD call in xml files; closes: #165678. + + -- Davide Puricelli (evo) Sat, 26 Oct 2002 23:02:27 +0200 + +gnome-media2 (2.1.0-1) experimental; urgency=low + + * New upstream version: + - added devfs support; closes: #157992. + + -- Davide Puricelli (evo) Fri, 18 Oct 2002 14:44:20 +0200 + +gnome-media2 (2.0.2.5-3) experimental; urgency=low + + * Fixed a wrong path into + /usr/lib/bonobo/servers/GNOME_Media_CDDBSlave2.server; closes: #163222. + * Removed the 2 suffix from binary package name. + * Set Maintainer field to Norbert Veber and put my name + into Uploaders field. + + -- Davide Puricelli (evo) Sat, 5 Oct 2002 16:40:11 +0200 + +gnome-media2 (2.0.2.5-2) experimental; urgency=low + + * Added a missing build-depends on libtasn1-dev; thanks Colin Walters. + + -- Davide Puricelli (evo) Fri, 13 Sep 2002 10:38:06 +0200 + +gnome-media2 (2.0.2.5-1) experimental; urgency=low + + * New upstream version. + * debian/control: removed useless depends on desktop stuff; + closes: #157083. + * scrollkeeper issue should be resolved now; closes: #155083. + + -- Davide Puricelli (evo) Thu, 12 Sep 2002 17:55:55 +0200 + +gnome-media2 (2.0.0.uus-2) experimental; urgency=low + + * Recompiled against libgtk2.0-0png3. + + -- Davide Puricelli (evo) Tue, 13 Aug 2002 11:55:13 +0200 + +gnome-media2 (2.0.0.uus-1) experimental; urgency=low + + * Uploading it to experimental, not unstable! + "uus" in upstream version to allow replacement of current 2.0.0 source + package. (unadulterated upstream source) + * Added menu files; closes: #152423. + + -- Davide Puricelli (evo) Wed, 31 Jul 2002 21:43:34 +0200 + +gnome-media2 (2.0.0-3) unstable; urgency=low + + * debian/control: + - removed depends on gnome-core, now obsolete. + + -- Davide Puricelli (evo) Sat, 29 Jun 2002 22:09:48 +0200 + +gnome-media2 (2.0.0-2) unstable; urgency=low + + * debian/control: + - updated Build-Depends field. + - enhanced extended description. + * debian/copyright: + - updated. + * debian/rules, debian/postinst: + - added stuff for Gconf schemas files. + + -- Davide Puricelli (evo) Sat, 22 Jun 2002 19:14:25 +0200 + +gnome-media2 (2.0.0-1) unstable; urgency=low + + * Initial release. + + -- Davide Puricelli (evo) Wed, 12 Jun 2002 19:40:00 +0200 --- gnome-media-2.27.3.orig/debian/gnome-volume-control-pulse.install +++ gnome-media-2.27.3/debian/gnome-volume-control-pulse.install @@ -0,0 +1,4 @@ +debian/tmp/etc/xdg/autostart +debian/tmp/usr/bin/gnome-volume-control-settings +debian/tmp/usr/bin/gnome-volume-control-applet +debian/tmp/usr/share/applications/gnome-volume-control-settings.desktop --- gnome-media-2.27.3.orig/debian/gnome-media-common.install +++ gnome-media-2.27.3/debian/gnome-media-common.install @@ -0,0 +1,10 @@ +debian/*.xpm /usr/share/pixmaps/ +debian/tmp/etc/gconf +debian/tmp/usr/share/gnome-media +debian/tmp/usr/share/locale +debian/tmp/usr/share/omf +debian/tmp/usr/share/gstreamer-properties +debian/tmp/usr/share/icons +debian/tmp/usr/share/gnome/help +debian/tmp/usr/share/gnome-sound-recorder +debian/tmp/usr/share/sounds/gnome/default/alerts/ --- gnome-media-2.27.3.orig/debian/gnome-volume-control.1 +++ gnome-media-2.27.3/debian/gnome-volume-control.1 @@ -0,0 +1,109 @@ +.TH GNOME "1" "November 2002" +.SH NAME +gnome-volume-control \- Sound volume controller +.SH SYNOPSIS +.B gnome-volume-control +[\fIOPTION\fR...] +.SH DESCRIPTION +.TP +\fB\-\-load\-modules\fR=\fIMODULE1\fR,MODULE2,... +Dynamic modules to load +.PP +Help options +.TP +-?, \fB\-\-help\fR +Show this help message +.TP +\fB\-\-usage\fR +Display brief usage message +.PP +Application options +.TP +\fB\-\-device\fR=\fISTRING\fR +Mixer device to use +.PP +GTK+ +.TP +\fB\-\-gdk\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.TP +\fB\-\-sync\fR +Make X calls synchronous +.TP +\fB\-\-name\fR=\fINAME\fR +Program name as used by the window +manager +.TP +\fB\-\-class\fR=\fICLASS\fR +Program class as used by the window +manager +.HP +\fB\-\-gxid\-host\fR=\fIHOST\fR +.HP +\fB\-\-gxid\-port\fR=\fIPORT\fR +.TP +\fB\-\-gtk\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-g\-fatal\-warnings\fR +Make all warnings fatal +.TP +\fB\-\-gtk\-module\fR=\fIMODULE\fR +Load an additional Gtk module +.PP +Bonobo activation Support +.TP +\fB\-\-oaf\-ior\-fd\fR=\fIFD\fR +File descriptor to print IOR on +.TP +\fB\-\-oaf\-activate\-iid\fR=\fIIID\fR +IID to activate +.TP +\fB\-\-oaf\-private\fR +Prevent registering of server with OAF +.PP +GNOME GConf Support +.PP +GNOME Library +.TP +\fB\-\-disable\-sound\fR +Disable sound server usage +.TP +\fB\-\-enable\-sound\fR +Enable sound server usage +.TP +\fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT +Host:port on which the sound server +to use is running +.HP +\fB\-\-version\fR +.PP +Session management +.TP +\fB\-\-sm\-client\-id\fR=\fIID\fR +Specify session management ID +.TP +\fB\-\-sm\-config\-prefix\fR=\fIPREFIX\fR +Specify prefix of saved configuration +.TP +\fB\-\-sm\-disable\fR +Disable connection to session manager +.PP +GNOME GUI Library +.HP +\fB\-\-disable\-crash\-dialog\fR +.SH AUTHOR +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +This manual page was written by Davide Puricelli , +for the Debian GNU/Linux system (but may be used by others). --- gnome-media-2.27.3.orig/debian/rules +++ gnome-media-2.27.3/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-cddbslave --disable-gnomecd --disable-scrollkeeper --enable-gstmix + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + --- gnome-media-2.27.3.orig/debian/gnome-media.menu +++ gnome-media-2.27.3/debian/gnome-media.menu @@ -0,0 +1,4 @@ +?package(gnome-media):needs="X11" section="Applications/Sound" \ + title="gmix (Gnome 2.0 Mixer)" icon="/usr/share/pixmaps/gnome-mixer.xpm" command="/usr/bin/gnome-volume-control" +?package(gnome-media):needs="X11" section="Applications/Sound" \ + title="grecord (GNOME 2.0 Recorder)" icon="/usr/share/pixmaps/gnome-grecord.xpm" command="/usr/bin/gnome-sound-recorder" --- gnome-media-2.27.3.orig/debian/gnome-sound-recorder.1 +++ gnome-media-2.27.3/debian/gnome-sound-recorder.1 @@ -0,0 +1,40 @@ +.\" Copyright (C) 2006 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\"You should have received a copy of the GNU General Public License along +.\"with this program; if not, write to the Free Software Foundation, Inc., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH gnome-sound-recorder 1 "2007\-05\-05" "GNOME" +.SH NAME +gnome-sound-recorder \- simple sound recorder +.SH SYNOPSIS +.B gnome-sound-recorder +.RI [ OPTION... ] +.SH DESCRIPTION +.B gnome-sound-recorder +enables you to record and play .flac, .ogg, and .wav sound files. +.SH OPTIONS +.B gnome-sound-recorder +only accepts the standard GNOME and GTK options. +.SH AUTHORS +.B gnome-sound-recorder +was written by Iain Holmes and others. +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "gtk-options" (7), +.BR "gnome-options" (7) +.P +The online documentation available through the program's +.I Help +menu. --- gnome-media-2.27.3.orig/debian/libgnome-media0.install +++ gnome-media-2.27.3/debian/libgnome-media0.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libglade/2.0/*.so +debian/tmp/usr/lib/*.so.* --- gnome-media-2.27.3.orig/debian/watch +++ gnome-media-2.27.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/gnome-media/([\d\.]+)/gnome-media-(.*)\.tar\.gz --- gnome-media-2.27.3.orig/debian/copyright +++ gnome-media-2.27.3/debian/copyright @@ -0,0 +1,15 @@ +This package was debianized by Davide Puricelli (evo) on +Sat, 22 Jun 2002 19:10:51 +0200 + +It was downloaded from: +http://ftp.gnome.org/pub/GNOME/sources/gnome-media/ + +Upstream Author: Iain Holmes + +Copyright: + +The GNOME libraries are released under the terms of the LGPL license, +see /usr/share/common-licenses/LGPL for reference. + +The rest of the code is released under the terms of the GPL license, +see /usr/share/common-licenses/GPL for the full license. --- gnome-media-2.27.3.orig/debian/gstreamer-properties.1 +++ gnome-media-2.27.3/debian/gstreamer-properties.1 @@ -0,0 +1,107 @@ +.TH GNOME "1" "February 2003" +.SH NAME +gstreamer-properties \- Multimedia systems selector +.SH SYNOPSIS +.B gstreamer-properties +[\fIOPTION\fR...] +.SH DESCRIPTION +.TP +\fB\-\-load\-modules\fR=\fIMODULE1\fR,MODULE2,... +Dynamic modules to load +.PP +Help options +.TP +-?, \fB\-\-help\fR +Show this help message +.TP +\fB\-\-usage\fR +Display brief usage message +.PP +GTK+ +.TP +\fB\-\-gdk\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.TP +\fB\-\-screen\fR=\fISCREEN\fR +X screen to use +.TP +\fB\-\-sync\fR +Make X calls synchronous +.TP +\fB\-\-name\fR=\fINAME\fR +Program name as used by the window +manager +.TP +\fB\-\-class\fR=\fICLASS\fR +Program class as used by the window +manager +.HP +\fB\-\-gxid\-host\fR=\fIHOST\fR +.HP +\fB\-\-gxid\-port\fR=\fIPORT\fR +.TP +\fB\-\-gtk\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-g\-fatal\-warnings\fR +Make all warnings fatal +.TP +\fB\-\-gtk\-module\fR=\fIMODULE\fR +Load an additional Gtk module +.PP +Bonobo activation Support +.TP +\fB\-\-oaf\-ior\-fd\fR=\fIFD\fR +File descriptor to print IOR on +.TP +\fB\-\-oaf\-activate\-iid\fR=\fIIID\fR +IID to activate +.TP +\fB\-\-oaf\-private\fR +Prevent registering of server with OAF +.PP +GNOME GConf Support +.PP +GNOME Library +.TP +\fB\-\-disable\-sound\fR +Disable sound server usage +.TP +\fB\-\-enable\-sound\fR +Enable sound server usage +.TP +\fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT +Host:port on which the sound server +to use is running +.HP +\fB\-\-version\fR +.PP +Session management +.TP +\fB\-\-sm\-client\-id\fR=\fIID\fR +Specify session management ID +.TP +\fB\-\-sm\-config\-prefix\fR=\fIPREFIX\fR +Specify prefix of saved configuration +.TP +\fB\-\-sm\-disable\fR +Disable connection to session manager +.PP +GNOME GUI Library +.HP +\fB\-\-disable\-crash\-dialog\fR +.SH AUTHOR +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +This manual page was written by Davide Puricelli , +for the Debian GNU/Linux system (but may be used by others). --- gnome-media-2.27.3.orig/debian/gnome-grecord.xpm +++ gnome-media-2.27.3/debian/gnome-grecord.xpm @@ -0,0 +1,48 @@ +/* XPM */ +static char * gnome_grecord_xpm[] = { +"32 32 13 1", +" c None", +". c #333333", +"+ c #4C4C4C", +"@ c #191919", +"# c #666667", +"$ c #7F7F7F", +"% c #000000", +"& c #999999", +"* c #B2B2B2", +"= c #007F7F", +"- c #CCCCCC", +"; c #00007F", +"> c #0000FF", +" ", +" ", +" ", +" $$#++ ", +" #++++ ", +" #+++. ", +" .@ &*** ", +" &+ +. $++.#&& ", +" $++ &$+ $..@..+&& ", +" +## .. #++ #..@.@..+&$ ", +" +++ . #.@@@.@...$$ ", +" ##.. #.@.@.@....#$ ", +" +++ $.@@.@@.@...+# ", +" +. +.@@.@......+# ", +" $#. #@@.@.@.+=.+.+# ", +" *#. +@@@@..#$#=+.## ", +" .. $....@.=$$#++.=# ", +" + #.@.>..&&$=+++### ", +" +++ +.....#&$#++#=#++ ", +" #+ @ #.+.+++#$=++#$#++++ ", +" $$++ #+++.+=++..+&$=... ", +" ##++ =+.=++#$#+=&&#.@.. ", +" +.+ ##++#$&*-*-*$+.;.. ", +" $+#=&&*---&$..@@@ ", +" &#+$**---*$..;@@ ", +" &$=$**-**=.@@%%% ", +" $#&***$+.;@%%%%%% ", +" .+.=..@@@%%%%%%%% ", +" @@@@@@;%%@%@%%% ", +" ;%%%%%%%%% ", +" ", +" "}; --- gnome-media-2.27.3.orig/debian/gnome-media.manpages +++ gnome-media-2.27.3/debian/gnome-media.manpages @@ -0,0 +1 @@ +debian/*.1 --- gnome-media-2.27.3.orig/debian/gnome-mixer.xpm +++ gnome-media-2.27.3/debian/gnome-mixer.xpm @@ -0,0 +1,48 @@ +/* XPM */ +static char * gnome_mixer_xpm[] = { +"32 32 13 1", +" c None", +". c #000000", +"+ c #333333", +"@ c #B2B2B2", +"# c #CCCCCC", +"$ c #7F7F7F", +"% c #999999", +"& c #191919", +"* c #4C4C4C", +"= c #E5E5E5", +"- c #666667", +"; c #7F7F00", +"> c #FFFFFF", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" . .. ", +" .. .. ... ", +" ... ... .. ", +" &-$. .. .. ", +" .... +$@%. .. ... .. ", +" .&$$++-#=%. ... .. ... ", +" .*##++##=%. .. .. .. ", +" .*=>**>=#%.. .. ... .. ", +" .+##+*#@#%.. .. .. .. ", +" .+#@++#@@$.. .. .. .. ", +" .+%@++@@@$.. .. .. .. ", +" .+$;+&@%@;. .. .. .. ", +" ..&& +$@$. .. .. ... ", +" &$-. .. .. ", +" +*. .. .. ", +" ... .. ... ", +" . ... ", +" . ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; --- gnome-media-2.27.3.orig/debian/compat +++ gnome-media-2.27.3/debian/compat @@ -0,0 +1 @@ +5 --- gnome-media-2.27.3.orig/debian/gnome-media.install +++ gnome-media-2.27.3/debian/gnome-media.install @@ -0,0 +1,7 @@ +debian/tmp/usr/bin/gnome-audio-profiles-properties +debian/tmp/usr/bin/gnome-sound-recorder +debian/tmp/usr/bin/gnome-volume-control +debian/tmp/usr/bin/gstreamer-properties +debian/tmp/usr/share/applications/gnome-sound-recorder.desktop +debian/tmp/usr/share/applications/gnome-volume-control.desktop +debian/tmp/usr/share/applications/gstreamer-properties.desktop --- gnome-media-2.27.3.orig/debian/patches/05_gst-mix_and_new_gvc_no_conflict.patch +++ gnome-media-2.27.3/debian/patches/05_gst-mix_and_new_gvc_no_conflict.patch @@ -0,0 +1,132 @@ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.3/configure.ac gnome-media-2.27.3.new/configure.ac +--- gnome-media-2.27.3/configure.ac 2009-06-16 09:54:41.000000000 +1000 ++++ gnome-media-2.27.3.new/configure.ac 2009-06-16 09:58:50.000000000 +1000 +@@ -581,7 +581,7 @@ + AS_HELP_STRING([--enable-gstmix], [enable gstreamer mixer]), + ,enable_gstmix=auto) + +-if test "x$enable_gstmix" = "xauto" && test "x$have_pulseaudio" = "xno"; then ++if test "x$enable_gstmix" = "xauto"; then + enable_gstmix=yes + fi + +@@ -670,7 +670,7 @@ + sound-theme/sounds/Makefile + gnome-volume-control/Makefile + gnome-volume-control/data/Makefile +-gnome-volume-control/data/gnome-volume-control.desktop.in ++gnome-volume-control/data/gnome-volume-control-settings.desktop.in + gnome-volume-control/data/icons/Makefile + gnome-volume-control/data/icons/16x16/Makefile + gnome-volume-control/data/icons/16x16/apps/Makefile +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.3/gnome-volume-control/data/gnome-volume-control.desktop.in.in gnome-media-2.27.3.new/gnome-volume-control/data/gnome-volume-control.desktop.in.in +--- gnome-media-2.27.3/gnome-volume-control/data/gnome-volume-control.desktop.in.in 2009-05-03 08:08:46.000000000 +1000 ++++ gnome-media-2.27.3.new/gnome-volume-control/data/gnome-volume-control.desktop.in.in 1970-01-01 10:00:00.000000000 +1000 +@@ -1,14 +0,0 @@ +-[Desktop Entry] +-_Name=Sound +-_Comment=Change sound volume and associate sounds with events +-Exec=gnome-volume-control +-Icon=gnome-volume-control +-Terminal=false +-Type=Application +-StartupNotify=true +-Categories=GNOME;GTK;Settings;HardwareSettings; +-OnlyShowIn=GNOME; +-X-GNOME-Bugzilla-Bugzilla=GNOME +-X-GNOME-Bugzilla-Product=gnome-media +-X-GNOME-Bugzilla-Component=gnome-volume-control +-X-GNOME-Bugzilla-Version=@VERSION@ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.3/gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in gnome-media-2.27.3.new/gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in +--- gnome-media-2.27.3/gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in 1970-01-01 10:00:00.000000000 +1000 ++++ gnome-media-2.27.3.new/gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in 2009-06-16 09:58:50.000000000 +1000 +@@ -0,0 +1,14 @@ ++[Desktop Entry] ++_Name=Sound ++_Comment=Change sound volume and associate sounds with events ++Exec=gnome-volume-control-settings ++Icon=gnome-volume-control ++Terminal=false ++Type=Application ++StartupNotify=true ++Categories=GNOME;GTK;Settings;HardwareSettings; ++OnlyShowIn=GNOME; ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=gnome-media ++X-GNOME-Bugzilla-Component=gnome-volume-control ++X-GNOME-Bugzilla-Version=@VERSION@ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.3/gnome-volume-control/data/Makefile.am gnome-media-2.27.3.new/gnome-volume-control/data/Makefile.am +--- gnome-media-2.27.3/gnome-volume-control/data/Makefile.am 2009-05-03 08:08:46.000000000 +1000 ++++ gnome-media-2.27.3.new/gnome-volume-control/data/Makefile.am 2009-06-16 09:58:50.000000000 +1000 +@@ -10,16 +10,16 @@ + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + + appsdir = $(datadir)/applications +-apps_in_files = gnome-volume-control.desktop.in ++apps_in_files = gnome-volume-control-settings.desktop.in + apps_DATA = $(apps_in_files:.desktop.in=.desktop) + + EXTRA_DIST = \ + $(autostart_in_files) \ +- gnome-volume-control.desktop.in.in \ ++ gnome-volume-control-settings.desktop.in.in \ + $(NULL) + + CLEANFILES = \ +- gnome-volume-control.desktop \ ++ gnome-volume-control-settings.desktop \ + $(NULL) + + DISTCLEANFILES = \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.3/gnome-volume-control/src/gvc-stream-status-icon.c gnome-media-2.27.3.new/gnome-volume-control/src/gvc-stream-status-icon.c +--- gnome-media-2.27.3/gnome-volume-control/src/gvc-stream-status-icon.c 2009-06-16 03:16:21.000000000 +1000 ++++ gnome-media-2.27.3.new/gnome-volume-control/src/gvc-stream-status-icon.c 2009-06-16 09:58:50.000000000 +1000 +@@ -201,7 +201,7 @@ + + error = NULL; + gdk_spawn_command_line_on_screen (gtk_widget_get_screen (icon->priv->dock), +- "gnome-volume-control", ++ "gnome-volume-control-settings", + &error); + + if (error != NULL) { +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.3/gnome-volume-control/src/Makefile.am gnome-media-2.27.3.new/gnome-volume-control/src/Makefile.am +--- gnome-media-2.27.3/gnome-volume-control/src/Makefile.am 2009-06-16 03:16:21.000000000 +1000 ++++ gnome-media-2.27.3.new/gnome-volume-control/src/Makefile.am 2009-06-16 09:58:21.000000000 +1000 +@@ -2,7 +2,7 @@ + + bin_PROGRAMS = \ + gnome-volume-control-applet \ +- gnome-volume-control \ ++ gnome-volume-control-settings \ + $(NULL) + + AM_CPPFLAGS = \ +@@ -49,13 +49,13 @@ + applet-main.c \ + $(NULL) + +-gnome_volume_control_LDADD = \ ++gnome_volume_control_settings_LDADD = \ + $(top_builddir)/sound-theme/libsoundtheme.la \ + $(VOLUME_CONTROL_LIBS) \ + $(PULSEAUDIO_LIBS) \ + $(NULL) + +-gnome_volume_control_SOURCES = \ ++gnome_volume_control_settings_SOURCES = \ + gvc-mixer-stream.h \ + gvc-mixer-stream.c \ + gvc-channel-map.h \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.3/po/POTFILES.in gnome-media-2.27.3.new/po/POTFILES.in +--- gnome-media-2.27.3/po/POTFILES.in 2009-05-03 08:08:46.000000000 +1000 ++++ gnome-media-2.27.3.new/po/POTFILES.in 2009-06-16 09:58:50.000000000 +1000 +@@ -17,7 +17,7 @@ + gnome-cd/gst-cdrom.c + gnome-cd/preferences.c + gnome-volume-control/data/gnome-volume-control-applet.desktop.in +-gnome-volume-control/data/gnome-volume-control.desktop.in.in ++gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in + gnome-volume-control/src/applet-main.c + gnome-volume-control/src/dialog-main.c + gnome-volume-control/src/gvc-applet.c --- gnome-media-2.27.3.orig/debian/patches/01_vumeter_nodisplay.patch +++ gnome-media-2.27.3/debian/patches/01_vumeter_nodisplay.patch @@ -0,0 +1,18 @@ +--- vu-meter/vumeter.desktop.in.in.orig 2007-11-23 16:58:12.194188559 +0100 ++++ vu-meter/vumeter.desktop.in.in 2007-11-23 16:58:30.975258832 +0100 +@@ -7,6 +7,7 @@ + StartupNotify=true + Terminal=false + Type=Application ++NoDisplay=true + Categories=GNOME;GTK;AudioVideo;Monitor; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-media +--- vu-meter/reclevel.desktop.in.in.orig 2007-11-23 16:57:40.616389043 +0100 ++++ vu-meter/reclevel.desktop.in.in 2007-11-23 16:58:02.905659236 +0100 +@@ -6,4 +6,5 @@ + Icon=gnome-reclevel + Terminal=false + Type=Application ++NoDisplay=true + Categories=GNOME;GTK;AudioVideo;Monitor; --- gnome-media-2.27.3.orig/debian/patches/03_menu_changes.patch +++ gnome-media-2.27.3/debian/patches/03_menu_changes.patch @@ -0,0 +1,33 @@ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.1/gnome-cd/gnome-cd.desktop.in.in gnome-media-2.27.1.new/gnome-cd/gnome-cd.desktop.in.in +--- gnome-media-2.27.1/gnome-cd/gnome-cd.desktop.in.in 2009-05-05 01:24:57.000000000 +0200 ++++ gnome-media-2.27.1.new/gnome-cd/gnome-cd.desktop.in.in 2009-05-05 01:25:35.000000000 +0200 +@@ -8,6 +8,7 @@ + Terminal=false + Type=Application + X-GNOME-DocPath=gnome-cd/gnome-cd.xml ++NoDisplay=true + Categories=GNOME;GTK;AudioVideo;Audio;Player; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-media +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.1/gst-mixer/gnome-volume-control.desktop.in.in gnome-media-2.27.1.new/gst-mixer/gnome-volume-control.desktop.in.in +--- gnome-media-2.27.1/gst-mixer/gnome-volume-control.desktop.in.in 2009-05-05 01:24:57.000000000 +0200 ++++ gnome-media-2.27.1.new/gst-mixer/gnome-volume-control.desktop.in.in 2009-05-05 01:25:35.000000000 +0200 +@@ -8,6 +8,7 @@ + X-Info=Gnome Mixer + Terminal=false + Type=Application ++NoDisplay=true + Categories=GNOME;GTK;AudioVideo;Settings;HardwareSettings; + X-GNOME-DocPath=gst-mixer/gnome-volume-control.xml + X-GNOME-Bugzilla-Bugzilla=GNOME +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.1/vu-meter/reclevel.desktop.in.in gnome-media-2.27.1.new/vu-meter/reclevel.desktop.in.in +--- gnome-media-2.27.1/vu-meter/reclevel.desktop.in.in 2009-05-05 01:25:33.000000000 +0200 ++++ gnome-media-2.27.1.new/vu-meter/reclevel.desktop.in.in 2009-05-05 01:25:35.000000000 +0200 +@@ -5,6 +5,7 @@ + Exec=vumeter -r + Icon=gnome-reclevel + Terminal=false ++NoDisplay=true + Type=Application + NoDisplay=true + Categories=GNOME;GTK;AudioVideo;Monitor; --- gnome-media-2.27.3.orig/debian/patches/99_autoconf.patch +++ gnome-media-2.27.3/debian/patches/99_autoconf.patch @@ -0,0 +1,596 @@ +diff -urN gnome-media-2.27.3/aclocal.m4 gnome-media-2.27.3.new/aclocal.m4 +--- gnome-media-2.27.3/aclocal.m4 2009-06-16 07:12:50.000000000 +1000 ++++ gnome-media-2.27.3.new/aclocal.m4 2009-06-16 10:11:02.000000000 +1000 +@@ -1120,59 +1120,61 @@ + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-#serial 4 ++#serial 5 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[# Autoconf 2.62 quotes --file arguments for eval, but not when files +-# are listed without --file. Let's play safe and only enable the eval +-# if we detect the quoting. +-case $CONFIG_FILES in +-*\'*) eval set x "$CONFIG_FILES" ;; +-*) set x $CONFIG_FILES ;; +-esac +-shift +-for mf +-do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" ++[{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done + done +-done ++} + ])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +diff -urN gnome-media-2.27.3/configure gnome-media-2.27.3.new/configure +--- gnome-media-2.27.3/configure 2009-06-16 07:12:53.000000000 +1000 ++++ gnome-media-2.27.3.new/configure 2009-06-16 10:11:06.000000000 +1000 +@@ -9731,13 +9731,15 @@ + gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_REQ + gtk+-2.0 >= 2.6.0 + gio-2.0 +- gconf-2.0\"") >&5 ++ gconf-2.0 ++ launchpad-integration\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gstreamer-$GST_MAJORMINOR >= $GST_REQ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + gio-2.0 +- gconf-2.0") 2>&5 ++ gconf-2.0 ++ launchpad-integration") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +@@ -9746,7 +9748,8 @@ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + gio-2.0 +- gconf-2.0" 2>/dev/null` ++ gconf-2.0 ++ launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -9764,13 +9767,15 @@ + gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_REQ + gtk+-2.0 >= 2.6.0 + gio-2.0 +- gconf-2.0\"") >&5 ++ gconf-2.0 ++ launchpad-integration\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gstreamer-$GST_MAJORMINOR >= $GST_REQ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + gio-2.0 +- gconf-2.0") 2>&5 ++ gconf-2.0 ++ launchpad-integration") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +@@ -9779,7 +9784,8 @@ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + gio-2.0 +- gconf-2.0" 2>/dev/null` ++ gconf-2.0 ++ launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -9803,14 +9809,16 @@ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + gio-2.0 +- gconf-2.0"` ++ gconf-2.0 ++ launchpad-integration"` + else + GSR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + gstreamer-$GST_MAJORMINOR >= $GST_REQ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + gio-2.0 +- gconf-2.0"` ++ gconf-2.0 ++ launchpad-integration"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GSR_PKG_ERRORS" >&5 +@@ -12671,13 +12679,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:12674: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:12682: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:12677: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:12685: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:12680: output\"" >&5) ++ (eval echo "\"\$as_me:12688: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -13871,7 +13879,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 13874 "configure"' > conftest.$ac_ext ++ echo '#line 13882 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -15240,11 +15248,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15243: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15251: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15247: \$? = $ac_status" >&5 ++ echo "$as_me:15255: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15579,11 +15587,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15582: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15590: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15586: \$? = $ac_status" >&5 ++ echo "$as_me:15594: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15684,11 +15692,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15687: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15695: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15691: \$? = $ac_status" >&5 ++ echo "$as_me:15699: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15739,11 +15747,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15742: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15750: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15746: \$? = $ac_status" >&5 ++ echo "$as_me:15754: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -18555,7 +18563,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 18558 "configure" ++#line 18566 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -18651,7 +18659,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 18654 "configure" ++#line 18662 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -20771,7 +20779,7 @@ + fi + + +-if test "x$enable_gstmix" = "xauto" && test "x$have_pulseaudio" = "xno"; then ++if test "x$enable_gstmix" = "xauto"; then + enable_gstmix=yes + fi + +@@ -21464,7 +21472,7 @@ + + + +-ac_config_files="$ac_config_files Makefile shave shave-libtool po/Makefile.in sound-theme/Makefile sound-theme/sounds/Makefile gnome-volume-control/Makefile gnome-volume-control/data/Makefile gnome-volume-control/data/gnome-volume-control.desktop.in gnome-volume-control/data/icons/Makefile gnome-volume-control/data/icons/16x16/Makefile gnome-volume-control/data/icons/16x16/apps/Makefile gnome-volume-control/data/icons/16x16/status/Makefile gnome-volume-control/data/icons/22x22/Makefile gnome-volume-control/data/icons/22x22/apps/Makefile gnome-volume-control/data/icons/22x22/status/Makefile gnome-volume-control/data/icons/24x24/Makefile gnome-volume-control/data/icons/24x24/apps/Makefile gnome-volume-control/data/icons/24x24/status/Makefile gnome-volume-control/data/icons/32x32/Makefile gnome-volume-control/data/icons/32x32/apps/Makefile gnome-volume-control/data/icons/32x32/status/Makefile gnome-volume-control/data/icons/48x48/Makefile gnome-volume-control/data/icons/48x48/apps/Makefile gnome-volume-control/data/icons/scalable/Makefile gnome-volume-control/data/icons/scalable/apps/Makefile gnome-volume-control/data/icons/scalable/status/Makefile gnome-volume-control/src/Makefile vu-meter/Makefile cddb-slave2/Makefile gnome-cd/Makefile gnome-cd/gnome-cd.schemas.in gnome-cd/images/Makefile gnome-cd/images/None/Makefile gnome-cd/images/lcd/Makefile gnome-cd/images/red-lcd/Makefile gnome-cd/images/media/Makefile gnome-cd/access/Makefile gnome-cd/doc/Makefile grecord/Makefile grecord/gnome-sound-recorder.schemas.in grecord/src/Makefile grecord/doc/Makefile grecord/icons/Makefile grecord/icons/16x16/Makefile grecord/icons/22x22/Makefile grecord/icons/24x24/Makefile grecord/icons/32x32/Makefile grecord/icons/48x48/Makefile grecord/icons/scalable/Makefile gstreamer-properties/Makefile gstreamer-properties/help/Makefile gst-mixer/Makefile gst-mixer/icons/Makefile gst-mixer/icons/16x16/Makefile gst-mixer/icons/16x16/devices/Makefile gst-mixer/icons/16x16/status/Makefile gst-mixer/src/Makefile gst-mixer/pixmaps/Makefile gst-mixer/doc/Makefile profiles/Makefile profiles/gnome-audio-profiles.schemas.in profiles/gnome-media-profiles.pc profiles/glade/Makefile profiles/help/Makefile cddb-slave2/cddb-slave.desktop.in gnome-cd/gnome-cd.desktop.in grecord/gnome-sound-recorder.desktop.in gst-mixer/gnome-volume-control.desktop.in gstreamer-properties/gstreamer-properties.desktop.in vu-meter/reclevel.desktop.in vu-meter/vumeter.desktop.in" ++ac_config_files="$ac_config_files Makefile shave shave-libtool po/Makefile.in sound-theme/Makefile sound-theme/sounds/Makefile gnome-volume-control/Makefile gnome-volume-control/data/Makefile gnome-volume-control/data/gnome-volume-control-settings.desktop.in gnome-volume-control/data/icons/Makefile gnome-volume-control/data/icons/16x16/Makefile gnome-volume-control/data/icons/16x16/apps/Makefile gnome-volume-control/data/icons/16x16/status/Makefile gnome-volume-control/data/icons/22x22/Makefile gnome-volume-control/data/icons/22x22/apps/Makefile gnome-volume-control/data/icons/22x22/status/Makefile gnome-volume-control/data/icons/24x24/Makefile gnome-volume-control/data/icons/24x24/apps/Makefile gnome-volume-control/data/icons/24x24/status/Makefile gnome-volume-control/data/icons/32x32/Makefile gnome-volume-control/data/icons/32x32/apps/Makefile gnome-volume-control/data/icons/32x32/status/Makefile gnome-volume-control/data/icons/48x48/Makefile gnome-volume-control/data/icons/48x48/apps/Makefile gnome-volume-control/data/icons/scalable/Makefile gnome-volume-control/data/icons/scalable/apps/Makefile gnome-volume-control/data/icons/scalable/status/Makefile gnome-volume-control/src/Makefile vu-meter/Makefile cddb-slave2/Makefile gnome-cd/Makefile gnome-cd/gnome-cd.schemas.in gnome-cd/images/Makefile gnome-cd/images/None/Makefile gnome-cd/images/lcd/Makefile gnome-cd/images/red-lcd/Makefile gnome-cd/images/media/Makefile gnome-cd/access/Makefile gnome-cd/doc/Makefile grecord/Makefile grecord/gnome-sound-recorder.schemas.in grecord/src/Makefile grecord/doc/Makefile grecord/icons/Makefile grecord/icons/16x16/Makefile grecord/icons/22x22/Makefile grecord/icons/24x24/Makefile grecord/icons/32x32/Makefile grecord/icons/48x48/Makefile grecord/icons/scalable/Makefile gstreamer-properties/Makefile gstreamer-properties/help/Makefile gst-mixer/Makefile gst-mixer/icons/Makefile gst-mixer/icons/16x16/Makefile gst-mixer/icons/16x16/devices/Makefile gst-mixer/icons/16x16/status/Makefile gst-mixer/src/Makefile gst-mixer/pixmaps/Makefile gst-mixer/doc/Makefile profiles/Makefile profiles/gnome-audio-profiles.schemas.in profiles/gnome-media-profiles.pc profiles/glade/Makefile profiles/help/Makefile cddb-slave2/cddb-slave.desktop.in gnome-cd/gnome-cd.desktop.in grecord/gnome-sound-recorder.desktop.in gst-mixer/gnome-volume-control.desktop.in gstreamer-properties/gstreamer-properties.desktop.in vu-meter/reclevel.desktop.in vu-meter/vumeter.desktop.in" + + + +@@ -22579,7 +22587,7 @@ + "sound-theme/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES sound-theme/sounds/Makefile" ;; + "gnome-volume-control/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/Makefile" ;; + "gnome-volume-control/data/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/Makefile" ;; +- "gnome-volume-control/data/gnome-volume-control.desktop.in") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/gnome-volume-control.desktop.in" ;; ++ "gnome-volume-control/data/gnome-volume-control-settings.desktop.in") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/gnome-volume-control-settings.desktop.in" ;; + "gnome-volume-control/data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/Makefile" ;; + "gnome-volume-control/data/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/16x16/Makefile" ;; + "gnome-volume-control/data/icons/16x16/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/16x16/apps/Makefile" ;; +@@ -23298,27 +23306,28 @@ + + + case $ac_file$ac_mode in +- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files +-# are listed without --file. Let's play safe and only enable the eval +-# if we detect the quoting. +-case $CONFIG_FILES in +-*\'*) eval set x "$CONFIG_FILES" ;; +-*) set x $CONFIG_FILES ;; +-esac +-shift +-for mf +-do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`$as_dirname -- "$mf" || ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || { ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ +@@ -23341,28 +23350,28 @@ + q + } + s/.*/./; q'` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`$as_dirname -- "$file" || ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ +@@ -23385,7 +23394,7 @@ + q + } + s/.*/./; q'` +- { as_dir=$dirpart/$fdir ++ { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac +@@ -23426,10 +23435,11 @@ + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 + $as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done + done +-done ++} + ;; + "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +diff -urN gnome-media-2.27.3/gnome-volume-control/data/Makefile.in gnome-media-2.27.3.new/gnome-volume-control/data/Makefile.in +--- gnome-media-2.27.3/gnome-volume-control/data/Makefile.in 2009-06-16 07:12:55.000000000 +1000 ++++ gnome-media-2.27.3.new/gnome-volume-control/data/Makefile.in 2009-06-16 10:11:08.000000000 +1000 +@@ -34,7 +34,7 @@ + host_triplet = @host@ + subdir = gnome-volume-control/data + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/gnome-volume-control.desktop.in.in ++ $(srcdir)/gnome-volume-control-settings.desktop.in.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ + $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/esd.m4 \ +@@ -47,7 +47,7 @@ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = gnome-volume-control.desktop.in ++CONFIG_CLEAN_FILES = gnome-volume-control-settings.desktop.in + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -287,15 +287,15 @@ + autostart_in_files = gnome-volume-control-applet.desktop.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + appsdir = $(datadir)/applications +-apps_in_files = gnome-volume-control.desktop.in ++apps_in_files = gnome-volume-control-settings.desktop.in + apps_DATA = $(apps_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ + $(autostart_in_files) \ +- gnome-volume-control.desktop.in.in \ ++ gnome-volume-control-settings.desktop.in.in \ + $(NULL) + + CLEANFILES = \ +- gnome-volume-control.desktop \ ++ gnome-volume-control-settings.desktop \ + $(NULL) + + DISTCLEANFILES = \ +@@ -334,7 +334,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-gnome-volume-control.desktop.in: $(top_builddir)/config.status $(srcdir)/gnome-volume-control.desktop.in.in ++gnome-volume-control-settings.desktop.in: $(top_builddir)/config.status $(srcdir)/gnome-volume-control-settings.desktop.in.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + + mostlyclean-libtool: +diff -urN gnome-media-2.27.3/gnome-volume-control/src/Makefile.in gnome-media-2.27.3.new/gnome-volume-control/src/Makefile.in +--- gnome-media-2.27.3/gnome-volume-control/src/Makefile.in 2009-06-16 07:12:57.000000000 +1000 ++++ gnome-media-2.27.3.new/gnome-volume-control/src/Makefile.in 2009-06-16 10:11:10.000000000 +1000 +@@ -33,7 +33,7 @@ + build_triplet = @build@ + host_triplet = @host@ + bin_PROGRAMS = gnome-volume-control-applet$(EXEEXT) \ +- gnome-volume-control$(EXEEXT) $(am__EXEEXT_1) ++ gnome-volume-control-settings$(EXEEXT) $(am__EXEEXT_1) + subdir = gnome-volume-control/src + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -54,20 +54,6 @@ + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + am__objects_1 = +-am_gnome_volume_control_OBJECTS = gvc-mixer-stream.$(OBJEXT) \ +- gvc-channel-map.$(OBJEXT) gvc-mixer-sink.$(OBJEXT) \ +- gvc-mixer-source.$(OBJEXT) gvc-mixer-sink-input.$(OBJEXT) \ +- gvc-mixer-source-output.$(OBJEXT) \ +- gvc-mixer-event-role.$(OBJEXT) gvc-mixer-control.$(OBJEXT) \ +- gvc-balance-bar.$(OBJEXT) gvc-channel-bar.$(OBJEXT) \ +- gvc-mixer-dialog.$(OBJEXT) gvc-level-bar.$(OBJEXT) \ +- gvc-log.$(OBJEXT) dialog-main.$(OBJEXT) $(am__objects_1) +-gnome_volume_control_OBJECTS = $(am_gnome_volume_control_OBJECTS) +-am__DEPENDENCIES_1 = +-gnome_volume_control_DEPENDENCIES = \ +- $(top_builddir)/sound-theme/libsoundtheme.la \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) + am_gnome_volume_control_applet_OBJECTS = gvc-mixer-stream.$(OBJEXT) \ + gvc-channel-map.$(OBJEXT) gvc-mixer-sink.$(OBJEXT) \ + gvc-mixer-source.$(OBJEXT) gvc-mixer-sink-input.$(OBJEXT) \ +@@ -78,8 +64,23 @@ + $(am__objects_1) + gnome_volume_control_applet_OBJECTS = \ + $(am_gnome_volume_control_applet_OBJECTS) ++am__DEPENDENCIES_1 = + gnome_volume_control_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++am_gnome_volume_control_settings_OBJECTS = gvc-mixer-stream.$(OBJEXT) \ ++ gvc-channel-map.$(OBJEXT) gvc-mixer-sink.$(OBJEXT) \ ++ gvc-mixer-source.$(OBJEXT) gvc-mixer-sink-input.$(OBJEXT) \ ++ gvc-mixer-source-output.$(OBJEXT) \ ++ gvc-mixer-event-role.$(OBJEXT) gvc-mixer-control.$(OBJEXT) \ ++ gvc-balance-bar.$(OBJEXT) gvc-channel-bar.$(OBJEXT) \ ++ gvc-mixer-dialog.$(OBJEXT) gvc-level-bar.$(OBJEXT) \ ++ gvc-log.$(OBJEXT) dialog-main.$(OBJEXT) $(am__objects_1) ++gnome_volume_control_settings_OBJECTS = \ ++ $(am_gnome_volume_control_settings_OBJECTS) ++gnome_volume_control_settings_DEPENDENCIES = \ ++ $(top_builddir)/sound-theme/libsoundtheme.la \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp + am__depfiles_maybe = depfiles +@@ -92,10 +93,10 @@ + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-SOURCES = $(gnome_volume_control_SOURCES) \ +- $(gnome_volume_control_applet_SOURCES) +-DIST_SOURCES = $(gnome_volume_control_SOURCES) \ +- $(gnome_volume_control_applet_SOURCES) ++SOURCES = $(gnome_volume_control_applet_SOURCES) \ ++ $(gnome_volume_control_settings_SOURCES) ++DIST_SOURCES = $(gnome_volume_control_applet_SOURCES) \ ++ $(gnome_volume_control_settings_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -349,13 +350,13 @@ + applet-main.c \ + $(NULL) + +-gnome_volume_control_LDADD = \ ++gnome_volume_control_settings_LDADD = \ + $(top_builddir)/sound-theme/libsoundtheme.la \ + $(VOLUME_CONTROL_LIBS) \ + $(PULSEAUDIO_LIBS) \ + $(NULL) + +-gnome_volume_control_SOURCES = \ ++gnome_volume_control_settings_SOURCES = \ + gvc-mixer-stream.h \ + gvc-mixer-stream.c \ + gvc-channel-map.h \ +@@ -458,12 +459,12 @@ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +-gnome-volume-control$(EXEEXT): $(gnome_volume_control_OBJECTS) $(gnome_volume_control_DEPENDENCIES) +- @rm -f gnome-volume-control$(EXEEXT) +- $(LINK) $(gnome_volume_control_OBJECTS) $(gnome_volume_control_LDADD) $(LIBS) + gnome-volume-control-applet$(EXEEXT): $(gnome_volume_control_applet_OBJECTS) $(gnome_volume_control_applet_DEPENDENCIES) + @rm -f gnome-volume-control-applet$(EXEEXT) + $(LINK) $(gnome_volume_control_applet_OBJECTS) $(gnome_volume_control_applet_LDADD) $(LIBS) ++gnome-volume-control-settings$(EXEEXT): $(gnome_volume_control_settings_OBJECTS) $(gnome_volume_control_settings_DEPENDENCIES) ++ @rm -f gnome-volume-control-settings$(EXEEXT) ++ $(LINK) $(gnome_volume_control_settings_OBJECTS) $(gnome_volume_control_settings_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) --- gnome-media-2.27.3.orig/debian/patches/01_lpi.patch +++ gnome-media-2.27.3/debian/patches/01_lpi.patch @@ -0,0 +1,47 @@ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.1/configure.ac gnome-media-2.27.1.new/configure.ac +--- gnome-media-2.27.1/configure.ac 2009-05-03 00:08:46.000000000 +0200 ++++ gnome-media-2.27.1.new/configure.ac 2009-05-05 03:37:38.000000000 +0200 +@@ -275,7 +275,8 @@ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + gio-2.0 +- gconf-2.0], ++ gconf-2.0 ++ launchpad-integration], + have_gst=yes, + [ + AC_MSG_RESULT(no) +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.1/grecord/src/gsr-window.c gnome-media-2.27.1.new/grecord/src/gsr-window.c +--- gnome-media-2.27.1/grecord/src/gsr-window.c 2009-05-04 21:35:13.000000000 +0200 ++++ gnome-media-2.27.1.new/grecord/src/gsr-window.c 2009-05-05 03:36:47.000000000 +0200 +@@ -44,6 +44,8 @@ + #include + #include + ++#include ++ + #include + + #include "gsr-window.h" +@@ -2278,6 +2280,10 @@ + } + g_free (path); + ++ ++ launchpad_integration_add_ui (priv->ui_manager, ++ "/MenuBar/HelpMenu/LaunchpadItems"); ++ + /* show tooltips in the statusbar */ + g_signal_connect (priv->ui_manager, "connect_proxy", + G_CALLBACK (connect_proxy_cb), window); +diff -Nur -x '*.orig' -x '*~' gnome-media-2.27.1/grecord/src/ui.xml gnome-media-2.27.1.new/grecord/src/ui.xml +--- gnome-media-2.27.1/grecord/src/ui.xml 2009-04-17 20:39:12.000000000 +0200 ++++ gnome-media-2.27.1.new/grecord/src/ui.xml 2009-05-05 03:36:47.000000000 +0200 +@@ -24,6 +24,7 @@ + + + ++ + + + --- gnome-media-2.27.3.orig/debian/patches/05_mixer_noprefs.patch +++ gnome-media-2.27.3/debian/patches/05_mixer_noprefs.patch @@ -0,0 +1,11 @@ +--- gst-mixer/gnome-volume-control.desktop.in.in.orig 2008-07-15 14:08:12.966670055 +0200 ++++ gst-mixer/gnome-volume-control.desktop.in.in 2008-07-15 14:08:23.872307155 +0200 +@@ -8,7 +8,7 @@ + Terminal=false + Type=Application + NoDisplay=true +-Categories=GNOME;GTK;AudioVideo;Settings;HardwareSettings; ++Categories=GNOME;GTK;AudioVideo;HardwareSettings; + X-GNOME-DocPath=gst-mixer/gnome-volume-control.xml + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-media