[DebianGIS-dev] r1692 - in packages/gosmore/trunk/debian: . patches
nd-guest at alioth.debian.org
nd-guest at alioth.debian.org
Fri Jul 4 17:10:22 UTC 2008
Author: nd-guest
Date: 2008-07-04 17:10:21 +0000 (Fri, 04 Jul 2008)
New Revision: 1692
Added:
packages/gosmore/trunk/debian/gosmore.install
packages/gosmore/trunk/debian/patches/10-findresources.dpatch
Modified:
packages/gosmore/trunk/debian/
packages/gosmore/trunk/debian/changelog
packages/gosmore/trunk/debian/control
packages/gosmore/trunk/debian/gosmore.dirs
packages/gosmore/trunk/debian/patches/00list
packages/gosmore/trunk/debian/rules
Log:
prepare new gosmore snapshot.
Property changes on: packages/gosmore/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: packages/gosmore/trunk/debian/changelog
===================================================================
--- packages/gosmore/trunk/debian/changelog 2008-07-02 18:31:02 UTC (rev 1691)
+++ packages/gosmore/trunk/debian/changelog 2008-07-04 17:10:21 UTC (rev 1692)
@@ -1,9 +1,19 @@
-gosmore (0.0.0.20070901-4) UNRELEASED; urgency=low
+gosmore (0.0.0.20080704-1) UNRELEASED; urgency=low
+ [ Andreas Putzo ]
+ * New upstream snapshot fetched from svn, revision 8034.
+ * Backported patch 10-findresources to search for files.
+ not only in the current directory.
+ * Adapt CFLAGS in debian/rules.
+ * Added gosmore.install file.
+ * Bumped Standards-Version to 3.8.0.
+ * Added myself to Uploaders.
+
+ [ Petter Reinholdtsen ]
* Add josm as suggests.
* Add get-orig-source target to the rules file.
- -- Petter Reinholdtsen <pere at debian.org> Sat, 29 Mar 2008 13:50:08 +0100
+ -- Andreas Putzo <andreas at putzo.net> Fri, 04 Jul 2008 16:55:36 +0000
gosmore (0.0.0.20070901-3) unstable; urgency=low
Modified: packages/gosmore/trunk/debian/control
===================================================================
--- packages/gosmore/trunk/debian/control 2008-07-02 18:31:02 UTC (rev 1691)
+++ packages/gosmore/trunk/debian/control 2008-07-04 17:10:21 UTC (rev 1692)
@@ -2,9 +2,9 @@
Section: utils
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Petter Reinholdtsen <pere at debian.org>
+Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Petter Reinholdtsen <pere at debian.org>, Andreas Putzo <andreas at putzo.net>
Build-Depends: debhelper (>> 5.0.0), cdbs, libgtk2.0-dev, flite-dev, libgps-dev (>= 2.34.dfsg-5) | gpsd (<< 2.34.dfsg-1), dpatch
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://wiki.openstreetmap.org/index.php/Gosmore
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gosmore/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gosmore/trunk
@@ -18,4 +18,3 @@
Description: Openstreetmap.org viewer / wayfinder / search client
Gosmore is a openstreetmap.org viewer and wayfinder with support for
speech syntesis and fetching the current location from gpsd.
-
Modified: packages/gosmore/trunk/debian/gosmore.dirs
===================================================================
--- packages/gosmore/trunk/debian/gosmore.dirs 2008-07-02 18:31:02 UTC (rev 1691)
+++ packages/gosmore/trunk/debian/gosmore.dirs 2008-07-04 17:10:21 UTC (rev 1692)
@@ -1 +1,2 @@
usr/bin
+usr/share/gosmore
Added: packages/gosmore/trunk/debian/gosmore.install
===================================================================
--- packages/gosmore/trunk/debian/gosmore.install (rev 0)
+++ packages/gosmore/trunk/debian/gosmore.install 2008-07-04 17:10:21 UTC (rev 1692)
@@ -0,0 +1,3 @@
+elemstyles.xml usr/share/gosmore
+icons.csv usr/share/gosmore
+icons.xpm usr/share/gosmore
Modified: packages/gosmore/trunk/debian/patches/00list
===================================================================
--- packages/gosmore/trunk/debian/patches/00list 2008-07-02 18:31:02 UTC (rev 1691)
+++ packages/gosmore/trunk/debian/patches/00list 2008-07-04 17:10:21 UTC (rev 1692)
@@ -0,0 +1 @@
+10-findresources
Added: packages/gosmore/trunk/debian/patches/10-findresources.dpatch
===================================================================
--- packages/gosmore/trunk/debian/patches/10-findresources.dpatch (rev 0)
+++ packages/gosmore/trunk/debian/patches/10-findresources.dpatch 2008-07-04 17:10:21 UTC (rev 1692)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-findresources.dpatch by Andreas Putzo <andreas at putzo.net>
+##
+## DP: Search for files first in current directory, then in ~/.gosmre/, then
+## DP: in $(prefix)/share/gosmore/.
+## DP: Backported from upstream svn revision 8642.
+
+ at DPATCH@
+diff -urNad gosmore-0.0.0.20080704~/gosmore.cpp gosmore-0.0.0.20080704/gosmore.cpp
+--- gosmore-0.0.0.20080704~/gosmore.cpp 2008-07-04 16:41:19.000000000 +0000
++++ gosmore-0.0.0.20080704/gosmore.cpp 2008-07-04 16:42:16.000000000 +0000
+@@ -4,7 +4,9 @@
+ #define WIN32_LEAN_AND_MEAN
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/stat.h>
+ #include <string.h>
++#include <string>
+ #include <math.h>
+ #include <ctype.h>
+ #include <assert.h>
+@@ -57,6 +59,7 @@
+ #endif
+ #ifdef _WIN32_WCE
+ #define gtk_widget_queue_clear(x) // After Click() returns we Invalidate
++
+ struct GtkWidget {
+ struct {
+ int width, height;
+@@ -67,6 +70,16 @@
+ struct GdkEventButton {
+ int x, y, button;
+ };
++#else
++const char *FindResource (char *fname)
++{
++ static std::string s;
++ struct stat dummy;
++ if (stat (fname, &dummy) == 0) return fname;
++ s = (std::string) getenv ("HOME") + "/.gosmore/" + fname;
++ if (stat (s.c_str (), &dummy) != 0) s = (std::string) RES_DIR + fname;
++ return s.c_str ();
++}
+ #endif
+
+ #define TILEBITS (18)
+@@ -857,7 +870,7 @@
+ &routeColour, FALSE, TRUE);
+ gdk_gc_set_fill (mygc, GDK_SOLID);
+ icons = gdk_pixmap_create_from_xpm (draw->window, NULL, NULL,
+- "icons.xpm");
++ FindResource ("icons.xpm"));
+ }
+
+ GdkRectangle clip;
+@@ -1544,7 +1557,9 @@
+ int defaultRestrict[2 << STYLE_BITS];
+ memset (defaultRestrict, 0, sizeof (defaultRestrict));
+ FILE *icons_csv = fopen ("icons.csv", "r");
+- xmlTextReaderPtr sXml = xmlNewTextReaderFilename ("elemstyles.xml");
++ if (!icons_csv) icons_csv = fopen (FindResource ("icons.csv"), "r");
++ xmlTextReaderPtr sXml = xmlNewTextReaderFilename (
++ FindResource ("elemstyles.xml"));
+ if (!sXml || !icons_csv) {
+ fprintf (stderr, "Either icons.csv or elemstyles.xml not found\n");
+ return 3;
Property changes on: packages/gosmore/trunk/debian/patches/10-findresources.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/gosmore/trunk/debian/rules
===================================================================
--- packages/gosmore/trunk/debian/rules 2008-07-02 18:31:02 UTC (rev 1691)
+++ packages/gosmore/trunk/debian/rules 2008-07-04 17:10:21 UTC (rev 1692)
@@ -6,17 +6,17 @@
DESTDIR := $(CURDIR)/debian/gosmore
DEB_MAKE_INSTALL_TARGET := DESTDIR=$(DESTDIR) prefix=/usr install
-# Enable route finding
-CFLAGS := -DROUTE_TEST
+CFLAGS := -DRES_DIR='\"/usr/share/gosmore/\"'
SVNREPO := http://svn.openstreetmap.org/applications/rendering/gosmore
+SVNREV := 8034
DATE := $(shell date +%Y%m%d)
get-orig-source:
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading gosmore from ${SVNREPO}
- svn export ${SVNREPO} ../tarballs/gosmore-0.0.0.${DATE}
+ svn -r $(SVNREV) export ${SVNREPO} ../tarballs/gosmore-0.0.0.${DATE}
@echo Building snapshot tarball
tar czf ../tarballs/gosmore_0.0.0.${DATE}.orig.tar.gz -C ../tarballs gosmore-0.0.0.${DATE}
@echo Cleaning up
More information about the Pkg-grass-devel
mailing list