Made changes mentioned in changelog for Maemo Mapper v1.0.1.

git-svn-id: svn+ssh://garage/var/lib/gforge/svnroot/maemo-mapper/trunk@16 6c538b50-5814-0410-93ad-8bdf4c0149d1

diff --git a/Makefile.am b/Makefile.am
index 2230b32079bf6d2c45ac232ec94a15ad37849255..3d18c9c901c148478864b37beb2bdf756a4c89e4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 icondir = $(datadir)/icons/hicolor
 
 install-data-local:
-       i=pkg_maemo-mapper; \
+       i=maemo-mapper; \
        $(mkinstalldirs) $(DESTDIR)$(icondir)/26x26/hildon; \
        $(mkinstalldirs) $(DESTDIR)$(icondir)/40x40/hildon; \
        $(mkinstalldirs) $(DESTDIR)$(icondir)/scalable/hildon; \
@@ -12,7 +12,7 @@ install-data-local:
        $(INSTALL_DATA) $(srcdir)/$$i.64.png $(DESTDIR)$(icondir)/scalable/hildon/$$i.png;
 
 uninstall-local:
-       i=pkg_maemo-mapper; \
+       i=maemo-mapper; \
        rm $(DESTDIR)$(icondir)/26x26/hildon/$$i.png; \
        rm $(DESTDIR)$(icondir)/40x40/hildon/$$i.png; \
        rm $(DESTDIR)$(icondir)/scalable/hildon/$$i.png;
@@ -28,19 +28,23 @@ maemo_mapper_LDADD = $(GTK_LIBS) $(OSSO_LIBS) $(HILDON_LIBS) $(GNOME_VFS_LIBS) $
 desktopdir = $(datadir)/applications/hildon
 desktop_DATA = maemo-mapper.desktop
 
-servicedir = /usr/share/dbus-1/services
+servicedir = $(datadir)/dbus-1/services
 service_DATA = com.nokia.maemo_mapper.service
 
-EXTRA_DIST =                                   \
-        autogen.sh                             \
-        debian/changelog                       \
-        debian/compat                          \
-        debian/copyright                       \
-        debian/control                         \
-        debian/rules                           \
-        debian/maemo-mapper.links              \
-        maemo-mapper.desktop                   \
-        com.nokia.maemo_mapper.service \
-        pkg_maemo-mapper.26.png                \
-        pkg_maemo-mapper.40.png                \
-        pkg_maemo-mapper.64.png
+EXTRA_DIST =                                                                  \
+        autogen.sh                                                            \
+        debian/changelog                                                      \
+        debian/compat                                                         \
+        debian/copyright                                                      \
+        debian/control                                                        \
+        debian/rules                                                          \
+        debian/maemo-mapper.links                                             \
+        maemo-mapper.desktop                                                  \
+        com.nokia.maemo_mapper.service                                        \
+        maemo-mapper.26.png                                                   \
+        maemo-mapper.40.png                                                   \
+        maemo-mapper.64.png
+
+deb:
+       ./make-package $(PACKAGE) $(VERSION)
+

diff --git a/autogen.sh b/autogen.sh
index 71bc4d215b309c2cdf109d74040a4c7ebf0cc530..d6b2ae6398accd3c64f96081c55408c5878f4cf5 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 set -x
-aclocal
+aclocal-1.7
 autoconf
-autoheader
-automake --add-missing --foreign
-./configure
+libtoolize
+automake-1.7 --add-missing --foreign

diff --git a/configure.ac b/configure.ac
index e485a6cd8dce52fdd6463a86df3e173966ca745f..84b33aeabf0adf757a15055dbb904ff85566a94e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,15 @@
 AC_INIT(Makefile.am)
-AC_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(maemo-mapper, 1.0)
+AM_INIT_AUTOMAKE(maemo-mapper, 1.0.1)
 
-AC_PROG_CC
-AC_STDC_HEADERS
+AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2 glib-2.0 >= 2.2)
+PKG_CHECK_MODULES(GTK, gtk+-2.0)
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 
-PKG_CHECK_MODULES(OSSO, libosso >= 0.8.4 libossohelp)
+PKG_CHECK_MODULES(OSSO, libosso >= 1)
 AC_SUBST(OSSO_LIBS)
 AC_SUBST(OSSO_CFLAGS)
 

diff --git a/debian/changelog b/debian/changelog
index fc65d0db58252e006a5168b3cd2df81fdc0e7885..d076971d122238aba5a51ab8b1e17d84a1fb26b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maemo-mapper (1.0.1) unstable; urgency=low
+
+  * Fixed my broken "last two center points" code.
+  * Re-organized package to better match the new Maemo 2.0 hello-world-app.
+
+ -- John Costigan <gnuite@gmail.com>  Mon, 12 Jun 2006 20:42:00 -0400
+
 maemo-mapper (1.0) unstable; urgency=low
 
   * Functionally the same as 0.2.4.  The only difference is that the 1.x

diff --git a/debian/control b/debian/control
index d9572b58d9e010358b136e9f080468482807d133..33d0ffca90bb3b282621d620dd903af1721b7eee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,44 @@ Build-Depends: debhelper (>= 4.0.0), intltool, hildon-base-lib-dev, hildon-libs-
 Standards-Version: 3.6.0
 
 Package: maemo-mapper
-Architecture: any
-Description: A mapping package for the maemo platform.
- It contains a complete application for displaying maps and annotating them
- with information from a GPS receiver.
+Architecture: armel
+Pre-Depends: maemo-select-menu-location
+Depends: ${shlibs:Depends}
+Description: Maemo Mapper is geographical mapping softare specifically designed
+ for the Maemo platform and the Nokia 770 form factor.  It includes support for
+ visualizing GPS input, but is functional and useful without GPS hardware.  It
+ also includes features for downloading and interacting with maps, GPX data
+ (including driving directions), and other geo-related information.  It focuses
+ in part on in-car navigation and usability.
+ Home page: http://www.gnuite.com/nokia770/maemo-mapper
+XB-Maemo-Icon-26:
+ iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAF/ElEQVRIS42WyXMbxxXGf92z
+ YidgkCAkrrCokCLDRLJLsSwvB1duLl9S5UMcl33Vxf9LDi5Xbr6lUpWDqnxKVeJYthbLUUm2
+ ZIqyqHAFCS4idmBmMAN0DkOCEhPKeaf5uqff1/3e16+f4P80pVQBmAF+CxjAP4DHwKIQovui
+ tQDiRZNKqULQ7V3Z2K29v1NpjWVTUYbTMRCC0n6DnUqLwYHY/ngu9YVt6p8JIb47ydf/JFJK
+ xYKg98dSufHxtftrmiYF58/kKTccpBBYhobbCUgnItxdKuH5XV6bOa0K+fQ1y9T/IITY/Fki
+ pdTk01r76lffr84PxG1Gh5Iopbi5UOTSuREW158Ssw3GhlLcehiOdXs9qk2P1e0qb86P7Y7n
+ Bn4nhLh+IpFSarK4V//673eXRzp+l3jE5JWzeVqOTyYZwe92qTZcTEMjYumYuk6t6RKxDe48
+ 2qLpdpBScOncaHt2YvBdIcQ/D33LZ0hiT2vtq4ckUgouTOW58WCDO4+3aLkdvn1YpN7yaDod
+ /rUYjt1+tMn1B+tcOJtHCkGvp7i5sB5dLlX+eiCg54mCbu/Tr75fne/4oYB+Vchxf3mHoNcj
+ Yuk4XoDjBdTaIVHL82m7PlHLIOj2eLCyw/zLuYNNw9f31zJNx/uLUkr2iZRShbXt6gcz41le
+ OZtnbCiJoWtUmy4Ak8NplrcqHLflUoXJ/AAAlYaLoUlGskl+fWaYi9OnWd6qvgq8B6ADBN3e
+ lVuLRb3t+liGxpvz47idgEvnRlBALh0j6PZIJ2wilo5l6ggEpqHx8qkMiYiFEKBrkpnxLDd+
+ 3KDt+QghGBlKfgJc1QE2dmvvt10fAM/v4ng+N37cAEK1XJ4bY6/awjJ0TEOj11O4fkC97VFu
+ ONx+VESp8JSX50Zpe6EvpRSr29W3lVLDUilVKJWbY4fhiNsmjXbnEBKLmFRbLpWmy3alyX7d
+ odp02S43KTfC75ht9v9vtDvEn8HFvboE3pLATLnu9CcGEjblxhFORi3qLY+TrN7ySEatPi43
+ HAbidh/vh76ndWDK0CXZVBSAbCpCo9Xp40wygucHfZyO29im3seWqZE0LDpBqFZL10jETFw/
+ 6JO1Xf+sDpi2qfcHLUPHt3oEvR4AtqEjBMRsI8RmKIbnsP4MtnQs4wgDKKVMHXhSa3lsl5sA
+ dLsKBBT36gD4QQ9dk6zv1gDIpqLEbIO1nRCPDaUIug5b+w0ARgaT1Fpef70mJdGI+UQCj5+N
+ abXpkklE+rje9kjGjnJw3JIxi3r7KIeZRIRqw+3jgbiNgMcSWMyl4/uHE023QyJ6pJqm0yER
+ MTENjUTUJGYbRCyDZNTCMjQSEZOmc6TSRNSk6R7hU9mEAm7oQoiu4/lfGLr2sR90kUKga5Lf
+ zJxGirDmDr8UZ7YzSCfoYhkapqEjRXhhhzNxXp8dRR1cJFPX0KSg2wvxRC61IIRY0gFsU//s
+ /Jnhj+SB5+1Kk3Q8wq2HRQBmJwYp7tWptbzncjQQs+n4XR6u7QHw2swIxb06r/7iFFIIqk2X
+ /EuJT+Gg1gkhvpsZy36zsLLLtw+L/LS+f/CwhblbKVUp5NMct8KpNCvbYQ0ciNt4fsDSZpnb
+ i5vc+WmLucmhDeDzPhGAZeq/f31udFfKMFz3/73DLydz6Jqk7flEbQMpwNQlhhaG57Cq61Iy
+ X8jxw/JOfxPnp/JBOhH5QAjhwn8/fG8srO797ebCelSpsBydnxqm2nLJZxIANNoehi4J755g
+ r9IiETO5u7TdF8XMeFa9MTd2RUr5p0Pf/RMBCCGuz04MvvvOhULZNDQG4jaGppFNRvny3gqO
+ 57O0WWZtp4bjBXx5b4Vk3EIKwWAqihSCi9Ong+MkcHJzUmg43p9L+82L135YI2YbXJjKU2k4
+ iIPmxOkEZBIR7j0p0Wh3uDh9irGh1FomGf1QCPHNcZ8ntlsHL+N75Ybzyep29e3SfkOODqUY
+ z6WQQrBcqrJSqpDLxNVELrVwoK7PD3Ny3F7Y1x2aUmoYeAuY9vzgsuqhW5Z+W4QN5A0hxNLP
+ uOA/AyGmQAcU4EEAAAAASUVORK5CYII=

diff --git a/debian/postinst b/debian/postinst
new file mode 100644 (file)
index 0000000..fc447d7
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+# The clock might be wrong and we know that we need to update the icon
+# cache so we just force it.
+
+gtk-update-icon-cache -f /usr/share/icons/hicolor
+
+# Now that the icon cache is uptodate, we move the .desktop file into
+# place.  Doing this only now prevents the Task navigator from
+# reconstructing the menu before the icon is available.  This trick is
+# not really necessary when using maemo-select-menu-location (as we do
+# below), since maemo-select-menu-location will trigger the
+# reconstructing of the Taks navigator menu as well.
+
+( cd /usr/share/applications/hildon/ && mv maemo-mapper.inactive maemo-mapper.desktop )
+
+# Now we are ready to let the user move the entry around, but only if
+# this is a new install
+
+oldversion="$2"
+if [ -z "$oldversion" ]; then
+  maemo-select-menu-location maemo-mapper.desktop
+fi
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/prerm b/debian/prerm
new file mode 100644 (file)
index 0000000..b7386f7
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+# remove configuration
+
+if [ "$1" = "purge" ]; then
+    gconftool-2 --recursive-unset "/apps/maemo-mapper"
+fi
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/rules b/debian/rules
index dee7c4b75149345246a62e2d6f60370d8c72170f..914a7ba6afd74eaa54b9b13961cad3364e8c1f92 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,7 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-
+#export DH_VERBOSE=1
 
 
 CFLAGS = -Wall -g
@@ -16,9 +14,11 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 else
        CFLAGS += -O2
 endif
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
+
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -g -O0 -DDEBUG
 endif
@@ -60,6 +60,10 @@ install: build
        # Add here commands to install the package
        $(MAKE) install DESTDIR=$(CURDIR)/debian/maemo-mapper
 
+        # See postinst for why we do this.
+       ( cd $(CURDIR)/debian/maemo-mapper/usr/share/applications/hildon \
+          && mv maemo-mapper.desktop maemo-mapper.inactive                    \
+        )
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -89,9 +93,9 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
-#      dh_makeshlibs
+       dh_makeshlibs
        dh_installdeb
-#      dh_shlibdeps
+       dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/pkg_maemo-mapper.26.png b/maemo-mapper.26.png
similarity index 100%
rename from pkg_maemo-mapper.26.png
rename to maemo-mapper.26.png

diff --git a/pkg_maemo-mapper.40.png b/maemo-mapper.40.png
similarity index 100%
rename from pkg_maemo-mapper.40.png
rename to maemo-mapper.40.png

diff --git a/pkg_maemo-mapper.64.png b/maemo-mapper.64.png
similarity index 100%
rename from pkg_maemo-mapper.64.png
rename to maemo-mapper.64.png

diff --git a/maemo-mapper.c b/maemo-mapper.c
index f44e957b446e00d8f1c58cae9f1bec63d6e864dd..ab66957818222c3c7b781b133af5f77cbd6c79e2 100644 (file)
--- a/maemo-mapper.c
+++ b/maemo-mapper.c
@@ -23,7 +23,6 @@
 
 #define _GNU_SOURCE
 
-#include <config.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -2312,7 +2311,11 @@ window_present()
     gtk_window_present(GTK_WINDOW(_window));
 
     /* Re-enable any banners that might have been up. */
-    set_conn_state(_conn_state);
+    {
+        ConnState old_state = _conn_state;
+        set_conn_state(RCVR_OFF);
+        set_conn_state(old_state);
+    }
 
     vprintf("%s(): return\n", __PRETTY_FUNCTION__);
     return FALSE;
@@ -4986,8 +4989,6 @@ menu_cb_maps_dlarea(GtkAction *action)
             label = gtk_label_new("View Center"),
             0, 1, 2, 3, GTK_FILL, 0, 4, 0);
     gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-    unit2latlon(_center.unitx, _center.unity, lat, lon);
-    unit2latlon(_prev_center.unitx, _prev_center.unity, prev_lat, prev_lon);
     gtk_table_attach(GTK_TABLE(table),
             lbl_center_lat = gtk_label_new(""),
             1, 2, 2, 3, GTK_FILL, 0, 4, 0);
@@ -5010,12 +5011,10 @@ menu_cb_maps_dlarea(GtkAction *action)
     gtk_table_attach(GTK_TABLE(table),
             dlarea_info.txt_topleft_lat = gtk_entry_new(),
             1, 2, 3, 4, GTK_EXPAND | GTK_FILL, 0, 4, 0);
-    sprintf(buffer, "%2.6f", MAX(lat, prev_lat));
     gtk_entry_set_alignment(GTK_ENTRY(dlarea_info.txt_topleft_lat), 1.f);
     gtk_table_attach(GTK_TABLE(table),
             dlarea_info.txt_topleft_lon = gtk_entry_new(),
             2, 3, 3, 4, GTK_EXPAND | GTK_FILL, 0, 4, 0);
-    sprintf(buffer, "%2.6f", MIN(lon, prev_lon));
     gtk_entry_set_alignment(GTK_ENTRY(dlarea_info.txt_topleft_lon), 1.f);
 
     /* Bottom Right. */
@@ -5026,12 +5025,10 @@ menu_cb_maps_dlarea(GtkAction *action)
     gtk_table_attach(GTK_TABLE(table),
             dlarea_info.txt_botright_lat = gtk_entry_new(),
             1, 2, 4, 5, GTK_EXPAND | GTK_FILL, 0, 4, 0);
-    sprintf(buffer, "%2.6f", MIN(lat, prev_lat));
     gtk_entry_set_alignment(GTK_ENTRY(dlarea_info.txt_botright_lat), 1.f);
     gtk_table_attach(GTK_TABLE(table),
             dlarea_info.txt_botright_lon = gtk_entry_new(),
             2, 3, 4, 5, GTK_EXPAND | GTK_FILL, 0, 4, 0);
-    sprintf(buffer, "%2.6f", MAX(lon, prev_lon));
     gtk_entry_set_alignment(GTK_ENTRY(dlarea_info.txt_botright_lon), 1.f);
 
 
@@ -5054,26 +5051,34 @@ menu_cb_maps_dlarea(GtkAction *action)
     }
 
     /* Initialize fields. */
-    sprintf(buffer, "%f", _pos_lat);
+    sprintf(buffer, "%2.6f", _pos_lat);
     gtk_label_set_text(GTK_LABEL(lbl_gps_lat), buffer);
-    sprintf(buffer, "%f", _pos_lon);
+    sprintf(buffer, "%2.6f", _pos_lon);
     gtk_label_set_text(GTK_LABEL(lbl_gps_lon), buffer);
-    sprintf(buffer, "%f", lat);
+
+    unit2latlon(_center.unitx, _center.unity, lat, lon);
+    sprintf(buffer, "%2.6f", lat);
     gtk_label_set_text(GTK_LABEL(lbl_center_lat), buffer);
-    sprintf(buffer, "%f", lon);
+    sprintf(buffer, "%2.6f", lon);
     gtk_label_set_text(GTK_LABEL(lbl_center_lon), buffer);
 
-    /* Zoom check boxes. */
+    unit2latlon(_prev_center.unitx, _prev_center.unity, prev_lat, prev_lon);
+    sprintf(buffer, "%2.6f", MAX(lat, prev_lat));
     gtk_entry_set_text(GTK_ENTRY(dlarea_info.txt_topleft_lat), buffer);
+    sprintf(buffer, "%2.6f", MIN(lon, prev_lon));
     gtk_entry_set_text(GTK_ENTRY(dlarea_info.txt_topleft_lon), buffer);
+    sprintf(buffer, "%2.6f", MIN(lat, prev_lat));
     gtk_entry_set_text(GTK_ENTRY(dlarea_info.txt_botright_lat), buffer);
+    sprintf(buffer, "%2.6f", MAX(lon, prev_lon));
     gtk_entry_set_text(GTK_ENTRY(dlarea_info.txt_botright_lon), buffer);
+
     for(i = 0; i < MAX_ZOOM; i++)
         gtk_toggle_button_set_active(
             GTK_TOGGLE_BUTTON(dlarea_info.chk_zoom_levels[_zoom - 1]), FALSE);
     gtk_toggle_button_set_active(
             GTK_TOGGLE_BUTTON(dlarea_info.chk_zoom_levels[_zoom - 1]), TRUE);
 
+
     gtk_widget_show_all(dialog);
 
     while(GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog)))

diff --git a/maemo-mapper.desktop b/maemo-mapper.desktop
index aee6d2a90f5bea5758f888d209c25326ff9e2fef..021d737ca0ad4b5866bb01199abf73efc61beb09 100644 (file)
--- a/maemo-mapper.desktop
+++ b/maemo-mapper.desktop
@@ -4,8 +4,8 @@ Version=1.0
 Type=Application
 Name=Maemo Mapper
 Exec=/usr/bin/maemo-mapper
-Icon=pkg_maemo-mapper
-X-Window-Icon=pkg_maemo-mapper
+Icon=maemo-mapper
+X-Window-Icon=maemo-mapper
 X-HildonDesk-ShowInToolbar=true
 X-Osso-Service=maemo_mapper
 X-Osso-Type=application/x-executable