diff --git a/Linux/Makefile.exmp b/Linux/Makefile.exmp index 1e34feb..ed76649 100644 --- a/Linux/Makefile.exmp +++ b/Linux/Makefile.exmp @@ -35,4 +35,5 @@ clean: $(PYTHON) setup.py clean $(MAKE) -f $(CURDIR)/debian/rules clean rm -rf build/ MANIFEST - find . -name '*.pyc' -delete \ No newline at end of file + find . -name '*.pyc' -delete + diff --git a/Linux/debian/rules b/Linux/debian/rules index f0766df..351bb67 100755 --- a/Linux/debian/rules +++ b/Linux/debian/rules @@ -15,3 +15,4 @@ install/bungloo:: clean:: rm -rf build build-stamp configure-stamp build/ MANIFEST dh_clean + diff --git a/Linux/deploy.sh b/Linux/deploy.sh index 264df60..82ec03c 100755 --- a/Linux/deploy.sh +++ b/Linux/deploy.sh @@ -4,7 +4,7 @@ VERSION="1.4.0" DEPLOYPATH="bungloo-${VERSION}" QTPATH="../Qt" SHAREDPATH=".." -DISTPATH=dist +DISTPATH="dist" rm -rf $DEPLOYPATH rm -rf $DISTPATH @@ -41,6 +41,7 @@ rm bungloo_${VERSION}.dsc rm bungloo_${VERSION}.orig.tar.gz rm -rf $DEPLOYPATH rm $DISTPATH/bungloo-${VERSION}-1.src.rpm +mv $DISTPATH/bungloo-${VERSION}-1.noarch.rpm $DISTPATH/bungloo-${VERSION}.noarch.rpm echo "Done." diff --git a/Linux/setup.py.exmp b/Linux/setup.py.exmp index 06130f5..c9eaa8a 100644 --- a/Linux/setup.py.exmp +++ b/Linux/setup.py.exmp @@ -21,5 +21,9 @@ setup( license = "BSD license", packages = ['bungloo'], package_data = {"bungloo": files}, - scripts = ["bin/bungloo"] - ) + scripts = ["bin/bungloo"], + data_files=[ + ('/usr/share/applications', ["bungloo.desktop"]), + ('/usr/share/pixmaps', ["bungloo/images/bungloo.xpm"]) + ] +) diff --git a/Qt/Helper.py b/Qt/Helper.py index 09cd069..4d87872 100644 --- a/Qt/Helper.py +++ b/Qt/Helper.py @@ -12,7 +12,10 @@ import array class Helper: @classmethod def get_resource_path(cls): - return os.path.dirname(sys.argv[0]) + if os.name == "nt": + return os.path.dirname(sys.argv[0]) + else: + return os.path.dirname(__file__) class WebPage(QtWebKit.QWebPage): def __init__(self, parent=0, app=None):