some more clean ups

diff --git a/Makefile b/Makefile
index dbc825e..2dfdb55 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,21 +8,22 @@ install:
        mkdir -p $(DESTDIR)/usr/share/applications/hildon
        mkdir -p $(DESTDIR)/usr/share/icons/hicolor/40x40/apps
        mkdir -p $(DESTDIR)/usr/share/dbus-1/services
-       cp maemo/mancala.desktop $(DESTDIR)/usr/share/applications/hildon
+       cp res/mancala.desktop $(DESTDIR)/usr/share/applications/hildon
        cp res/mancala.png $(DESTDIR)/usr/share/icons/hicolor/40x40/apps/mancala.png
-       cp maemo/com.nokia.mancala.service $(DESTDIR)/usr/share/dbus-1/services/
+       cp res/com.nokia.mancala.service $(DESTDIR)/usr/share/dbus-1/services/
 
 clean:
        rm -f build-stamp config.guess config.sub
+       rm -rf debian/mancala
        $(MAKE) -C src clean
 
 clobber: clean
        $(MAKE) -C src clobber
 
-maemo-source:
+maemo-source: clean
        dpkg-buildpackage -rfakeroot -sa -S -us -uc -i -I.git
        
-maemo-bin:
+maemo-bin: clean
        dpkg-buildpackage -rfakeroot -b -us -uc
 
 .PHONY: clobber clean install subsystem maemo-source maemo-bin

diff --git a/maemo/com.nokia.mancala.service b/maemo/com.nokia.mancala.service
deleted file mode 100644 (file)
index de77262..0000000
--- a/maemo/com.nokia.mancala.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.mancala
-Exec=/home/opt/mancala/bin/mancala

diff --git a/maemo/mancala.desktop b/maemo/mancala.desktop
deleted file mode 100644 (file)
index 4697e22..0000000
--- a/maemo/mancala.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.1
-Name=Mancala
-Comment=Mancala game for Maemo devices
-Exec=/home/opt/mancala/bin/mancala
-Icon=mancala
-Terminal=false
-Type=Application
-Categories=Games
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-X-Window-Icon=mancala
-X-Osso-Service=com.nokia.mancala
-
-

diff --git a/res/com.nokia.mancala.service b/res/com.nokia.mancala.service
new file mode 100644 (file)
index 0000000..de77262
--- /dev/null
+++ b/res/com.nokia.mancala.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.nokia.mancala
+Exec=/home/opt/mancala/bin/mancala

diff --git a/res/mancala.desktop b/res/mancala.desktop
new file mode 100644 (file)
index 0000000..4697e22
--- /dev/null
+++ b/res/mancala.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.1
+Name=Mancala
+Comment=Mancala game for Maemo devices
+Exec=/home/opt/mancala/bin/mancala
+Icon=mancala
+Terminal=false
+Type=Application
+Categories=Games
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
+X-Window-Icon=mancala
+X-Osso-Service=com.nokia.mancala
+
+