[gnome-music/wip/merge: 66/343] Make changes to gquintard work

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 626c0fa1e1a763c9c484a29f5a2245570b0dee36
Author: Manish Sinha <manishsinha ubuntu com>
Date:   Sun Jul 14 13:26:58 2013 -0700

    Make changes to gquintard work

 Makefile.am                                 |    4 ++++
 configure.ac                                |    2 +-
 gnomemusic/gnome-music.in => gnome-music.in |    4 ++--
 gnomemusic/Makefile.am                      |    3 ---
 gnomemusic/__init__.py                      |    6 ------
 5 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eb0fc3b..f0fa85f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,17 @@
 ACLOCAL_AMFLAGS = -I m4 -I libgd
 NULL =
 
+bin_SCRIPTS = gnome-music
+
 SUBDIRS = libgd gnomemusic data po
 
 EXTRA_DIST = \
        AUTHORS.in \
+       gnome-music.in
        $(NULL)
 
 CLEANFILES = \
+       $(bin_SCRIPTS)
        $(NULL)
 
 MAINTAINERCLEANFILES = \
diff --git a/configure.ac b/configure.ac
index 8143286..ad8614b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_CONFIG_FILES([
   Makefile
   data/Makefile
   gnomemusic/Makefile
-  gnomemusic/gnome-music
+  gnome-music
   po/Makefile.in
   libgd/Makefile
 ])
diff --git a/gnomemusic/gnome-music.in b/gnome-music.in
similarity index 64%
rename from gnomemusic/gnome-music.in
rename to gnome-music.in
index c1e052f..0f4272e 100644
--- a/gnomemusic/gnome-music.in
+++ b/gnome-music.in
@@ -6,5 +6,5 @@ sys.path.insert(1, '@pythondir@')
 from gnomemusic.application import Application
 
 if __name__ == "__main__":
-    app = Application(package="@PACKAGE@", version="@VERSION@")
-    app.run()
+    app = Application()
+    app.run(sys.argv)
diff --git a/gnomemusic/Makefile.am b/gnomemusic/Makefile.am
index 329e36d..b7be16d 100644
--- a/gnomemusic/Makefile.am
+++ b/gnomemusic/Makefile.am
@@ -9,6 +9,3 @@ app_PYTHON = \
        view.py \
        window.py
 
-bin_SCRIPTS = gnome-music
-CLEANFILES = $(bin_SCRIPTS)
-EXTRA_DIST = gnome-music.in
diff --git a/gnomemusic/__init__.py b/gnomemusic/__init__.py
index 26e7587..e69de29 100644
--- a/gnomemusic/__init__.py
+++ b/gnomemusic/__init__.py
@@ -1,6 +0,0 @@
-from gnomemusic import application
-import sys
-
-if __name__ == 'gnome-music':
-    app = Application.application()
-    sys.exit(app.run(sys.argv))