Some debian stuff and small fix

diff --git a/configure.ac b/configure.ac
index d41033c..330a22b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_LIBTOOL
-AC_PROG_INTLTOOL([0.23])
+#AC_PROG_INTLTOOL([0.23])
 AC_HEADER_STDC
 
 # Option to enable debugging
@@ -69,7 +69,7 @@ AC_SUBST(desktopentrydir)
 #AC_SUBST(icon_scalabledir)
 
 #AC_DEFINE_UNQUOTED([LOCALEDIR], "${localedir}", [Runtime locale catalog files path])
-AC_DEFINE_UNQUOTED([PIXMAPDIR], "${pixmapdir}", [Runtime pixmap files path])
+#AC_DEFINE_UNQUOTED([PIXMAPDIR], "${pixmapdir}", [Runtime pixmap files path])
 
 # Produce output files
 AC_OUTPUT(

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..d26f059
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+wai (0.1) fremantle; urgency=low
+
+  * First debian package
+
+ -- Michele Tameni <michele@amdplanet,ut>  Mon, 09 Oct 2009 13:40:08 +0300

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..e712f60
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,16 @@
+Source: wai
+Section: user/tools
+Priority: optional
+Maintainer: Michele Tameni <michele@amdplanet.it>
+Build-Depends: intltool,
+ libhildon1-dev, libgtk2.0-dev, liblocation-dev,
+ libglib2.0-dev
+Standards-Version: 3.7.2
+
+Package: wai
+Section: user/tools
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Text editor example
+ Text editor application for editing plain-text documents.
+

diff --git a/debian/rules b/debian/rules
new file mode 100644 (file)
index 0000000..27cefa1
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,91 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+export DH_COMPAT=4
+export DH_OPTIONS
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH   ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -O0
+else
+       CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+       INSTALL_PROGRAM += -s
+endif
+
+config.status: configure
+       dh_testdir
+       # Add here commands to configure the package.
+       CFLAGS="$(CFLAGS)" ./configure --with-midgard --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+
+build: build-stamp
+
+build-stamp:  config.status
+       dh_testdir
+
+       # Add here commands to compile the package.
+       $(MAKE)
+       touch build-stamp
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp 
+
+       # Add here commands to clean up after the build process.
+       mv debian/rules debian/rules.save
+       -$(MAKE) distclean
+       mv debian/rules.save debian/rules
+
+       dh_clean
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+
+       # Add here commands to install the package into debian/tmp
+       #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/var/lib/install
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+       # See postinst for why we do this.
+#      ( cd $(CURDIR)/debian/tmp/usr/share/applications/hildon \
+#      && mv conboy.desktop conboy.inactive                  \
+#    )
+       dh_install --sourcedir=debian/tmp
+
+
+# Build architecture-independent files here.
+binary-indep: DH_OPTIONS=-i
+binary-indep:
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-indep: DH_OPTIONS=-a
+binary-arch: install
+       dh_testdir
+       dh_testroot
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: binary binary-arch binary-indep install clean configure build clean

diff --git a/src/loc_data.c b/src/loc_data.c
index 761d220..cd68a42 100644 (file)
--- a/src/loc_data.c
+++ b/src/loc_data.c
@@ -44,7 +44,7 @@ void on_changed(LocationGPSDevice *device, gpointer data)
                 g_sprintf(tmp_str,"%s", "No sat in view");
                 break;
             case LOCATION_GPS_DEVICE_MODE_NO_FIX:
-                g_sprintf(tmp_str,"%s", "Not fixed yed");
+                g_sprintf(tmp_str,"%s", "Not fixed yet");
                 break;
             case LOCATION_GPS_DEVICE_MODE_2D:
                 g_sprintf(tmp_str,"%s", "2D Fix");
@@ -53,7 +53,7 @@ void on_changed(LocationGPSDevice *device, gpointer data)
                 g_sprintf(tmp_str,"%s", "3D FIX");
                 break;
             default:
-                g_sprintf(tmp_str,"%s", "Bho");
+                g_sprintf(tmp_str,"%s", "Unkown status");
             }
             
             gtk_label_set_text( GTK_LABEL(app_data->main_ui->fix_status_label), tmp_str );