--- gnome-media-2.26.0.orig/debian/watch +++ gnome-media-2.26.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/gnome-media/([\d\.]+)[0245678]/gnome-media-(.*)\.tar\.gz --- gnome-media-2.26.0.orig/debian/libgnome-media-dev.install +++ gnome-media-2.26.0/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.26.0.orig/debian/gnome-media.install +++ gnome-media-2.26.0/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.26.0.orig/debian/gstreamer-properties.1 +++ gnome-media-2.26.0/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.26.0.orig/debian/gnome-volume-control-pulse.install +++ gnome-media-2.26.0/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.26.0.orig/debian/changelog +++ gnome-media-2.26.0/debian/changelog @@ -0,0 +1,731 @@ +gnome-media (2.26.0-0ubuntu4) karmic; urgency=low + + * debian/control.in: + - use correct depends for the libgnome-media-dev binary + + -- Sebastien Bacher Wed, 29 Apr 2009 11:40:51 +0200 + +gnome-media (2.26.0-0ubuntu3) jaunty; urgency=low + + * Fix bug in whitelist checker (LP: 345645) + + -- Robert Ancell Thu, 26 Mar 2009 14:12:58 +0000 + +gnome-media (2.26.0-0ubuntu2) jaunty; urgency=low + + * rename debian/gnome-volume-control.install to + gnome-volume-control-pulse.install + + -- Michael Vogt Wed, 18 Mar 2009 10:00:46 +0100 + +gnome-media (2.26.0-0ubuntu1) jaunty; urgency=low + + * New upstream version (LP: #344481): + + gnome-volume-control: + - Fix tooltip when dB changes. + - Update the volume immediately. + + gst-mixer: + - Add new icon mappings. + - Make options update when changed. + - Add sound theme page. + * 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/06_autoconf.patch: + - Recreate build system. + * debian/control{.in}, + debian/gnome-media-common.install, + debian/gnome-media.install, + debian/gnome-volume-control.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. + + -- Chris Coulson Tue, 17 Mar 2009 19:15:41 +0000 + +gnome-media (2.25.92-0ubuntu2) jaunty; urgency=low + + * debian/patches/04_gst-mixer_help.patch: + - Correctly display the help by calling gtk_show_uri + as opposed to running xdg-open (LP: #337235). + + -- Chris Coulson Thu, 12 Mar 2009 21:18:37 +0000 + +gnome-media (2.25.92-0ubuntu1) jaunty; urgency=low + + * New upstream version (LP: #337462): + - Add libunique dependency, instead of directly using + dbus-glib. + * debian/control{.in}: + - Add build-depend on libunique-dev. + - Add XS-Vcs-Bzr field. + + -- Chris Coulson Tue, 03 Mar 2009 21:35:56 +0000 + +gnome-media (2.25.5-0ubuntu2) jaunty; urgency=low + + * debian/control.in, + debian/gnome-media-common.install, + debian/rules: + - enable the intrepid version of the mixer capplet rather than the new one + (lp: #324807) + + -- Sebastien Bacher Thu, 05 Feb 2009 16:13:35 +0100 + +gnome-media (2.25.5-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Add desktop files and icons for gnome-volume-control + - Add a new sound theme + - Fix some of the resizing on startup in the volume control + - Simplify the sound theme selection + - Fix a few positioning problems in the volume applet + - Add a mute toggle item in the volume applet (lp: #290543) + - Make the volume slider instantaneous + - Fix "no applications" message when there are applications + - Fix the volume applet not showing up in some cases (lp: #314966) + - Add a close button to the sound capplet + - Hide sound events from the applications tab + - Fix scrolling with the mouse wheel going in the wrong direction + (lp: #317751) + * debian/control.in: + - build-depends on libxml2-dev + * debian/patches/06_autoconf.patch: + - new version update + + -- Sebastien Bacher Tue, 20 Jan 2009 23:32:11 +0100 + +gnome-media (2.25.1-0ubuntu1) jaunty; urgency=low + + * New upstream version: + - Add new volume control applet and dialog + - Bug #552748 - General cleanups + - Bug #552420 - Make speex voice encoder mono + - Bug #543306 - Use .ogg extension + - Bug #498617 - Use LC profile by default for AAC + - Bug #557043 - Add MP2 profile + - Bug #564060 - Use 32kHz for Speex + - Bug #553383 - fix "can't delete profile with '#' in its name" + - Bug #563573 - clean up GLib and GTK+ includes. + * debian/control.in: + - updated build requirements + * debian/gnome-media-common.install: + - updated the list of files to install (lp: #259945) + * debian/patches/06_autoconf.patch: + - new version update + + -- Sebastien Bacher Mon, 05 Jan 2009 16:01:49 +0100 + +gnome-media (2.24.0.1-0ubuntu1) intrepid; urgency=low + + * New Upstream version: (LP: #274180) + - fix 552445: do not include GPLv3 COPYING in dist, clarify the + license information for each project + - translation updates: sq + * debian/patches + - updated 06_autoconf.patch to apply to new version + + -- Andreas Moog Thu, 25 Sep 2008 00:18:18 +0200 + +gnome-media (2.24.0-0ubuntu1) intrepid; urgency=low + + * New Upstream version: (LP: #273518) + - Bugs fixed: 552047: add audio to categories of gnome-sound-recorder + - Translation and documentation updates + * debian/patches: + - updated 06_autoconf.patch to apply to new version + + -- Andreas Moog Tue, 23 Sep 2008 12:37:38 +0200 + +gnome-media (2.23.92-0ubuntu1) intrepid; urgency=low + + * New upstream version: + Bugs fixed: + - 550931: use standard icon name for cd icon + - 550919: modernize autofoo + - 550307: allow building without esd + + -- Sebastien Bacher Mon, 08 Sep 2008 21:52:18 +0200 + +gnome-media (2.23.91-0ubuntu1) intrepid; urgency=low + + * New upstream version: + Bugs fixed: + - 516090, 404877: GIO port, use GtkRecentManager + - 548468: Replace "Run Mixer" with "Open Volume Control" in + g-s-r documentation. + - 537028: Fix an issue with SunAudio mixer + - 543306: Use ".oga" instead of ".ogg" for OGG audio. (lp: #241973) + * debian/control.in: + - don't require libgnomevfs, update libglib requirement + * debian/patches/01_lpi.patch, + debian/patches/06_autoconf.patch: + - new version update + + -- Sebastien Bacher Mon, 01 Sep 2008 23:13:21 +0200 + +gnome-media (2.23.3-0ubuntu2) intrepid; urgency=low + + * debian/control.in: (LP: #243573) + - Remove libgail-dev as gail is now on gtk2 + - Bump libgtk2.0 to 2.13 + - Bump Standards-Version to 3.8.0 + * debian/rules: + - --disable-scrollkeeper to fix ftfbs + + -- Pedro Fragoso Fri, 27 Jun 2008 17:38:17 +0100 + +gnome-media (2.23.3-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - gnome-volume-control received some love with a new UI, + it's like a capplet, feedback welcome! + - normal bug fixing + Bugs fixed: + - 341021: Mute conflict between gnome-volume-applet and gnome-volume-manager + - 462164: Listen to GStreamer bus events for mixers that supports it. + - 535058: Wrong track list displayed on startup. + - 441641: Be more careful with strcmp. + - 349951: Make g-v-c a capplet. + - 534090: Match the title of the tabs. + - 528064: Sort mixer tracks by their type. + - 529083: Fixes build with older compilers. + * debian/patches/02_restore-mixer-track-type.patch: + - the change is in the new version + * debian/patches/04_sort-tracks-by-type.patch: + - the change is in the new version + + -- Sebastien Bacher Thu, 05 Jun 2008 00:03:20 +0200 + +gnome-media (2.23.1.1-0ubuntu1) intrepid; urgency=low + + * New upstream version + * Sync with Debian + * debian/control.in: + - Build-Depends on liblaunchpad-integration-dev + - the package is maintained by Ubuntu Desktop Team + * debian/patches/01_lpi.patch: + - launchpad-integration + * debian/patches/03_menu_changes.patch: + - replace cddb-menu.patch, mask gnome-volume-control (can be opened from + the panel), gstreamer-properties, + gnome-cd (sound-juicer does this job) (MenusRevisited) + * debian/patches/03_enable-disable-correct-track.patch: + - dropped, the change is in the new version + * debian/patches/06_autoconf.patch: + - update the configure + + -- Sebastien Bacher Wed, 28 May 2008 14:04:17 +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.26.0.orig/debian/gnome-media.menu +++ gnome-media-2.26.0/debian/gnome-media.menu @@ -0,0 +1,6 @@ +?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="vumeter (Gnome 2.0 Volume Meter)" icon="/usr/share/pixmaps/gnome-vumeter.xpm" command="/usr/bin/vumeter" +?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.26.0.orig/debian/rules +++ gnome-media-2.26.0/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.26.0.orig/debian/vumeter.1 +++ gnome-media-2.26.0/debian/vumeter.1 @@ -0,0 +1,122 @@ +.TH GNOME "1" "November 2002" +.SH NAME +vumeter \- Sound volume meter +.SH SYNOPSIS +.B vumeter +[\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\-x\fR=\fIX\-Position\fR +Specify the X position of the meter. +.TP +\fB\-y\fR=\fIY\-Position\fR +Specify the Y position of the meter. +.TP +\fB\-s\fR=\fIESD\fR Server Host +Connect to the esd server on this +host. +.TP +\fB\-v\fR +Open a vertical version of the meter. +.TP +\fB\-r\fR +Act as recording level meter. +.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.26.0.orig/debian/control +++ gnome-media-2.26.0/debian/control @@ -0,0 +1,103 @@ +Source: gnome-media +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Marco Cabizza +Uploaders: Debian GNOME Maintainers +Standards-Version: 3.8.0 +XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-media/ubuntu +Build-Depends: libgnomeui-dev (>= 2.13.2), + libgconf2-dev, + libgail-gnome-dev, + libart-2.0-dev, + libglib2.0-dev (>= 2.16), + libgnome2-dev (>= 2.13.7), + libesd0-dev (>= 0.2.23), + libpulse-dev, + libcanberra-gtk-dev, + libgtk2.0-dev (>= 2.13), + debhelper (>= 5.0.0), + scrollkeeper, + libgstreamer0.10-dev (>= 0.10.3), + libgnome-desktop-dev, + libgstreamer-plugins-base0.10-dev (>= 0.10.3), + libxml-parser-perl, + libxml2-dev, + libnautilus-burn-dev (>= 2.12.2-2), + cdbs (>= 0.4.41), + gnome-pkg-tools (>= 0.11.3), + dpkg-dev (>= 1.13.19), + gstreamer0.10-tools, + gstreamer0.10-plugins-base, + gstreamer0.10-plugins-good, + libbonobo2-dev (>= 2.0.0), + libglade2-dev, + gnome-doc-utils, + liblaunchpad-integration-dev (>= 0.1.17), + libunique-dev + +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; + * a volume level meter for ESD; + * 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 +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, to handle media profiles; + +Package: libgnome-media-dev +Architecture: any +Depends: libgnome-media0 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + libgconf2-dev, + libgtk2.0-dev, + libglade2-dev, + libgnome2-dev +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, to handle media profiles; + +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.26.0.orig/debian/compat +++ gnome-media-2.26.0/debian/compat @@ -0,0 +1 @@ +5 --- gnome-media-2.26.0.orig/debian/gnome-media.manpages +++ gnome-media-2.26.0/debian/gnome-media.manpages @@ -0,0 +1 @@ +debian/*.1 --- gnome-media-2.26.0.orig/debian/libgnome-media0.install +++ gnome-media-2.26.0/debian/libgnome-media0.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libglade/2.0/*.so +debian/tmp/usr/lib/*.so.* --- gnome-media-2.26.0.orig/debian/gnome-vumeter.xpm +++ gnome-media-2.26.0/debian/gnome-vumeter.xpm @@ -0,0 +1,43 @@ +/* XPM */ +static char * gnome_vumeter_xpm[] = { +"32 32 8 1", +" c None", +". c #FFFF00", +"+ c #00FF00", +"@ c #CCCCCC", +"# c #999999", +"$ c #B2B2B2", +"% c #FF0000", +"& c #7F7F00", +" ", +" ", +" ", +" %%%% ", +" %%%%%% ", +" ", +" ", +" ###### ##### ", +" ##&# ##&## ", +" ", +" $$$$$ $$$$$$ $$$$$ ", +" @@@@@ @@@@@@ @@@@@ ", +" ", +" ..@.. .@.. ..@.. ", +" .@.@. ...@.. .@.@. ", +" ", +" ", +" ..... ...... ..... ..... ", +" ...+. ..+. ...+. ...+. ", +" ", +" .+..+ .+..+. .+..+ .+..+ ", +" .+.+. +.+.+. .+.+. .+.+. ", +" ", +" .++.+ ++.+ .++.+ .++.+ ", +" +.++. +.++.+ +.++. +.++. ", +" ", +" ", +" +++++ ++++++ +++++ +++++ ", +" +++++ ++++ +++++ +++++ ", +" ", +" ", +" "}; --- gnome-media-2.26.0.orig/debian/gnome-sound-recorder.1 +++ gnome-media-2.26.0/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.26.0.orig/debian/gnome-media-common.install +++ gnome-media-2.26.0/debian/gnome-media-common.install @@ -0,0 +1,9 @@ +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 --- gnome-media-2.26.0.orig/debian/control.in +++ gnome-media-2.26.0/debian/control.in @@ -0,0 +1,103 @@ +Source: gnome-media +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Marco Cabizza +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.0 +XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-media/ubuntu +Build-Depends: libgnomeui-dev (>= 2.13.2), + libgconf2-dev, + libgail-gnome-dev, + libart-2.0-dev, + libglib2.0-dev (>= 2.16), + libgnome2-dev (>= 2.13.7), + libesd0-dev (>= 0.2.23), + libpulse-dev, + libcanberra-gtk-dev, + libgtk2.0-dev (>= 2.13), + debhelper (>= 5.0.0), + scrollkeeper, + libgstreamer0.10-dev (>= 0.10.3), + libgnome-desktop-dev, + libgstreamer-plugins-base0.10-dev (>= 0.10.3), + libxml-parser-perl, + libxml2-dev, + libnautilus-burn-dev (>= 2.12.2-2), + cdbs (>= 0.4.41), + gnome-pkg-tools (>= 0.11.3), + dpkg-dev (>= 1.13.19), + gstreamer0.10-tools, + gstreamer0.10-plugins-base, + gstreamer0.10-plugins-good, + libbonobo2-dev (>= 2.0.0), + libglade2-dev, + gnome-doc-utils, + liblaunchpad-integration-dev (>= 0.1.17), + libunique-dev + +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; + * a volume level meter for ESD; + * 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 +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, to handle media profiles; + +Package: libgnome-media-dev +Architecture: any +Depends: libgnome-media0 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + libgconf2-dev, + libgtk2.0-dev, + libglade2-dev, + libgnome2-dev +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, to handle media profiles; + +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.26.0.orig/debian/gnome-grecord.xpm +++ gnome-media-2.26.0/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.26.0.orig/debian/gnome-mixer.xpm +++ gnome-media-2.26.0/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.26.0.orig/debian/copyright +++ gnome-media-2.26.0/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.26.0.orig/debian/gnome-volume-control.1 +++ gnome-media-2.26.0/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.26.0.orig/debian/patches/01_lpi.patch +++ gnome-media-2.26.0/debian/patches/01_lpi.patch @@ -0,0 +1,45 @@ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.25.1/configure.ac gnome-media-2.25.1.new/configure.ac +--- gnome-media-2.25.1/configure.ac 2008-12-16 04:08:01.000000000 +0100 ++++ gnome-media-2.25.1.new/configure.ac 2009-01-05 16:02:14.000000000 +0100 +@@ -234,6 +234,7 @@ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + libgnomeui-2.0 >= 1.102.0 ++ launchpad-integration + gio-2.0], + have_gst=yes, + [ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.25.1/grecord/src/gsr-window.c gnome-media-2.25.1.new/grecord/src/gsr-window.c +--- gnome-media-2.25.1/grecord/src/gsr-window.c 2008-12-16 21:28:57.000000000 +0100 ++++ gnome-media-2.25.1.new/grecord/src/gsr-window.c 2009-01-05 16:02:14.000000000 +0100 +@@ -45,6 +45,8 @@ + #include + #include + ++#include ++ + #include + + #include "gsr-window.h" +@@ -2273,6 +2275,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.25.1/grecord/src/ui.xml gnome-media-2.25.1.new/grecord/src/ui.xml +--- gnome-media-2.25.1/grecord/src/ui.xml 2008-04-20 09:51:20.000000000 +0200 ++++ gnome-media-2.25.1.new/grecord/src/ui.xml 2009-01-05 16:02:14.000000000 +0100 +@@ -24,6 +24,7 @@ + + + ++ + + + --- gnome-media-2.26.0.orig/debian/patches/05_gst-mix_and_new_gvc_no_conflict.patch +++ gnome-media-2.26.0/debian/patches/05_gst-mix_and_new_gvc_no_conflict.patch @@ -0,0 +1,132 @@ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/configure.ac gnome-media-2.26.0.new/configure.ac +--- gnome-media-2.26.0/configure.ac 2009-03-17 19:25:05.000000000 +0000 ++++ gnome-media-2.26.0.new/configure.ac 2009-03-17 19:25:07.000000000 +0000 +@@ -592,7 +592,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 + +@@ -680,7 +680,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.26.0/gnome-volume-control/data/gnome-volume-control.desktop.in.in gnome-media-2.26.0.new/gnome-volume-control/data/gnome-volume-control.desktop.in.in +--- gnome-media-2.26.0/gnome-volume-control/data/gnome-volume-control.desktop.in.in 2009-02-05 11:35:33.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/gnome-volume-control.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 +@@ -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.26.0/gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in gnome-media-2.26.0.new/gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in +--- gnome-media-2.26.0/gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in 2009-03-17 19:25:07.000000000 +0000 +@@ -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.26.0/gnome-volume-control/data/Makefile.am gnome-media-2.26.0.new/gnome-volume-control/data/Makefile.am +--- gnome-media-2.26.0/gnome-volume-control/data/Makefile.am 2009-03-04 23:54:53.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/Makefile.am 2009-03-17 19:25:07.000000000 +0000 +@@ -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.26.0/gnome-volume-control/src/gvc-stream-status-icon.c gnome-media-2.26.0.new/gnome-volume-control/src/gvc-stream-status-icon.c +--- gnome-media-2.26.0/gnome-volume-control/src/gvc-stream-status-icon.c 2009-03-16 19:22:38.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/src/gvc-stream-status-icon.c 2009-03-17 19:25:07.000000000 +0000 +@@ -200,7 +200,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.26.0/gnome-volume-control/src/Makefile.am gnome-media-2.26.0.new/gnome-volume-control/src/Makefile.am +--- gnome-media-2.26.0/gnome-volume-control/src/Makefile.am 2009-03-16 20:38:52.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/src/Makefile.am 2009-03-17 19:26:00.000000000 +0000 +@@ -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 = \ + $(VOLUME_CONTROL_LIBS) \ + $(PULSEAUDIO_LIBS) \ + $(top_builddir)/sound-theme/libsoundtheme.la \ + $(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.26.0/po/POTFILES.in gnome-media-2.26.0.new/po/POTFILES.in +--- gnome-media-2.26.0/po/POTFILES.in 2009-03-16 19:22:38.000000000 +0000 ++++ gnome-media-2.26.0.new/po/POTFILES.in 2009-03-17 19:25:07.000000000 +0000 +@@ -16,7 +16,7 @@ + gnome-cd/gnome-cd.schemas.in.in + gnome-cd/gst-cdrom.c + gnome-cd/preferences.c +-gnome-volume-control/data/gnome-volume-control.desktop.in.in ++gnome-volume-control/data/gnome-volume-control-settings.desktop.in.in + gnome-volume-control/data/gnome-volume-control-applet.desktop.in + gnome-volume-control/src/applet-main.c + gnome-volume-control/src/dialog-main.c --- gnome-media-2.26.0.orig/debian/patches/06_fix_whitelist.patch +++ gnome-media-2.26.0/debian/patches/06_fix_whitelist.patch @@ -0,0 +1,42 @@ +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/345645 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=576022 +# Desciption: Fixes whitelist bug by reverting to 2.24 behaviour. +# +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/element.c gnome-media-2.26.0.new/gst-mixer/src/element.c +--- gnome-media-2.26.0/gst-mixer/src/element.c 2009-03-04 23:54:53.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/src/element.c 2009-03-26 14:20:07.000000000 +0000 +@@ -133,6 +133,14 @@ + { "front", FALSE }, + { NULL, FALSE } + }; ++ ++ /* Reset the whitelist. This is a hack to fix bugs LP:345645, 576022 */ ++ if (track == NULL) ++ { ++ for (i = 0; list[i].label != NULL; i++) ++ list[i].done = FALSE; ++ return TRUE; ++ } + + for (i = 0; !found && list[i].label != NULL; i++) { + gchar *label_l = NULL; +@@ -304,6 +312,7 @@ + } + + /* show */ ++ gnome_volume_control_element_whitelist (NULL); + for (item = gst_mixer_list_tracks (el->mixer); + item != NULL; item = item->next) { + GstMixerTrack *track = item->data; +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/preferences.c gnome-media-2.26.0.new/gst-mixer/src/preferences.c +--- gnome-media-2.26.0/gst-mixer/src/preferences.c 2009-03-04 23:54:53.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/src/preferences.c 2009-03-26 14:20:20.000000000 +0000 +@@ -309,6 +309,7 @@ + gst_object_replace ((GstObject **) &prefs->mixer, GST_OBJECT (element)); + + /* add all tracks */ ++ gnome_volume_control_element_whitelist (NULL); + for (item = gst_mixer_list_tracks (mixer); + item != NULL; item = item->next) { + GstMixerTrack *track = item->data; --- gnome-media-2.26.0.orig/debian/patches/04_gst-mixer_help.patch +++ gnome-media-2.26.0/debian/patches/04_gst-mixer_help.patch @@ -0,0 +1,47 @@ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/window.c gnome-media-2.26.0.new/gst-mixer/src/window.c +--- gnome-media-2.26.0/gst-mixer/src/window.c 2008-11-15 20:10:58.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/src/window.c 2009-03-17 19:19:50.000000000 +0000 +@@ -99,34 +99,23 @@ + } + + static void +-open_uri (GtkWindow *parent, +- const char *uri) ++cb_help (GtkAction *action, ++ GnomeVolumeControlWindow *win) + { +- GtkWidget *dialog; + GdkScreen *screen; ++ GtkWidget *dialog; + GError *error = NULL; +- gchar *cmdline; +- +- screen = gtk_window_get_screen (parent); +- +- cmdline = g_strconcat ("xdg-open ", uri, NULL); +- +- if (gdk_spawn_command_line_on_screen (screen, cmdline, &error) == FALSE) { +- dialog = gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT, ++ ++ screen = gtk_window_get_screen (GTK_WINDOW (win)); ++ ++ if (gtk_show_uri (screen, "ghelp:gnome-volume-control", GDK_CURRENT_TIME, ++ &error) == FALSE) { ++ dialog = gtk_message_dialog_new (GTK_WINDOW (win), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", error->message); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + g_error_free(error); + } +- g_free(cmdline); +-} +- +- +-static void +-cb_help (GtkAction *action, +- GnomeVolumeControlWindow *win) +-{ +- open_uri (GTK_WINDOW (win), "ghelp:gnome-volume-control"); + } + + static void --- gnome-media-2.26.0.orig/debian/patches/03_menu_changes.patch +++ gnome-media-2.26.0/debian/patches/03_menu_changes.patch @@ -0,0 +1,32 @@ +diff -Nur gnome-media-2.19.92/gnome-cd/gnome-cd.desktop.in.in gnome-media-2.19.92.new/gnome-cd/gnome-cd.desktop.in.in +--- gnome-media-2.19.92/gnome-cd/gnome-cd.desktop.in.in 2007-08-09 15:52:53.000000000 +0200 ++++ gnome-media-2.19.92.new/gnome-cd/gnome-cd.desktop.in.in 2007-09-07 21:37:20.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 gnome-media-2.19.92/gst-mixer/gnome-volume-control.desktop.in.in gnome-media-2.19.92.new/gst-mixer/gnome-volume-control.desktop.in.in +--- gnome-media-2.19.92/gst-mixer/gnome-volume-control.desktop.in.in 2007-08-09 15:53:00.000000000 +0200 ++++ gnome-media-2.19.92.new/gst-mixer/gnome-volume-control.desktop.in.in 2007-09-07 21:37:20.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 gnome-media-2.19.92/vu-meter/reclevel.desktop.in.in gnome-media-2.19.92.new/vu-meter/reclevel.desktop.in.in +--- gnome-media-2.19.92/vu-meter/reclevel.desktop.in.in 2007-08-09 15:53:01.000000000 +0200 ++++ gnome-media-2.19.92.new/vu-meter/reclevel.desktop.in.in 2007-09-07 21:37:20.000000000 +0200 +@@ -5,5 +5,6 @@ + Exec=vumeter -r + Icon=gnome-reclevel + Terminal=false ++NoDisplay=true + Type=Application + Categories=GNOME;GTK;AudioVideo;Monitor; --- gnome-media-2.26.0.orig/debian/patches/01_vumeter_nodisplay.patch +++ gnome-media-2.26.0/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.26.0.orig/debian/patches/99_autoconf.patch +++ gnome-media-2.26.0/debian/patches/99_autoconf.patch @@ -0,0 +1,2071 @@ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/aclocal.m4 gnome-media-2.26.0.new/aclocal.m4 +--- gnome-media-2.26.0/aclocal.m4 2009-03-16 19:33:32.000000000 +0000 ++++ gnome-media-2.26.0.new/aclocal.m4 2009-03-17 19:27:47.000000000 +0000 +@@ -1,4 +1,4 @@ +-# generated automatically by aclocal 1.10.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.2 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +@@ -13,7 +13,7 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(AC_AUTOCONF_VERSION, [2.63],, ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, + [m4_warning([this file was generated for autoconf 2.63. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. +@@ -828,7 +828,7 @@ + fi[]dnl + ])# PKG_CHECK_MODULES + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -843,7 +843,7 @@ + [am__api_version='1.10' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.10.1], [], ++m4_if([$1], [1.10.2], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -857,12 +857,12 @@ + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.10.1])dnl ++[AM_AUTOMAKE_VERSION([1.10.2])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +@@ -1112,19 +1112,28 @@ + + # Generate code to set up dependency tracking. -*- Autoconf -*- + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-#serial 3 ++#serial 4 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do ++[# 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. +@@ -1433,14 +1442,14 @@ + rm -f confinc confmf + ]) + +-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 ++# serial 6 + + # AM_PROG_CC_C_O + # -------------- +@@ -1452,8 +1461,9 @@ + # FIXME: we rely on the cache variable name because + # there is no other way. + set dummy $CC +-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then ++am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` ++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o ++if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. +@@ -1531,13 +1541,13 @@ + + # Helper functions for option handling. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 ++# serial 4 + + # _AM_MANGLE_OPTION(NAME) + # ----------------------- +@@ -1554,7 +1564,7 @@ + # ---------------------------------- + # OPTIONS is a space-separated list of Automake options. + AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + + # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) + # ------------------------------------------- +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/cddb-slave2/Makefile.in gnome-media-2.26.0.new/cddb-slave2/Makefile.in +--- gnome-media-2.26.0/cddb-slave2/Makefile.in 2009-03-16 19:33:36.000000000 +0000 ++++ gnome-media-2.26.0.new/cddb-slave2/Makefile.in 2009-03-17 19:27:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -492,8 +492,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -778,7 +778,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/configure gnome-media-2.26.0.new/configure +--- gnome-media-2.26.0/configure 2009-03-16 19:33:35.000000000 +0000 ++++ gnome-media-2.26.0.new/configure 2009-03-17 19:27:49.000000000 +0000 +@@ -9734,12 +9734,14 @@ + gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_REQ + gtk+-2.0 >= 2.6.0 + libgnomeui-2.0 >= 1.102.0 ++ launchpad-integration + gio-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gstreamer-$GST_MAJORMINOR >= $GST_REQ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + libgnomeui-2.0 >= 1.102.0 ++ launchpad-integration + gio-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -9749,6 +9751,7 @@ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + libgnomeui-2.0 >= 1.102.0 ++ launchpad-integration + gio-2.0" 2>/dev/null` + else + pkg_failed=yes +@@ -9767,12 +9770,14 @@ + gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_REQ + gtk+-2.0 >= 2.6.0 + libgnomeui-2.0 >= 1.102.0 ++ launchpad-integration + gio-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors " + gstreamer-$GST_MAJORMINOR >= $GST_REQ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + libgnomeui-2.0 >= 1.102.0 ++ launchpad-integration + gio-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -9782,6 +9787,7 @@ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + libgnomeui-2.0 >= 1.102.0 ++ launchpad-integration + gio-2.0" 2>/dev/null` + else + pkg_failed=yes +@@ -9806,6 +9812,7 @@ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + libgnomeui-2.0 >= 1.102.0 ++ launchpad-integration + gio-2.0"` + else + GSR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " +@@ -9813,6 +9820,7 @@ + gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ + gtk+-2.0 >= 2.6.0 + libgnomeui-2.0 >= 1.102.0 ++ launchpad-integration + gio-2.0"` + fi + # Put the nasty error message in config.log where it belongs +@@ -12674,13 +12682,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:12677: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:12685: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:12680: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:12688: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:12683: output\"" >&5) ++ (eval echo "\"\$as_me:12691: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -13874,7 +13882,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 13877 "configure"' > conftest.$ac_ext ++ echo '#line 13885 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -15243,11 +15251,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:15246: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15254: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15250: \$? = $ac_status" >&5 ++ echo "$as_me:15258: \$? = $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. +@@ -15582,11 +15590,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:15585: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15593: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15589: \$? = $ac_status" >&5 ++ echo "$as_me:15597: \$? = $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. +@@ -15687,11 +15695,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:15690: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15698: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15694: \$? = $ac_status" >&5 ++ echo "$as_me:15702: \$? = $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 +@@ -15742,11 +15750,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:15745: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15753: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15749: \$? = $ac_status" >&5 ++ echo "$as_me:15757: \$? = $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 +@@ -18998,8 +19006,9 @@ + # FIXME: we rely on the cache variable name because + # there is no other way. + set dummy $CC +-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then ++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` ++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o ++if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. +@@ -20770,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 + +@@ -21473,7 +21482,7 @@ + + + +-ac_config_files="$ac_config_files Makefile 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 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 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 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" + + + cat >confcache <<\_ACEOF +@@ -22498,7 +22507,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" ;; +@@ -23216,7 +23225,16 @@ + + + case $ac_file$ac_mode in +- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do ++ "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. +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-cd/access/Makefile.in gnome-media-2.26.0.new/gnome-cd/access/Makefile.in +--- gnome-media-2.26.0/gnome-cd/access/Makefile.in 2009-03-16 19:33:37.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-cd/access/Makefile.in 2009-03-17 19:27:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -321,8 +321,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -402,7 +402,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-cd/doc/Makefile.in gnome-media-2.26.0.new/gnome-cd/doc/Makefile.in +--- gnome-media-2.26.0/gnome-cd/doc/Makefile.in 2009-03-16 19:33:37.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-cd/doc/Makefile.in 2009-03-17 19:27:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -416,8 +416,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-cd/images/lcd/Makefile.in gnome-media-2.26.0.new/gnome-cd/images/lcd/Makefile.in +--- gnome-media-2.26.0/gnome-cd/images/lcd/Makefile.in 2009-03-16 19:33:37.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-cd/images/lcd/Makefile.in 2009-03-17 19:27:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -297,8 +297,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-cd/images/Makefile.in gnome-media-2.26.0.new/gnome-cd/images/Makefile.in +--- gnome-media-2.26.0/gnome-cd/images/Makefile.in 2009-03-16 19:33:37.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-cd/images/Makefile.in 2009-03-17 19:27:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -305,8 +305,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -429,7 +429,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-cd/images/media/Makefile.in gnome-media-2.26.0.new/gnome-cd/images/media/Makefile.in +--- gnome-media-2.26.0/gnome-cd/images/media/Makefile.in 2009-03-16 19:33:37.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-cd/images/media/Makefile.in 2009-03-17 19:27:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -297,8 +297,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-cd/images/None/Makefile.in gnome-media-2.26.0.new/gnome-cd/images/None/Makefile.in +--- gnome-media-2.26.0/gnome-cd/images/None/Makefile.in 2009-03-16 19:33:37.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-cd/images/None/Makefile.in 2009-03-17 19:27:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -297,8 +297,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-cd/images/red-lcd/Makefile.in gnome-media-2.26.0.new/gnome-cd/images/red-lcd/Makefile.in +--- gnome-media-2.26.0/gnome-cd/images/red-lcd/Makefile.in 2009-03-16 19:33:38.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-cd/images/red-lcd/Makefile.in 2009-03-17 19:27:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -297,8 +297,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-cd/Makefile.in gnome-media-2.26.0.new/gnome-cd/Makefile.in +--- gnome-media-2.26.0/gnome-cd/Makefile.in 2009-03-16 19:33:37.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-cd/Makefile.in 2009-03-17 19:27:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -432,8 +432,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -679,7 +679,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/16x16/apps/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/16x16/apps/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/16x16/apps/Makefile.in 2009-03-16 19:33:38.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/16x16/apps/Makefile.in 2009-03-17 19:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -296,8 +296,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/16x16/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/16x16/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/16x16/Makefile.in 2009-03-16 19:33:38.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/16x16/Makefile.in 2009-03-17 19:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -393,7 +393,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/16x16/status/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/16x16/status/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/16x16/status/Makefile.in 2009-03-16 19:33:38.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/16x16/status/Makefile.in 2009-03-17 19:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -299,8 +299,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/22x22/apps/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/22x22/apps/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/22x22/apps/Makefile.in 2009-03-16 19:33:38.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/22x22/apps/Makefile.in 2009-03-17 19:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -296,8 +296,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/22x22/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/22x22/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/22x22/Makefile.in 2009-03-16 19:33:38.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/22x22/Makefile.in 2009-03-17 19:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -393,7 +393,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/22x22/status/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/22x22/status/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/22x22/status/Makefile.in 2009-03-16 19:33:39.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/22x22/status/Makefile.in 2009-03-17 19:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -299,8 +299,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/24x24/apps/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/24x24/apps/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/24x24/apps/Makefile.in 2009-03-16 19:33:39.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/24x24/apps/Makefile.in 2009-03-17 19:27:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -296,8 +296,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/24x24/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/24x24/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/24x24/Makefile.in 2009-03-16 19:33:39.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/24x24/Makefile.in 2009-03-17 19:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -393,7 +393,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/24x24/status/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/24x24/status/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/24x24/status/Makefile.in 2009-03-16 19:33:39.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/24x24/status/Makefile.in 2009-03-17 19:27:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -299,8 +299,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/32x32/apps/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/32x32/apps/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/32x32/apps/Makefile.in 2009-03-16 19:33:39.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/32x32/apps/Makefile.in 2009-03-17 19:27:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -296,8 +296,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/32x32/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/32x32/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/32x32/Makefile.in 2009-03-16 19:33:39.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/32x32/Makefile.in 2009-03-17 19:27:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -393,7 +393,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/32x32/status/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/32x32/status/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/32x32/status/Makefile.in 2009-03-16 19:33:39.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/32x32/status/Makefile.in 2009-03-17 19:27:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -299,8 +299,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/48x48/apps/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/48x48/apps/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/48x48/apps/Makefile.in 2009-03-16 19:33:40.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/48x48/apps/Makefile.in 2009-03-17 19:27:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -296,8 +296,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/48x48/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/48x48/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/48x48/Makefile.in 2009-03-16 19:33:39.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/48x48/Makefile.in 2009-03-17 19:27:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -393,7 +393,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/Makefile.in 2009-03-16 19:33:40.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/Makefile.in 2009-03-17 19:27:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -296,8 +296,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -403,7 +403,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/scalable/apps/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/scalable/apps/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/scalable/apps/Makefile.in 2009-03-16 19:33:40.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/scalable/apps/Makefile.in 2009-03-17 19:27:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -296,8 +296,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/scalable/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/scalable/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/scalable/Makefile.in 2009-03-16 19:33:40.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/scalable/Makefile.in 2009-03-17 19:27:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -393,7 +393,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/icons/scalable/status/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/icons/scalable/status/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/icons/scalable/status/Makefile.in 2009-03-16 19:33:40.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/icons/scalable/status/Makefile.in 2009-03-17 19:27:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -299,8 +299,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/data/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/data/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/data/Makefile.in 2009-03-16 19:33:38.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/data/Makefile.in 2009-03-17 19:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -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)/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 \ +@@ -299,15 +299,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 = \ +@@ -321,8 +321,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -346,7 +346,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: +@@ -464,7 +464,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/Makefile.in 2009-03-16 19:33:38.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/Makefile.in 2009-03-17 19:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -300,8 +300,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -407,7 +407,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gnome-volume-control/src/Makefile.in gnome-media-2.26.0.new/gnome-volume-control/src/Makefile.in +--- gnome-media-2.26.0/gnome-volume-control/src/Makefile.in 2009-03-16 20:40:27.000000000 +0000 ++++ gnome-media-2.26.0.new/gnome-volume-control/src/Makefile.in 2009-03-17 19:27:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -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 = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) \ +- $(top_builddir)/sound-theme/libsoundtheme.la \ +- $(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 = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/sound-theme/libsoundtheme.la \ ++ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/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) +@@ -361,13 +362,13 @@ + applet-main.c \ + $(NULL) + +-gnome_volume_control_LDADD = \ ++gnome_volume_control_settings_LDADD = \ + $(VOLUME_CONTROL_LIBS) \ + $(PULSEAUDIO_LIBS) \ + $(top_builddir)/sound-theme/libsoundtheme.la \ + $(NULL) + +-gnome_volume_control_SOURCES = \ ++gnome_volume_control_settings_SOURCES = \ + gvc-mixer-stream.h \ + gvc-mixer-stream.c \ + gvc-channel-map.h \ +@@ -417,8 +418,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -470,12 +471,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) +@@ -533,7 +534,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/doc/Makefile.in gnome-media-2.26.0.new/grecord/doc/Makefile.in +--- gnome-media-2.26.0/grecord/doc/Makefile.in 2009-03-16 19:33:40.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/doc/Makefile.in 2009-03-17 19:27:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -404,8 +404,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/icons/16x16/Makefile.in gnome-media-2.26.0.new/grecord/icons/16x16/Makefile.in +--- gnome-media-2.26.0/grecord/icons/16x16/Makefile.in 2009-03-16 19:33:41.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/icons/16x16/Makefile.in 2009-03-17 19:27:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/icons/22x22/Makefile.in gnome-media-2.26.0.new/grecord/icons/22x22/Makefile.in +--- gnome-media-2.26.0/grecord/icons/22x22/Makefile.in 2009-03-16 19:33:41.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/icons/22x22/Makefile.in 2009-03-17 19:27:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/icons/24x24/Makefile.in gnome-media-2.26.0.new/grecord/icons/24x24/Makefile.in +--- gnome-media-2.26.0/grecord/icons/24x24/Makefile.in 2009-03-16 19:33:41.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/icons/24x24/Makefile.in 2009-03-17 19:27:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/icons/32x32/Makefile.in gnome-media-2.26.0.new/grecord/icons/32x32/Makefile.in +--- gnome-media-2.26.0/grecord/icons/32x32/Makefile.in 2009-03-16 19:33:41.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/icons/32x32/Makefile.in 2009-03-17 19:27:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/icons/48x48/Makefile.in gnome-media-2.26.0.new/grecord/icons/48x48/Makefile.in +--- gnome-media-2.26.0/grecord/icons/48x48/Makefile.in 2009-03-16 19:33:41.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/icons/48x48/Makefile.in 2009-03-17 19:27:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/icons/Makefile.in gnome-media-2.26.0.new/grecord/icons/Makefile.in +--- gnome-media-2.26.0/grecord/icons/Makefile.in 2009-03-16 19:33:41.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/icons/Makefile.in 2009-03-17 19:27:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -288,8 +288,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -395,7 +395,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/icons/scalable/Makefile.in gnome-media-2.26.0.new/grecord/icons/scalable/Makefile.in +--- gnome-media-2.26.0/grecord/icons/scalable/Makefile.in 2009-03-16 19:33:41.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/icons/scalable/Makefile.in 2009-03-17 19:27:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/Makefile.in gnome-media-2.26.0.new/grecord/Makefile.in +--- gnome-media-2.26.0/grecord/Makefile.in 2009-03-16 19:33:40.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/Makefile.in 2009-03-17 19:27:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -314,8 +314,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -459,7 +459,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/grecord/src/Makefile.in gnome-media-2.26.0.new/grecord/src/Makefile.in +--- gnome-media-2.26.0/grecord/src/Makefile.in 2009-03-16 19:33:41.000000000 +0000 ++++ gnome-media-2.26.0.new/grecord/src/Makefile.in 2009-03-17 19:27:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -329,8 +329,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -444,7 +444,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/doc/Makefile.in gnome-media-2.26.0.new/gst-mixer/doc/Makefile.in +--- gnome-media-2.26.0/gst-mixer/doc/Makefile.in 2009-03-16 19:33:42.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/doc/Makefile.in 2009-03-17 19:27:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -404,8 +404,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/icons/16x16/devices/Makefile.in gnome-media-2.26.0.new/gst-mixer/icons/16x16/devices/Makefile.in +--- gnome-media-2.26.0/gst-mixer/icons/16x16/devices/Makefile.in 2009-03-16 19:33:42.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/icons/16x16/devices/Makefile.in 2009-03-17 19:27:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -298,8 +298,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/icons/16x16/Makefile.in gnome-media-2.26.0.new/gst-mixer/icons/16x16/Makefile.in +--- gnome-media-2.26.0/gst-mixer/icons/16x16/Makefile.in 2009-03-16 19:33:42.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/icons/16x16/Makefile.in 2009-03-17 19:27:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -286,8 +286,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -393,7 +393,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/icons/16x16/status/Makefile.in gnome-media-2.26.0.new/gst-mixer/icons/16x16/status/Makefile.in +--- gnome-media-2.26.0/gst-mixer/icons/16x16/status/Makefile.in 2009-03-16 19:33:42.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/icons/16x16/status/Makefile.in 2009-03-17 19:27:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -295,8 +295,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/icons/Makefile.in gnome-media-2.26.0.new/gst-mixer/icons/Makefile.in +--- gnome-media-2.26.0/gst-mixer/icons/Makefile.in 2009-03-16 19:33:42.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/icons/Makefile.in 2009-03-17 19:27:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -287,8 +287,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -394,7 +394,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/Makefile.in gnome-media-2.26.0.new/gst-mixer/Makefile.in +--- gnome-media-2.26.0/gst-mixer/Makefile.in 2009-03-16 19:33:42.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/Makefile.in 2009-03-17 19:27:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -308,8 +308,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -451,7 +451,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/pixmaps/Makefile.in gnome-media-2.26.0.new/gst-mixer/pixmaps/Makefile.in +--- gnome-media-2.26.0/gst-mixer/pixmaps/Makefile.in 2009-03-16 19:33:42.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/pixmaps/Makefile.in 2009-03-17 19:27:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -289,8 +289,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gst-mixer/src/Makefile.in gnome-media-2.26.0.new/gst-mixer/src/Makefile.in +--- gnome-media-2.26.0/gst-mixer/src/Makefile.in 2009-03-16 19:33:42.000000000 +0000 ++++ gnome-media-2.26.0.new/gst-mixer/src/Makefile.in 2009-03-17 19:27:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -338,8 +338,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -442,7 +442,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gstreamer-properties/help/Makefile.in gnome-media-2.26.0.new/gstreamer-properties/help/Makefile.in +--- gnome-media-2.26.0/gstreamer-properties/help/Makefile.in 2009-03-16 19:33:43.000000000 +0000 ++++ gnome-media-2.26.0.new/gstreamer-properties/help/Makefile.in 2009-03-17 19:27:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -404,8 +404,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/gstreamer-properties/Makefile.in gnome-media-2.26.0.new/gstreamer-properties/Makefile.in +--- gnome-media-2.26.0/gstreamer-properties/Makefile.in 2009-03-16 19:33:43.000000000 +0000 ++++ gnome-media-2.26.0.new/gstreamer-properties/Makefile.in 2009-03-17 19:27:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -352,8 +352,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -591,7 +591,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/INSTALL gnome-media-2.26.0.new/INSTALL +--- gnome-media-2.26.0/INSTALL 2009-03-16 19:33:44.000000000 +0000 ++++ gnome-media-2.26.0.new/INSTALL 2009-03-17 19:27:58.000000000 +0000 +@@ -2,15 +2,15 @@ + ************************* + + Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +-2006, 2007 Free Software Foundation, Inc. ++2006, 2007, 2008 Free Software Foundation, Inc. + +-This file is free documentation; the Free Software Foundation gives ++ This file is free documentation; the Free Software Foundation gives + unlimited permission to copy, distribute and modify it. + + Basic Installation + ================== + +-Briefly, the shell commands `./configure; make; make install' should ++ Briefly, the shell commands `./configure; make; make install' should + configure, build, and install this package. The following + more-detailed instructions are generic; see the `README' file for + instructions specific to this package. +@@ -73,9 +73,9 @@ + Compilers and Options + ===================== + +-Some systems require unusual options for compilation or linking that the +-`configure' script does not know about. Run `./configure --help' for +-details on some of the pertinent environment variables. ++ Some systems require unusual options for compilation or linking that ++the `configure' script does not know about. Run `./configure --help' ++for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters + by setting variables in the command line or in the environment. Here +@@ -88,7 +88,7 @@ + Compiling For Multiple Architectures + ==================================== + +-You can compile the package for more than one kind of computer at the ++ You can compile the package for more than one kind of computer at the + same time, by placing the object files for each architecture in their + own directory. To do this, you can use GNU `make'. `cd' to the + directory where you want the object files and executables to go and run +@@ -100,10 +100,24 @@ + installed the package for one architecture, use `make distclean' before + reconfiguring for another architecture. + ++ On MacOS X 10.5 and later systems, you can create libraries and ++executables that work on multiple system types--known as "fat" or ++"universal" binaries--by specifying multiple `-arch' options to the ++compiler but only a single `-arch' option to the preprocessor. Like ++this: ++ ++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CPP="gcc -E" CXXCPP="g++ -E" ++ ++ This is not guaranteed to produce working output in all cases, you ++may have to build one architecture at a time and combine the results ++using the `lipo' tool if you have problems. ++ + Installation Names + ================== + +-By default, `make install' installs the package's commands under ++ By default, `make install' installs the package's commands under + `/usr/local/bin', include files under `/usr/local/include', etc. You + can specify an installation prefix other than `/usr/local' by giving + `configure' the option `--prefix=PREFIX'. +@@ -126,7 +140,7 @@ + Optional Features + ================= + +-Some packages pay attention to `--enable-FEATURE' options to ++ Some packages pay attention to `--enable-FEATURE' options to + `configure', where FEATURE indicates an optional part of the package. + They may also pay attention to `--with-PACKAGE' options, where PACKAGE + is something like `gnu-as' or `x' (for the X Window System). The +@@ -138,14 +152,36 @@ + you can use the `configure' options `--x-includes=DIR' and + `--x-libraries=DIR' to specify their locations. + ++Particular systems ++================== ++ ++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU ++CC is not installed, it is recommended to use the following options in ++order to use an ANSI C compiler: ++ ++ ./configure CC="cc -Ae" ++ ++and if that doesn't work, install pre-built binaries of GCC for HP-UX. ++ ++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot ++parse its `' header file. The option `-nodtk' can be used as ++a workaround. If GNU CC is not installed, it is therefore recommended ++to try ++ ++ ./configure CC="cc" ++ ++and if that doesn't work, try ++ ++ ./configure CC="cc -nodtk" ++ + Specifying the System Type + ========================== + +-There may be some features `configure' cannot figure out automatically, +-but needs to determine by the type of machine the package will run on. +-Usually, assuming the package is built to be run on the _same_ +-architectures, `configure' can figure that out, but if it prints a +-message saying it cannot guess the machine type, give it the ++ There may be some features `configure' cannot figure out ++automatically, but needs to determine by the type of machine the package ++will run on. Usually, assuming the package is built to be run on the ++_same_ architectures, `configure' can figure that out, but if it prints ++a message saying it cannot guess the machine type, give it the + `--build=TYPE' option. TYPE can either be a short name for the system + type, such as `sun4', or a canonical name which has the form: + +@@ -171,9 +207,9 @@ + Sharing Defaults + ================ + +-If you want to set default values for `configure' scripts to share, you +-can create a site shell script called `config.site' that gives default +-values for variables like `CC', `cache_file', and `prefix'. ++ If you want to set default values for `configure' scripts to share, ++you can create a site shell script called `config.site' that gives ++default values for variables like `CC', `cache_file', and `prefix'. + `configure' looks for `PREFIX/share/config.site' if it exists, then + `PREFIX/etc/config.site' if it exists. Or, you can set the + `CONFIG_SITE' environment variable to the location of the site script. +@@ -182,7 +218,7 @@ + Defining Variables + ================== + +-Variables not defined in a site shell script can be set in the ++ Variables not defined in a site shell script can be set in the + environment passed to `configure'. However, some packages may run + configure again during the build, and the customized values of these + variables may be lost. In order to avoid this problem, you should set +@@ -201,11 +237,19 @@ + `configure' Invocation + ====================== + +-`configure' recognizes the following options to control how it operates. ++ `configure' recognizes the following options to control how it ++operates. + + `--help' + `-h' +- Print a summary of the options to `configure', and exit. ++ Print a summary of all of the options to `configure', and exit. ++ ++`--help=short' ++`--help=recursive' ++ Print a summary of the options unique to this package's ++ `configure', and exit. The `short' variant lists options used ++ only in the top level, while the `recursive' variant lists options ++ also present in any nested packages. + + `--version' + `-V' +@@ -232,6 +276,16 @@ + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + ++`--prefix=DIR' ++ Use DIR as the installation prefix. *Note Installation Names:: ++ for more details, including other options available for fine-tuning ++ the installation locations. ++ ++`--no-create' ++`-n' ++ Run the configure checks, but stop before creating any output ++ files. ++ + `configure' also accepts some other, not widely useful, options. Run + `configure --help' for more details. + +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/ltmain.sh gnome-media-2.26.0.new/ltmain.sh +--- gnome-media-2.26.0/ltmain.sh 2009-03-16 19:33:25.000000000 +0000 ++++ gnome-media-2.26.0.new/ltmain.sh 2009-03-17 19:27:42.000000000 +0000 +@@ -65,7 +65,7 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1 ++# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1 + # automake: $automake_version + # autoconf: $autoconf_version + # +@@ -73,7 +73,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="2.2.6 Debian-2.2.6a-1" ++VERSION="2.2.6 Debian-2.2.6a-1ubuntu1" + TIMESTAMP="" + package_revision=1.3012 + +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/Makefile.in gnome-media-2.26.0.new/Makefile.in +--- gnome-media-2.26.0/Makefile.in 2009-03-16 20:34:36.000000000 +0000 ++++ gnome-media-2.26.0.new/Makefile.in 2009-03-17 19:27:58.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -418,7 +418,7 @@ + -rm -rf .libs _libs + + distclean-libtool: +- -rm -f libtool ++ -rm -f libtool config.lt + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -495,7 +495,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/profiles/glade/Makefile.in gnome-media-2.26.0.new/profiles/glade/Makefile.in +--- gnome-media-2.26.0/profiles/glade/Makefile.in 2009-03-16 19:33:43.000000000 +0000 ++++ gnome-media-2.26.0.new/profiles/glade/Makefile.in 2009-03-17 19:27:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -319,8 +319,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -421,7 +421,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/profiles/Makefile.in gnome-media-2.26.0.new/profiles/Makefile.in +--- gnome-media-2.26.0/profiles/Makefile.in 2009-03-16 19:33:43.000000000 +0000 ++++ gnome-media-2.26.0.new/profiles/Makefile.in 2009-03-17 19:27:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -420,8 +420,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -775,7 +775,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/sound-theme/Makefile.in gnome-media-2.26.0.new/sound-theme/Makefile.in +--- gnome-media-2.26.0/sound-theme/Makefile.in 2009-03-16 19:33:43.000000000 +0000 ++++ gnome-media-2.26.0.new/sound-theme/Makefile.in 2009-03-17 19:27:58.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -341,8 +341,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -489,7 +489,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/sound-theme/sounds/Makefile.in gnome-media-2.26.0.new/sound-theme/sounds/Makefile.in +--- gnome-media-2.26.0/sound-theme/sounds/Makefile.in 2009-03-16 19:33:43.000000000 +0000 ++++ gnome-media-2.26.0.new/sound-theme/sounds/Makefile.in 2009-03-17 19:27:58.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -302,8 +302,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +diff -Nur -x '*.orig' -x '*~' gnome-media-2.26.0/vu-meter/Makefile.in gnome-media-2.26.0.new/vu-meter/Makefile.in +--- gnome-media-2.26.0/vu-meter/Makefile.in 2009-03-16 19:33:44.000000000 +0000 ++++ gnome-media-2.26.0.new/vu-meter/Makefile.in 2009-03-17 19:27:58.000000000 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -336,8 +336,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -473,7 +473,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS