Nearly ready for packaging. WARNING, looks like librtcom is corruped, which prevents...

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

diff --git a/ussd4all/debian/control b/ussd4all/debian/control
index 6d53361..0317262 100644 (file)
--- a/ussd4all/debian/control
+++ b/ussd4all/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: ussd4all
 Architecture: any
-Depends:  python2.5, pexpect, python-dbus, python-gobject, libc6 (>= 2.5.0-1), libgcc1 (>= 3.4.4), libqtcore4 (>= 4.4.0), libqtgui4 (>= 4.4.0), libstdc++6 (>= 3.4.4), ${shlibs:Depends}
+Depends:  python2.5, pexpect, python-dbus, python-gobject, libc6 (>= 2.5.0-1), libgcc1 (>= 3.4.4), libqt4-core (>= 4.4.0), libqt4-gui (>= 4.4.0), libstdc++6 (>= 3.4.4), ${shlibs:Depends}
 XB-Maemo-Display-Name: USSD for all
 Description: Command line and GUI utility for making USSD queries
   This package fixes https://bugs.maemo.org/show_bug.cgi?id=10353 which nokia is unable to fix. This allows other applications to make USSD queries.

diff --git a/ussd4all/debian/postinst b/ussd4all/debian/postinst
index 0e2c75f..a4b916b 100644 (file)
--- a/ussd4all/debian/postinst
+++ b/ussd4all/debian/postinst
@@ -1,56 +1,21 @@
 #!/bin/sh
-# postinst script for ussd4all
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ;;
 
 SUM=`md5sum /usr/lib/librtcom-call-ui.so.0.0.0`
 if [ "$SUM" = "5a51e4fbb38dac338e4444e6b713e9b3  /usr/lib/librtcom-call-ui.so.0.0.0" ] ; then
-       cp /usr/lib/librtcom-call-ui.so.0.0.0 /usr/lib/librtcom-call-ui.so.0.0.0.orig
-fi
+    cp /usr/lib/librtcom-call-ui.so.0.0.0 /usr/lib/librtcom-call-ui.so.0.0.0.orig1
 
-head -c 194380 /usr/lib/librtcom-call-ui.so.0.0.0.orig > /usr/lib/librtcom-call-ui.so.0.0.0
-cat rtcom/librtcom-call-ui.patch >> /usr/lib/librtcom-call-ui.so.0.0.0
-head -c 195340 /usr/lib/librtcom-call-ui.so.0.0.0.orig | tail -c +194389 >> /usr/lib/librtcom-call-ui.so.0.0.0
-cat rtcom/librtcom-call-ui.patch >> /usr/lib/librtcom-call-ui.so.0.0.0
-tail -c +195349 /usr/lib/librtcom-call-ui.so.0.0.0.orig >> /usr/lib/librtcom-call-ui.so.0.0.0
+    head -c 194380 /usr/lib/librtcom-call-ui.so.0.0.0.orig > /usr/lib/librtcom-call-ui.so.0.0.0
+    cat /usr/lib/rtcom/librtcom-call-ui.patch >> /usr/lib/librtcom-call-ui.so.0.0.0
+    head -c 195340 /usr/lib/librtcom-call-ui.so.0.0.0.orig | tail -c +194389 >> /usr/lib/librtcom-call-ui.so.0.0.0
+    cat /usr/lib/rtcom/librtcom-call-ui.patch >> /usr/lib/librtcom-call-ui.so.0.0.0
+    tail -c +195349 /usr/lib/librtcom-call-ui.so.0.0.0.orig >> /usr/lib/librtcom-call-ui.so.0.0.0
+fi
 
 pkill rtcom-call-ui
 
+chmod +s /usr/bin/pnatd
 
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
+export DISPLAY=:0.0
+exec su user -c "run-standalone.sh /usr/bin/ussdd" &
 
 

diff --git a/ussd4all/debian/postrm b/ussd4all/debian/postrm
new file mode 100644 (file)
index 0000000..80faff6
--- /dev/null
+++ b/ussd4all/debian/postrm
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -f /usr/lib/librtcom-call-ui.so.0.0.0.orig ] ; then
+    mv /usr/lib/librtcom-call-ui.so.0.0.0.orig /usr/lib/librtcom-call-ui.so.0.0.0
+fi

diff --git a/ussd4all/debian/postrm.ex b/ussd4all/debian/postrm.ex
deleted file mode 100644 (file)
index 468acb3..0000000
--- a/ussd4all/debian/postrm.ex
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# postrm script for ussd4all
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

diff --git a/ussd4all/src/Makefile b/ussd4all/src/Makefile
index 7872c5e..30eae9e 100644 (file)
--- a/ussd4all/src/Makefile
+++ b/ussd4all/src/Makefile
@@ -1,22 +1,22 @@
 #############################################################################
 # Makefile for building: qussd
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Tue Jun 1 12:19:45 2010
-# Project:  qussd.pro
+# Generated by qmake (2.01a) (Qt 4.6.2) on: ?? ???? 10 00:23:39 2010
+# Project:  src.pro
 # Template: app
-# Command: /usr/bin/qmake -unix -o Makefile qussd.pro
+# Command: /usr/bin/qmake -unix -o Makefile src.pro
 #############################################################################
 
 ####### Compiler, tools and options
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtDBus -I/targets/FREMANTLE_ARMEL/usr/include/QtMaemo5 -I/targets/FREMANTLE_ARMEL/usr/include -I.
+DEFINES       = -DDATADIR=\"/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -O2 -pipe -march=native -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -pipe -O2 -pipe -march=native -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I.
 LINK          = g++
-LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib
-LIBS          = $(SUBLIBS)  -L/usr/lib -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lQtDBus -lQtXml -lQtGui -lQtCore -lpthread 
+LFLAGS        = -Wl,-O1 -Wl,-rpath,/usr/lib64/qt4
+LIBS          = $(SUBLIBS)  -L/usr/lib64/qt4 -lQtGui -L/usr/lib64 -L/usr/lib64/qt4 -L/usr/X11R6/lib -lQtCore -lgthread-2.0 -lrt -lglib-2.0 -lpthread 
 AR            = ar cqs
 RANLIB        = 
 QMAKE         = /usr/bin/qmake
@@ -43,29 +43,28 @@ OBJECTS_DIR   = ./
 
 ####### Files
 
-SOURCES       = main.cpp 
-OBJECTS       = main.o
-DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
-               qussd.pro
+SOURCES       = qussd.cpp 
+OBJECTS       = qussd.o
+DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
+               /usr/share/qt4/mkspecs/common/unix.conf \
+               /usr/share/qt4/mkspecs/common/linux.conf \
+               /usr/share/qt4/mkspecs/qconfig.pri \
+               /usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /usr/share/qt4/mkspecs/features/qt_config.prf \
+               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /usr/share/qt4/mkspecs/features/default_pre.prf \
+               /usr/share/qt4/mkspecs/features/release.prf \
+               /usr/share/qt4/mkspecs/features/default_post.prf \
+               /usr/share/qt4/mkspecs/features/warn_on.prf \
+               /usr/share/qt4/mkspecs/features/qt.prf \
+               /usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /usr/share/qt4/mkspecs/features/moc.prf \
+               /usr/share/qt4/mkspecs/features/resources.prf \
+               /usr/share/qt4/mkspecs/features/uic.prf \
+               /usr/share/qt4/mkspecs/features/yacc.prf \
+               /usr/share/qt4/mkspecs/features/lex.prf \
+               /usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               src.pro
 QMAKE_TARGET  = qussd
 DESTDIR       = 
 TARGET        = qussd
@@ -97,63 +96,55 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: qussd.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
-               /usr/lib/libQtMaemo5.prl \
-               /usr/lib/libQtDBus.prl \
-               /usr/lib/libQtXml.prl \
-               /usr/lib/libQtCore.prl \
-               /usr/lib/libQtGui.prl
-       $(QMAKE) -unix -o Makefile qussd.pro
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
-/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
-/usr/lib/libQtMaemo5.prl:
-/usr/lib/libQtDBus.prl:
-/usr/lib/libQtXml.prl:
-/usr/lib/libQtCore.prl:
-/usr/lib/libQtGui.prl:
+Makefile: src.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
+               /usr/share/qt4/mkspecs/common/unix.conf \
+               /usr/share/qt4/mkspecs/common/linux.conf \
+               /usr/share/qt4/mkspecs/qconfig.pri \
+               /usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /usr/share/qt4/mkspecs/features/qt_config.prf \
+               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /usr/share/qt4/mkspecs/features/default_pre.prf \
+               /usr/share/qt4/mkspecs/features/release.prf \
+               /usr/share/qt4/mkspecs/features/default_post.prf \
+               /usr/share/qt4/mkspecs/features/warn_on.prf \
+               /usr/share/qt4/mkspecs/features/qt.prf \
+               /usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /usr/share/qt4/mkspecs/features/moc.prf \
+               /usr/share/qt4/mkspecs/features/resources.prf \
+               /usr/share/qt4/mkspecs/features/uic.prf \
+               /usr/share/qt4/mkspecs/features/yacc.prf \
+               /usr/share/qt4/mkspecs/features/lex.prf \
+               /usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               /usr/lib64/qt4/libQtGui.prl \
+               /usr/lib64/qt4/libQtCore.prl
+       $(QMAKE) -unix -o Makefile src.pro
+/usr/share/qt4/mkspecs/common/g++.conf:
+/usr/share/qt4/mkspecs/common/unix.conf:
+/usr/share/qt4/mkspecs/common/linux.conf:
+/usr/share/qt4/mkspecs/qconfig.pri:
+/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/usr/share/qt4/mkspecs/features/qt_config.prf:
+/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/usr/share/qt4/mkspecs/features/default_pre.prf:
+/usr/share/qt4/mkspecs/features/release.prf:
+/usr/share/qt4/mkspecs/features/default_post.prf:
+/usr/share/qt4/mkspecs/features/warn_on.prf:
+/usr/share/qt4/mkspecs/features/qt.prf:
+/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/usr/share/qt4/mkspecs/features/moc.prf:
+/usr/share/qt4/mkspecs/features/resources.prf:
+/usr/share/qt4/mkspecs/features/uic.prf:
+/usr/share/qt4/mkspecs/features/yacc.prf:
+/usr/share/qt4/mkspecs/features/lex.prf:
+/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/usr/lib64/qt4/libQtGui.prl:
+/usr/lib64/qt4/libQtCore.prl:
 qmake:  FORCE
-       @$(QMAKE) -unix -o Makefile qussd.pro
+       @$(QMAKE) -unix -o Makefile src.pro
 
 dist: 
        @$(CHK_DIR_EXISTS) .tmp/qussd1.0.0 || $(MKDIR) .tmp/qussd1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/qussd1.0.0/ && $(COPY_FILE) --parents main.cpp .tmp/qussd1.0.0/ && (cd `dirname .tmp/qussd1.0.0` && $(TAR) qussd1.0.0.tar qussd1.0.0 && $(COMPRESS) qussd1.0.0.tar) && $(MOVE) `dirname .tmp/qussd1.0.0`/qussd1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/qussd1.0.0
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/qussd1.0.0/ && $(COPY_FILE) --parents qussd.cpp .tmp/qussd1.0.0/ && (cd `dirname .tmp/qussd1.0.0` && $(TAR) qussd1.0.0.tar qussd1.0.0 && $(COMPRESS) qussd1.0.0.tar) && $(MOVE) `dirname .tmp/qussd1.0.0`/qussd1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/qussd1.0.0
 
 
 clean:compiler_clean 
@@ -174,29 +165,17 @@ mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
 compiler_moc_header_make_all:
 compiler_moc_header_clean:
-compiler_dbus_interface_source_make_all:
-compiler_dbus_interface_source_clean:
-compiler_dbus_adaptor_source_make_all:
-compiler_dbus_adaptor_source_clean:
 compiler_rcc_make_all:
 compiler_rcc_clean:
 compiler_image_collection_make_all: qmake_image_collection.cpp
 compiler_image_collection_clean:
        -$(DEL_FILE) qmake_image_collection.cpp
-compiler_moc_source_make_all: main.moc
+compiler_moc_source_make_all: qussd.moc
 compiler_moc_source_clean:
-       -$(DEL_FILE) main.moc
-main.moc: main.cpp
-       /usr/bin/moc $(DEFINES) $(INCPATH) main.cpp -o main.moc
-
-compiler_dbus_interface_header_make_all:
-compiler_dbus_interface_header_clean:
-compiler_dbus_interface_moc_make_all:
-compiler_dbus_interface_moc_clean:
-compiler_dbus_adaptor_header_make_all:
-compiler_dbus_adaptor_header_clean:
-compiler_dbus_adaptor_moc_make_all:
-compiler_dbus_adaptor_moc_clean:
+       -$(DEL_FILE) qussd.moc
+qussd.moc: qussd.cpp
+       /usr/bin/moc $(DEFINES) $(INCPATH) qussd.cpp -o qussd.moc
+
 compiler_uic_make_all:
 compiler_uic_clean:
 compiler_yacc_decl_make_all:
@@ -209,24 +188,75 @@ compiler_clean: compiler_moc_source_clean
 
 ####### Compile
 
-main.o: main.cpp main.moc
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+qussd.o: qussd.cpp qussd.moc
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qussd.o qussd.cpp
 
 ####### Install
 
 install_target: first FORCE
-       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/examples/opt/maemo/usr/bin/qussd/ || $(MKDIR) $(INSTALL_ROOT)/usr/examples/opt/maemo/usr/bin/qussd/ 
-       -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/examples/opt/maemo/usr/bin/qussd/$(QMAKE_TARGET)"
-       -$(STRIP) "$(INSTALL_ROOT)/usr/examples/opt/maemo/usr/bin/qussd/$(QMAKE_TARGET)"
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/bin/ || $(MKDIR) $(INSTALL_ROOT)/bin/ 
+       -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/bin/$(QMAKE_TARGET)"
+       -$(STRIP) "$(INSTALL_ROOT)/bin/$(QMAKE_TARGET)"
 
 uninstall_target:  FORCE
-       -$(DEL_FILE) "$(INSTALL_ROOT)/usr/examples/opt/maemo/usr/bin/qussd/$(QMAKE_TARGET)"
-       -$(DEL_DIR) $(INSTALL_ROOT)/usr/examples/opt/maemo/usr/bin/qussd/ 
+       -$(DEL_FILE) "$(INSTALL_ROOT)/bin/$(QMAKE_TARGET)"
+       -$(DEL_DIR) $(INSTALL_ROOT)/bin/ 
+
+
+install_desktop: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/share/applications/hildon/ || $(MKDIR) $(INSTALL_ROOT)/share/applications/hildon/ 
+       -$(INSTALL_FILE) /opt/scratchbox/users/parents/home/parents/ussd/ussd-widget/trunk/ussd4all/src/qussd.desktop $(INSTALL_ROOT)/share/applications/hildon/
+
+
+uninstall_desktop:  FORCE
+       -$(DEL_FILE) -r $(INSTALL_ROOT)/share/applications/hildon/qussd.desktop
+       -$(DEL_DIR) $(INSTALL_ROOT)/share/applications/hildon/ 
+
+
+install_icon48: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/share/icons/hicolor/48x48/apps/ || $(MKDIR) $(INSTALL_ROOT)/share/icons/hicolor/48x48/apps/ 
+       -$(INSTALL_FILE) /opt/scratchbox/users/parents/home/parents/ussd/ussd-widget/trunk/ussd4all/src/ussd.png $(INSTALL_ROOT)/share/icons/hicolor/48x48/apps/
+
+
+uninstall_icon48:  FORCE
+       -$(DEL_FILE) -r $(INSTALL_ROOT)/share/icons/hicolor/48x48/apps/ussd.png
+       -$(DEL_DIR) $(INSTALL_ROOT)/share/icons/hicolor/48x48/apps/ 
+
+
+install_ussdd: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/bin/ || $(MKDIR) $(INSTALL_ROOT)/bin/ 
+       -$(INSTALL_PROGRAM) /opt/scratchbox/users/parents/home/parents/ussd/ussd-widget/trunk/ussd4all/src/ussdd $(INSTALL_ROOT)/bin/
+       -strip $(INSTALL_ROOT)/bin/ussdd
+
+
+uninstall_ussdd:  FORCE
+       -$(DEL_FILE) -r $(INSTALL_ROOT)/bin/ussdd
+       -$(DEL_DIR) $(INSTALL_ROOT)/bin/ 
+
+
+install_event: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/../etc/event.d/ || $(MKDIR) $(INSTALL_ROOT)/../etc/event.d/ 
+       -$(INSTALL_FILE) /opt/scratchbox/users/parents/home/parents/ussd/ussd-widget/trunk/ussd4all/src/event.d/ussdd $(INSTALL_ROOT)/../etc/event.d/
+
+
+uninstall_event:  FORCE
+       -$(DEL_FILE) -r $(INSTALL_ROOT)/../etc/event.d/ussdd
+       -$(DEL_DIR) $(INSTALL_ROOT)/../etc/event.d/ 
+
+
+install_patch: first FORCE
+       @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/lib/ || $(MKDIR) $(INSTALL_ROOT)/lib/ 
+       -$(INSTALL_FILE) /opt/scratchbox/users/parents/home/parents/ussd/ussd-widget/trunk/ussd4all/rtcom/librtcom-call-ui.patch $(INSTALL_ROOT)/lib/
+
+
+uninstall_patch:  FORCE
+       -$(DEL_FILE) -r $(INSTALL_ROOT)/lib/librtcom-call-ui.patch
+       -$(DEL_DIR) $(INSTALL_ROOT)/lib/ 
 
 
-install:  install_target  FORCE
+install:  install_target install_desktop install_icon48 install_ussdd install_event install_patch  FORCE
 
-uninstall: uninstall_target   FORCE
+uninstall: uninstall_target uninstall_desktop uninstall_icon48 uninstall_ussdd uninstall_event uninstall_patch   FORCE
 
 FORCE:
 

diff --git a/ussd4all/src/event.d/ussdd b/ussd4all/src/event.d/ussdd
index 2a45c85..a11b98c 100644 (file)
--- a/ussd4all/src/event.d/ussdd
+++ b/ussd4all/src/event.d/ussdd
@@ -1,10 +1,10 @@
 start on XSESSIONS_STARTING
 stop on stopped hal
-respawn
-respawn limit 15 3
+#respawn
+#respawn limit 15 3
 
 script
        export DISPLAY=:0.0
-        exec su user -c "run-standalone.sh /usr/bin/ussdd"
+        exec su user -c "run-standalone.sh /usr/bin/ussdd"&
        sleep 5
 end script

diff --git a/ussd4all/src/src.pro b/ussd4all/src/src.pro
index 5975029..81aceae 100644 (file)
--- a/ussd4all/src/src.pro
+++ b/ussd4all/src/src.pro
@@ -16,7 +16,7 @@ DATADIR =$$PREFIX/share
 DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
 
 #MAKE INSTALL
-INSTALLS += target desktop icon48 ussdd event
+INSTALLS += target desktop icon48 ussdd event patch
 
   target.path = $$BINDIR
 
@@ -29,6 +29,9 @@ INSTALLS += target desktop icon48 ussdd event
   ussdd.path = $$BINDIR
   ussdd.files = ussdd
 
-  event.path = $$PREFIX/etc/init.d
+  event.path = $$PREFIX/../etc/event.d
   event.files = event.d/ussdd
+
+  patch.path = $$PREFIX/lib
+  patch.files = ../rtcom/librtcom-call-ui.patch
  }