Modifications needed by maemo-launcher.

git-svn-id: file:///svnroot/speedometer/trunk@61 df364472-da61-43ef-8a67-511c89aa921b

diff --git a/Makefile b/Makefile
index 4a36edd..160348a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 PKGS     = gtk+-2.0 liblocation gconf-2.0 libosso
 CC       = gcc
 LINK     = gcc
-CFLAGS   = -g -Wall -O0 -pedantic -std=gnu99
+CFLAGS   = -g -Wall -O0 -pedantic -std=gnu99 `pkg-config --cflags maemo-launcher-app` 
 INCPATH  = `pkg-config --cflags $(PKGS)`
-LIBS     = `pkg-config --libs $(PKGS)`
+LIBS     = `pkg-config --libs $(PKGS) maemo-launcher-app`
 
 SOURCES  = main.c callbacks.c ui.c util.c
 OBJECTS  = main.o callbacks.o ui.o util.o

diff --git a/debian/changelog b/debian/changelog
index bf2d3b3..456f43c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+speedometer (0.31) unstable; urgency=low
+
+  * Added maemo-launcher support to speed startup a bit.
+
+ -- Wellu Mäkinen <wellu@wellu.org>  Thu,  8 Jan 2009 10:42:52 +0200
+
 speedometer (0.3) unstable; urgency=low
 
   * Simplified event handling so that the whole screen responds to events.

diff --git a/debian/control b/debian/control
index 3e50279..de6eb3b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: speedometer
 Section: user/navigation
 Priority: extra
 Maintainer: Wellu Mäkinen <wellu@wellu.org>
-Build-Depends: debhelper (>= 5), liblocation-dev, libosso-dev, libhildon1-dev
+Build-Depends: debhelper (>= 5), liblocation-dev, libosso-dev, libhildon1-dev, maemo-launcher-dev
 Standards-Version: 3.7.2
 
 Package: speedometer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}
 Description: Shows your current speed on the screen using GPS.
  Speedometer is an application that shows your current
  speed on the screen in different units. Supported units are

diff --git a/debian/launcher b/debian/launcher
new file mode 100644 (file)
index 0000000..5b8ba67
--- /dev/null
+++ b/debian/launcher
@@ -0,0 +1 @@
+/usr/bin/speedometer

diff --git a/debian/postinst b/debian/postinst
index 137631a..2b5b913 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 oldversion="$2"
-if [ -z "$oldversion" ]
+if [ -z "$oldversion" ] ; then
        gtk-update-icon-cache -f /usr/share/icons/hicolor &
        maemo-select-menu-location speedometer.desktop
 fi

diff --git a/debian/rules b/debian/rules
index 56f0d35..83d6e5b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,10 @@
 
 
 
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
+       CFLAGS += -O0 -g -Wall
 else
-       CFLAGS += -O2
+       CFLAGS += -O2 -g -Wall
 endif
 
 configure: configure-stamp
@@ -91,6 +89,7 @@ binary-arch: build install
 #      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
+       dh_maemolauncher
        dh_gencontrol
        dh_md5sums
        dh_builddeb