Corrected installation dirs

git-svn-id: file:///svnroot/ussd-widget/trunk@35 d197f4d6-dc93-42ad-8354-0da1f58e353f

diff --git a/ussd-widget/build_ussd-widget.py b/ussd-widget/build_ussd-widget.py
index a0cc864..068b470 100644 (file)
--- a/ussd-widget/build_ussd-widget.py
+++ b/ussd-widget/build_ussd-widget.py
@@ -23,7 +23,7 @@ if __name__ == "__main__":
     p.description="Widget, that executes USSD query and displays response text\nThe main purpose is viewing your balance. In Russia all operators provide balace information via USSD queries and most part of contracts are prepaid. Ability to see your balance on desktop can be useful in such case.\nAnyway, you can configure widget to any other USSD query."
     p.author="Alexey Guseynov"
     p.mail="kibergus@gmail.com"
-    p.depends = "python2.5, ussd-common (>=0.0.11), python-hildondesktop (>=0.1.0-1maemo2), hildon-desktop-python-loader (>=0.1.0-1maemo2), python-gtk2, python-gobject, python-hildon, python-cairo, python-dbus"
+    p.depends = "python2.5, ussd4all (>=0.0.0), python-hildondesktop (>=0.1.0-1maemo2), hildon-desktop-python-loader (>=0.1.0-1maemo2), python-gtk2, python-gobject, python-hildon, python-cairo, python-dbus"
     p.section="user/desktop"
     p.icon = "./ussd-widget.png"
     p.arch="all"                #should be all for python, any for all arch

diff --git a/ussd4all/debian/dirs b/ussd4all/debian/dirs
index ca882bb..e772481 100644 (file)
--- a/ussd4all/debian/dirs
+++ b/ussd4all/debian/dirs
@@ -1,2 +1 @@
 usr/bin
-usr/sbin

diff --git a/ussd4all/debian/rules b/ussd4all/debian/rules
index f58f7bb..f16ce04 100755 (executable)
--- a/ussd4all/debian/rules
+++ b/ussd4all/debian/rules
@@ -30,11 +30,10 @@ install: build
        # Add here commands to install the package into debian/your_appname
        cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
 
-       mkdir -p "$(CURDIR)/debian/ussd-common"
-       mkdir -p "$(CURDIR)/debian/ussd-common/usr/lib/python2.5/"
-       cp -a "ussdquery/gsmdecode.py" "$(CURDIR)/debian/ussd-common/usr/lib/python2.5/gsmdecode.py"
-       mkdir -p "$(CURDIR)/debian/ussd-common/usr/bin/"
-       cp -a "ussdquery/ussdquery.py" "$(CURDIR)/debian/ussd-common/usr/bin/ussdquery.py"
+       mkdir -p "$(CURDIR)/debian/ussd4all/usr/lib/python2.5/"
+       cp -a "ussdquery/gsmdecode.py" "$(CURDIR)/debian/ussd4all/usr/lib/python2.5/gsmdecode.py"
+       mkdir -p "$(CURDIR)/debian/ussd4all/usr/bin/"
+       cp -a "ussdquery/ussdquery.py" "$(CURDIR)/debian/ussd4all/usr/bin/ussdquery.py"
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/ussd4all/src/src.pro b/ussd4all/src/src.pro
index 7007ec7..5975029 100644 (file)
--- a/ussd4all/src/src.pro
+++ b/ussd4all/src/src.pro
@@ -10,8 +10,8 @@ QT += maemo5
         PREFIX = ""
   }
 
-BINDIR = $$PREFIX/usr/bin
-DATADIR =$$PREFIX/usr/share
+BINDIR = $$PREFIX/bin
+DATADIR =$$PREFIX/share
 
 DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"