From 7a84810da3b4dfdaae7d41dbe546fed8cbe34484 Mon Sep 17 00:00:00 2001
From: Ryan Campbell <campbellr@gmail.com>
Date: Sun, 25 Apr 2010 01:24:29 -0600
Subject: [PATCH] fixed a few more bugs in the packaging

---
 package/Makefile              |   18 +++++++++++++-----
 package/share/mevemon.desktop |    2 +-
 package/src/fetchimg.py       |    5 ++++-
 package/src/mevemon.py        |    9 ++++++++-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/package/Makefile b/package/Makefile
index 8c55f18..52ddeb8 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -5,7 +5,7 @@
 #edit these when creating a new release
 MAJOR_VER='0'
 MINOR_VER='1'
-PKG_VER='1'
+PKG_VER='5'
 
 compile:
 	perl -ni -e 'print; exit if /^XB-Maemo-Icon-26:$$/' debian/control
@@ -15,9 +15,12 @@ compile:
 
 install_fremantle:
 	mkdir -p ${DESTDIR}/opt/mevemon/ ${DESTDIR}/opt/mevemon/eveapi ${DESTDIR}/opt/mevemon/ui \
-	${DESTDIR}/opt/mevemon/ui/diablo ${DESTDIR}/opt/mevemon/ui/fremantle
+	${DESTDIR}/opt/mevemon/ui/diablo ${DESTDIR}/opt/mevemon/ui/fremantle ${DESTDIR}/usr/bin \
+	${DESTDIR}/opt/mevemon/imgs/
 	install -D -m 0644 -o root -g root src/*.py ${DESTDIR}/opt/mevemon/
+	ln -s /opt/mevemon/mevemon.py ${DESTDIR}/usr/bin/mevemon
 	install -D -m 0644 -o root -g root src/eveapi/*.py ${DESTDIR}/opt/mevemon/eveapi/
+	install -m 0644 -o root -g root src/imgs/*.jpg ${DESTDIR}/opt/mevemon/imgs/
 	install -m 0644 -o root -g root src/ui/*.py  ${DESTDIR}/opt/mevemon/ui/
 	install -D -m 0644 -o root -g root src/ui/fremantle/*.py  ${DESTDIR}/opt/mevemon/ui/fremantle/
 	install -D -m 0644 -o root -g root src/ui/diablo/*.py  ${DESTDIR}/opt/mevemon/ui/diablo/
@@ -28,12 +31,16 @@ install_fremantle:
 	install -D -m 0644 -o root -g root share/mevemon.desktop \
 	${DESTDIR}/usr/share/applications/hildon/mevemon.desktop
 	chmod 755 ${DESTDIR}/opt/mevemon/mevemon.py
+	chmod 755 ${DESTDIR}/usr/bin/mevemon
 
 install_diablo:
-	mkdir -p ${DESTDIR}/usr/share/mevemon/ ${DESTDIR}/usr/share/mevemon/eveapi ${DESTDIR}/usr/share/mevemon/ui \
-	${DESTDIR}/usr/share/mevemon/ui/diablo ${DESTDIR}/usr/share/mevemon/ui/fremantle
+	mkdir -p ${DESTDIR}/usr/share/mevemon/ ${DESTDIR}/usr/share/mevemon/eveapi \
+	${DESTDIR}/usr/share/mevemon/ui ${DESTDIR}/usr/share/mevemon/ui/diablo \
+	${DESTDIR}/usr/share/mevemon/ui/fremantle ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/mevemon/imgs/
 	install -D -m 0644 -o root -g root src/*.py ${DESTDIR}/usr/share/mevemon/
+	ln -s /usr/share/mevemon/mevemon.py ${DESTDIR}/usr/bin/mevemon
 	install -D -m 0644 -o root -g root src/eveapi/*.py ${DESTDIR}/usr/share/mevemon/eveapi/
+	install -m 0644 -o root -g root src/imgs/*.jpg ${DESTDIR}/usr/share/mevemon/imgs/
 	install -m 0644 -o root -g root src/ui/*.py  ${DESTDIR}/usr/share/mevemon/ui/
 	install -D -m 0644 -o root -g root src/ui/fremantle/*.py  ${DESTDIR}/usr/share/mevemon/ui/fremantle/
 	install -D -m 0644 -o root -g root src/ui/diablo/*.py  ${DESTDIR}/usr/share/mevemon/ui/diablo/
@@ -41,9 +48,10 @@ install_diablo:
 	${DESTDIR}/usr/share/icons/hicolor/scalable/hildon/mevemon.png
 	install -D -m 0644 -o root -g root share/mevemon-48.png \
 	${DESTDIR}/usr/share/icons/hicolor/48x48/hildon/mevemon.png
-	install -D -m 0644 -o root -g root share/mevemon-diablo.desktop \
+	install -D -m 0644 -o root -g root share/mevemon.desktop \
 	${DESTDIR}/usr/share/applications/hildon/mevemon.desktop
 	chmod 755 ${DESTDIR}/usr/share/mevemon/mevemon.py
+	chmod 755 ${DESTDIR}/usr/bin/mevemon
 
 clean:
 	rm -f src/*.py[oc]
diff --git a/package/share/mevemon.desktop b/package/share/mevemon.desktop
index 76693a1..c0784fc 100644
--- a/package/share/mevemon.desktop
+++ b/package/share/mevemon.desktop
@@ -3,7 +3,7 @@ Version=1.0.0
 Encoding=UTF-8
 Name=mEveMon
 Comment=Character monitor for EVE Online
-Exec=/opt/mevemon/mevemon.py
+Exec=/usr/bin/mevemon
 Icon=mevemon
 X-Icon-path=/usr/share/icons
 X-Window-Icon=mevemon
diff --git a/package/src/fetchimg.py b/package/src/fetchimg.py
index 85e5588..1f0043c 100644
--- a/package/src/fetchimg.py
+++ b/package/src/fetchimg.py
@@ -3,7 +3,10 @@ import os.path
 
 def portrait_filename( char_id, img_size ):
 
-    err_img = '/opt/mEveMon/imgs/error.jpg'
+    err_img = '/opt/mevemon/imgs/error.jpg'
+    if not os.path.isfile(err_img):
+        #diablo location
+        err_img = "/usr/share/mevemon/imgs/error.jpg"
    
     img_dir = os.path.expanduser("~/.mevemon/imgs/")
 
diff --git a/package/src/mevemon.py b/package/src/mevemon.py
index 93acf5e..bf916ac 100755
--- a/package/src/mevemon.py
+++ b/package/src/mevemon.py
@@ -30,8 +30,10 @@ import gnome.gconf
 #ugly hack to check maemo version. any better way?
 if hasattr(hildon, "StackableWindow"):
     from ui.fremantle import ui
+    is_fremantle = True
 else:
     from ui.diablo import ui
+    is_fremantle = False
 
 class mEveMon():
     def __init__(self):
@@ -121,7 +123,12 @@ class mEveMon():
         name, if there's a problem. FIXME --danny
         """
         ui_char_list = []
-        placeholder_chars = [("Please check your API settings.", "imgs/error.jpg")]
+        if is_fremantle:
+            err_img = "/opt/mevemon/imgs/error.jpg"
+        else:
+            err_img = "/usr/share/mevemon/imgs/error.jpg"
+
+        placeholder_chars = [("Please check your API settings.", err_img)]
         if not self.auth: return placeholder_chars
         try:
             api_char_list = self.auth.account.Characters()
-- 
1.7.9.5