[gnome-sound-recorder] rename the desktop file

[Meg Ford (Margaret) <megford src gnome org>]

commit bed0a9738f1bcd1c136062aa957718a4cddb1c27
Author: Meg Ford <meg387 gmail com>
Date:   Mon Sep 23 10:58:08 2013 -0500

    rename the desktop file

 ...in.in => org.gnome.SoundRecorder.desktop.in.in} |    4 ++--
 po/POTFILES.in                                     |    7 +++++++
 po/POTFILES.skip                                   |    2 +-
 src/Makefile.am                                    |    3 +--
 4 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/data/gnome-sound-recorder.desktop.in.in b/data/org.gnome.SoundRecorder.desktop.in.in
similarity index 57%
rename from data/gnome-sound-recorder.desktop.in.in
rename to data/org.gnome.SoundRecorder.desktop.in.in
index ba92a4a..6d4debf 100644
--- a/data/gnome-sound-recorder.desktop.in.in
+++ b/data/org.gnome.SoundRecorder.desktop.in.in
@@ -5,6 +5,6 @@ _Comment=Record sound via the microphone and play it back
 Icon=face-smile
 Categories=GNOME;GTK;
 _Keywords=Audio;Application;Record;
-Exec= pkgdatadir@/@PACKAGE_NAME@
-DBusActivatable=false
+Exec= GJS@ -c 'imports.package.start({ name: "@PACKAGE_NAME@", version: "@PACKAGE_VERSION@", prefix: 
"@prefix@" })'
+StartupNotify=true
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 172e5a0..e258a99 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,12 @@
+<<<<<<< HEAD
 data/gnome-sound-recorder.desktop.in.in
 data/org.gnome.gnome-sound-recorder.gschema.xml
+=======
+data/org.gnome.SoundRecorder.desktop.in.in
+src/main.js
+src/util.js
+src/mainWindow.js
+>>>>>>> rename the desktop file
 src/audioProfile.js
 src/fileUtil.js
 src/info.js
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8556ddf..3e341ab 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1 @@
-data/gnome-sound-recorder.desktop.in
+data/org.gnome.SoundRecorder.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index a1c5c3f..6e6a145 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,6 @@ $(PACKAGE_NAME): $(PACKAGE_NAME).in
        @chmod +x $@
 
 EXTRA_DIST = gnome-sound-recorder.in 
-    
-CLEANFILES =  gnome-sound-recorder.in 
+DISTCLEANFILES = gnome-sound-recorder
 
 -include $(top_srcdir)/git.mk