? cddb-slave2/cddb-slave.desktop.in.in
? gnome-cd/gnome-cd.desktop.in.in
? grecord/gnome-sound-recorder.desktop.in.in
? gst-mixer/gnome-volume-control.desktop.in.in
? gstreamer-properties/gstreamer-properties.desktop.in.in
? vu-meter/reclevel.desktop.in.in
? vu-meter/vumeter.desktop.in.in
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-media/Makefile.am,v
retrieving revision 1.57
diff -u -r1.57 Makefile.am
--- Makefile.am	25 Aug 2006 12:23:03 -0000	1.57
+++ Makefile.am	3 Sep 2006 20:20:36 -0000
@@ -16,7 +16,7 @@
         intltool-merge \
         intltool-update
 
-EXTRA_DIST =	config.rpath gnome-media.spec.in configure \
+EXTRA_DIST =	gnome-media.spec.in configure \
 		acinclude.m4 COPYING-DOCS MAINTAINERS \
 		gnome-media.spec \
 		xmldocs.make omf.make \
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-media/configure.in,v
retrieving revision 1.322
diff -u -r1.322 configure.in
--- configure.in	25 Aug 2006 12:34:20 -0000	1.322
+++ configure.in	3 Sep 2006 20:20:37 -0000
@@ -1,7 +1,7 @@
 AC_PREREQ(2.53)
 AC_INIT(cddb-slave2)
 
-AS_VERSION(gnome-media, GNOME_MEDIA_VERSION, 2, 14, 2, 1,
+AS_VERSION(gnome-media, GNOME_MEDIA_VERSION, 2, 16, 0, 0,
   GM_RELEASE="yes", GM_RELEASE="no")
 
 AM_MAINTAINER_MODE
@@ -517,6 +517,13 @@
 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
 ])
 
 echo ""
Index: cddb-slave2/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-media/cddb-slave2/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- cddb-slave2/Makefile.am	25 Aug 2006 12:23:04 -0000	1.33
+++ cddb-slave2/Makefile.am	3 Sep 2006 20:20:37 -0000
@@ -144,8 +144,8 @@
 
 ### desktop files
 desktopdir = $(datadir)/applications
-Desktop_in_files = cddb-slave.desktop.in
-desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+Desktop_in_files = cddb-slave.desktop.in.in
+desktop_DATA = $(Desktop_in_files:.desktop.in.in=.desktop)
 
 ### pack up all of the extra files in the tarball
 EXTRA_DIST =						\
@@ -160,4 +160,4 @@
 	$(server_in_files:.server.in.in=.server.in)	\
 	$(server_in_files:.server.in.in=.server)	\
 	$(schema_DATA)
-
+DISTCLEANFILES = $(Desktop_in_files:.desktop.in.in=.desktop.in)
Index: cddb-slave2/cddb-slave.desktop.in
===================================================================
RCS file: /cvs/gnome/gnome-media/cddb-slave2/cddb-slave.desktop.in,v
retrieving revision 1.8
diff -u -r1.8 cddb-slave.desktop.in
--- cddb-slave2/cddb-slave.desktop.in	21 Jan 2006 20:22:50 -0000	1.8
+++ cddb-slave2/cddb-slave.desktop.in	3 Sep 2006 20:20:37 -0000
@@ -12,3 +12,4 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-media
 X-GNOME-Bugzilla-Component=CDDBSlave2
+X-GNOME-Bugzilla-Version=2.16.0
Index: gnome-cd/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-media/gnome-cd/Makefile.am,v
retrieving revision 1.36
diff -u -r1.36 Makefile.am
--- gnome-cd/Makefile.am	25 Aug 2006 12:32:09 -0000	1.36
+++ gnome-cd/Makefile.am	3 Sep 2006 20:20:37 -0000
@@ -32,7 +32,7 @@
 	linux-cdrom.h		\
 	gst-cdrom.c	  	\
 	gst-cdrom.h		\
-	gnome-cd.png gnome-cd.desktop.in gnome-cd.schemas.in
+	gnome-cd.png gnome-cd.desktop.in.in gnome-cd.schemas.in
 
 ### intermediate libtool library generated from IDL source
 IDLS = $(top_srcdir)/cddb-slave2/GNOME_Media_CDDBSlave2.idl
@@ -99,8 +99,8 @@
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 
-Audio_in_files = gnome-cd.desktop.in
-Audio_DATA = $(Audio_in_files:.desktop.in=.desktop)
+Audio_in_files = gnome-cd.desktop.in.in
+Audio_DATA = $(Audio_in_files:.desktop.in.in=.desktop)
 Pixmap_DATA = gnome-cd.png
 
 schemadir=$(GCONF_SCHEMA_FILE_DIR)
@@ -116,5 +116,6 @@
 endif
 
 CLEANFILES = $(Audio_DATA) $(schema_DATA) $(IDL_GENERATED)
+DISTCLEANFILES = $(Audio_in_files:.desktop.in.in=.desktop.in)
 
 CDROM_HOST = gst-cdparanoia
Index: gnome-cd/gnome-cd.desktop.in
===================================================================
RCS file: /cvs/gnome/gnome-media/gnome-cd/gnome-cd.desktop.in,v
retrieving revision 1.13
diff -u -r1.13 gnome-cd.desktop.in
--- gnome-cd/gnome-cd.desktop.in	8 Jun 2006 22:27:52 -0000	1.13
+++ gnome-cd/gnome-cd.desktop.in	3 Sep 2006 20:20:37 -0000
@@ -12,3 +12,4 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-media
 X-GNOME-Bugzilla-Component=Gnome-CD
+X-GNOME-Bugzilla-Version=2.16.0
Index: grecord/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-media/grecord/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- grecord/Makefile.am	3 Sep 2005 22:15:49 -0000	1.24
+++ grecord/Makefile.am	3 Sep 2006 20:20:37 -0000
@@ -2,7 +2,7 @@
 
 EXTRA_DIST = \
 	README COPYING AUTHORS INSTALL \
-	gnome-sound-recorder.desktop.in \
+	gnome-sound-recorder.desktop.in.in \
 	pixmaps/gnome_mixer.xpm \
 	gnome-sound-recorder.schemas.in \
 	gnome-grecord.png
@@ -11,8 +11,8 @@
 @INTLTOOL_SCHEMAS_RULE@
 
 Applicationsdir = $(datadir)/applications
-Applications_in_files = gnome-sound-recorder.desktop.in 
-Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
+Applications_in_files = gnome-sound-recorder.desktop.in.in
+Applications_DATA = $(Applications_in_files:.desktop.in.in=.desktop)
 
 schemadir=$(GCONF_SCHEMA_FILE_DIR)
 schema_DATA=gnome-sound-recorder.schemas
@@ -21,6 +21,7 @@
 pixmap_DATA = gnome-grecord.png
 
 CLEANFILES=$(Applications_DATA) $(schema_DATA)
+DISTCLEANFILES=$(Applications_in_files:.desktop.in.in=.desktop.in)
 install-schemas:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) || true
 
@@ -29,4 +30,3 @@
 else
 install-data-local:
 endif
-
Index: grecord/gnome-sound-recorder.desktop.in
===================================================================
RCS file: /cvs/gnome/gnome-media/grecord/gnome-sound-recorder.desktop.in,v
retrieving revision 1.9
diff -u -r1.9 gnome-sound-recorder.desktop.in
--- grecord/gnome-sound-recorder.desktop.in	29 May 2006 15:29:05 -0000	1.9
+++ grecord/gnome-sound-recorder.desktop.in	3 Sep 2006 20:20:37 -0000
@@ -12,3 +12,4 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-media
 X-GNOME-Bugzilla-Component=Gnome-Sound-Recorder
+X-GNOME-Bugzilla-Version=2.16.0
Index: gst-mixer/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-media/gst-mixer/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- gst-mixer/Makefile.am	28 Mar 2005 13:13:39 -0000	1.4
+++ gst-mixer/Makefile.am	3 Sep 2006 20:20:37 -0000
@@ -7,8 +7,8 @@
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 
-Desktop_in_files = gnome-volume-control.desktop.in
-Desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+Desktop_in_files = gnome-volume-control.desktop.in.in
+Desktop_DATA = $(Desktop_in_files:.desktop.in.in=.desktop)
 schemadir=$(GCONF_SCHEMA_FILE_DIR)
 schema_DATA=gnome-volume-control.schemas
 
@@ -22,3 +22,4 @@
 endif
 
 CLEANFILES = $(Desktop_DATA) $(schema_DATA)
+DISTCLEANFILES = $(Desktop_in_files:.desktop.in.in=.desktop.in)
Index: gst-mixer/gnome-volume-control.desktop.in
===================================================================
RCS file: /cvs/gnome/gnome-media/gst-mixer/gnome-volume-control.desktop.in,v
retrieving revision 1.5
diff -u -r1.5 gnome-volume-control.desktop.in
--- gst-mixer/gnome-volume-control.desktop.in	21 Jan 2006 20:22:51 -0000	1.5
+++ gst-mixer/gnome-volume-control.desktop.in	3 Sep 2006 20:20:37 -0000
@@ -13,3 +13,4 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-media
 X-GNOME-Bugzilla-Component=gnome-volume-control
+X-GNOME-Bugzilla-Version=2.16.0
Index: gstreamer-properties/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-media/gstreamer-properties/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- gstreamer-properties/Makefile.am	2 May 2006 15:56:02 -0000	1.12
+++ gstreamer-properties/Makefile.am	3 Sep 2006 20:20:37 -0000
@@ -19,8 +19,8 @@
 glade_DATA = gstreamer-properties.glade 
 
 desktopdir = $(datadir)/applications
-Desktop_in_files = gstreamer-properties.desktop.in
-desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+Desktop_in_files = gstreamer-properties.desktop.in.in
+desktop_DATA = $(Desktop_in_files:.desktop.in.in=.desktop)
 
 INCLUDES   = \
 	$(GSTPROPS_CFLAGS) \
@@ -31,4 +31,5 @@
 	-DG_LOG_DOMAIN="\"gstreamer-properties\""
 
 CLEANFILES = $(GSTPROPS_CLEANFILES) $(desktop_DATA)
+DISTCLEANFILES = $(Desktop_in_files:.desktop.in.in=.desktop.in)
 EXTRA_DIST = $(icons_DATA) $(glade_DATA) $(Desktop_in_files)
Index: gstreamer-properties/gstreamer-properties.desktop.in
===================================================================
RCS file: /cvs/gnome/gnome-media/gstreamer-properties/gstreamer-properties.desktop.in,v
retrieving revision 1.8
diff -u -r1.8 gstreamer-properties.desktop.in
--- gstreamer-properties/gstreamer-properties.desktop.in	21 Jan 2006 20:22:52 -0000	1.8
+++ gstreamer-properties/gstreamer-properties.desktop.in	3 Sep 2006 20:20:37 -0000
@@ -11,5 +11,5 @@
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-media
-X-GNOME-Bugzilla-Component=general
-
+X-GNOME-Bugzilla-Component=gstreamer-properties
+X-GNOME-Bugzilla-Version=2.16.0
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/gnome-media/po/POTFILES.in,v
retrieving revision 1.64
diff -u -r1.64 POTFILES.in
--- po/POTFILES.in	27 Aug 2006 07:52:32 -0000	1.64
+++ po/POTFILES.in	3 Sep 2006 20:20:37 -0000
@@ -5,22 +5,22 @@
 cddb-slave2/GNOME_Media_CDDBSlave2.server.in.in
 cddb-slave2/cddb-slave-capplet.c
 cddb-slave2/cddb-slave.c
-cddb-slave2/cddb-slave.desktop.in
+cddb-slave2/cddb-slave.desktop.in.in
 cddb-slave2/cddb-track-editor.c
 gnome-cd/access/cddisplayaccessible.c
 gnome-cd/callbacks.c
 gnome-cd/cdrom.c
 gnome-cd/display.c
 gnome-cd/gnome-cd.c
-gnome-cd/gnome-cd.desktop.in
+gnome-cd/gnome-cd.desktop.in.in
 gnome-cd/gnome-cd.schemas.in.in
 gnome-cd/gst-cdrom.c
 gnome-cd/preferences.c
-grecord/gnome-sound-recorder.desktop.in
+grecord/gnome-sound-recorder.desktop.in.in
 grecord/gnome-sound-recorder.schemas.in.in
 grecord/src/gnome-recorder.c
 grecord/src/gsr-window.c
-gst-mixer/gnome-volume-control.desktop.in
+gst-mixer/gnome-volume-control.desktop.in.in
 gst-mixer/gnome-volume-control.schemas.in
 gst-mixer/src/element.c
 gst-mixer/src/main.c
@@ -29,7 +29,7 @@
 gst-mixer/src/volume.c
 gst-mixer/src/window.c
 gstreamer-properties/gstreamer-properties.c
-gstreamer-properties/gstreamer-properties.desktop.in
+gstreamer-properties/gstreamer-properties.desktop.in.in
 gstreamer-properties/gstreamer-properties.glade
 gstreamer-properties/pipeline-constants.c
 gstreamer-properties/pipeline-tests.c
@@ -40,5 +40,5 @@
 profiles/gnome-audio-profiles.glade2
 profiles/gnome-audio-profiles.schemas.in.in
 vu-meter/main.c
-vu-meter/reclevel.desktop.in
-vu-meter/vumeter.desktop.in
+vu-meter/reclevel.desktop.in.in
+vu-meter/vumeter.desktop.in.in
Index: vu-meter/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-media/vu-meter/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- vu-meter/Makefile.am	31 Dec 2003 02:59:36 -0000	1.18
+++ vu-meter/Makefile.am	3 Sep 2006 20:20:37 -0000
@@ -23,10 +23,11 @@
 
 pixmap_DATA = $(BITMAPS)
 
-EXTRA_DIST = $(BITMAPS) vumeter.desktop.in reclevel.desktop.in README TODO
+EXTRA_DIST = $(BITMAPS) vumeter.desktop.in reclevel.desktop.in.in README TODO
 
 @INTLTOOL_DESKTOP_RULE@
-Audio_in_files = vumeter.desktop.in reclevel.desktop.in
-Audio_DATA = $(Audio_in_files:.desktop.in=.desktop)
+Audio_in_files = vumeter.desktop.in reclevel.desktop.in.in
+Audio_DATA = $(Audio_in_files:.desktop.in.in=.desktop)
 
 CLEANFILES = $(Audio_DATA)
+DISTCLEANFILES = $(Audio_in_files:.desktop.in.in:.desktop.in)
Index: vu-meter/vumeter.desktop.in
===================================================================
RCS file: /cvs/gnome/gnome-media/vu-meter/vumeter.desktop.in,v
retrieving revision 1.9
diff -u -r1.9 vumeter.desktop.in
--- vu-meter/vumeter.desktop.in	21 Jan 2006 20:22:52 -0000	1.9
+++ vu-meter/vumeter.desktop.in	3 Sep 2006 20:20:37 -0000
@@ -11,4 +11,4 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-media
 X-GNOME-Bugzilla-Component=VU-meter
-
+X-GNOME-Bugzilla-Version=2.16.0
--- /dev/null	2006-05-30 21:15:07.000000000 -0400
+++ ./cddb-slave2/cddb-slave.desktop.in.in	2006-09-03 15:56:53.000000000 -0400
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=CD Database Server
+_Comment=Modify your CD database server preferences
+Exec=cddb-slave2-properties
+Icon=gnome-cd.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Application;Settings;AdvancedSettings;
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-media
+X-GNOME-Bugzilla-Component=CDDBSlave2
+X-GNOME-Bugzilla-Version=@VERSION@
--- /dev/null	2006-05-30 21:15:07.000000000 -0400
+++ ./gnome-cd/gnome-cd.desktop.in.in	2006-09-03 15:56:58.000000000 -0400
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=CD Player
+_Comment=Play audio CDs
+Exec=gnome-cd
+Icon=gnome-cd.png
+StartupNotify=true
+Terminal=false
+Type=Application
+X-GNOME-DocPath=gnome-cd/gnome-cd.xml
+Categories=GNOME;GTK;AudioVideo;Audio;Player;X-Ximian-Main;X-Red-Hat-Base;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-media
+X-GNOME-Bugzilla-Component=Gnome-CD
+X-GNOME-Bugzilla-Version=@VERSION@
--- /dev/null	2006-05-30 21:15:07.000000000 -0400
+++ ./grecord/gnome-sound-recorder.desktop.in.in	2006-09-03 15:57:02.000000000 -0400
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Sound Recorder
+_Comment=Record sound clips
+Exec=gnome-sound-recorder
+Icon=gnome-grecord.png
+StartupNotify=true
+Terminal=false
+Type=Application
+X-GNOME-DocPath=grecord/grecord.xml
+Categories=GNOME;GTK;AudioVideo;Recorder;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-media
+X-GNOME-Bugzilla-Component=Gnome-Sound-Recorder
+X-GNOME-Bugzilla-Version=@VERSION@
--- /dev/null	2006-05-30 21:15:07.000000000 -0400
+++ ./gst-mixer/gnome-volume-control.desktop.in.in	2006-09-03 15:57:08.000000000 -0400
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Volume Control
+_Comment=Adjust the volume level
+Exec=gnome-volume-control
+Icon=gnome-mixer.png
+StartupNotify=true
+X-Info=Gnome Mixer
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Application;AudioVideo;X-Ximian-Main;X-Red-Hat-Base;
+X-GNOME-DocPath=gst-mixer/gnome-volume-control.xml
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-media
+X-GNOME-Bugzilla-Component=gnome-volume-control
+X-GNOME-Bugzilla-Version=@VERSION@
--- /dev/null	2006-05-30 21:15:07.000000000 -0400
+++ ./gstreamer-properties/gstreamer-properties.desktop.in.in	2006-09-03 15:57:14.000000000 -0400
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Multimedia Systems Selector
+_Comment=Configure defaults for GStreamer applications
+Exec=gstreamer-properties
+Icon=gstreamer-properties.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Application;Settings;AdvancedSettings;
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-media
+X-GNOME-Bugzilla-Component=gstreamer-properties
+X-GNOME-Bugzilla-Version=@VERSION@
--- /dev/null	2006-05-30 21:15:07.000000000 -0400
+++ ./vu-meter/reclevel.desktop.in.in	2006-09-03 15:56:25.000000000 -0400
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Recording Level Monitor
+_Comment=Monitor the recording input volume
+Exec=vumeter -r
+Icon=gnome-reclevel.png
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Application;AudioVideo;
--- /dev/null	2006-05-30 21:15:07.000000000 -0400
+++ ./vu-meter/vumeter.desktop.in.in	2006-09-03 15:57:22.000000000 -0400
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Volume Monitor
+_Comment=Monitor the sound output volume
+Exec=vumeter
+Icon=gnome-vumeter.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Application;AudioVideo;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-media
+X-GNOME-Bugzilla-Component=VU-meter
+X-GNOME-Bugzilla-Version=@VERSION@
