[DebianGIS-dev] r2301 - in packages/gosmore/trunk/debian: . patches

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2009-06-22 21:02:53 +0000 (Mon, 22 Jun 2009)
New Revision: 2301

Removed:
   packages/gosmore/trunk/debian/patches/10-findresources.dpatch
Modified:
   packages/gosmore/trunk/debian/changelog
   packages/gosmore/trunk/debian/patches/00list
   packages/gosmore/trunk/debian/rules
Log:
new svn snapshot, api0.6 compatible


Modified: packages/gosmore/trunk/debian/changelog
===================================================================
--- packages/gosmore/trunk/debian/changelog	2009-06-22 13:20:36 UTC (rev 2300)
+++ packages/gosmore/trunk/debian/changelog	2009-06-22 21:02:53 UTC (rev 2301)
@@ -1,3 +1,12 @@
+gosmore (0.0.0.20090618-1) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * New upstream snapshot fetched from svn, revision 15979. (Closes: #533372)
+  * Removed debian/ and map-icons/ dirs from tarball in get-orig-source target.
+  * Removed 10-findresources.dpatch, applied upstream.
+
+ -- Andreas Putzo <andreas at putzo.net>  Thu, 18 Jun 2009 09:50:26 +0000
+
 gosmore (0.0.0.20080704-1) unstable; urgency=low
 
   [ Andreas Putzo ]

Modified: packages/gosmore/trunk/debian/patches/00list
===================================================================
--- packages/gosmore/trunk/debian/patches/00list	2009-06-22 13:20:36 UTC (rev 2300)
+++ packages/gosmore/trunk/debian/patches/00list	2009-06-22 21:02:53 UTC (rev 2301)
@@ -1 +1 @@
-10-findresources
+#10-findresources

Deleted: packages/gosmore/trunk/debian/patches/10-findresources.dpatch
===================================================================
--- packages/gosmore/trunk/debian/patches/10-findresources.dpatch	2009-06-22 13:20:36 UTC (rev 2300)
+++ packages/gosmore/trunk/debian/patches/10-findresources.dpatch	2009-06-22 21:02:53 UTC (rev 2301)
@@ -1,66 +0,0 @@
-#! /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;

Modified: packages/gosmore/trunk/debian/rules
===================================================================
--- packages/gosmore/trunk/debian/rules	2009-06-22 13:20:36 UTC (rev 2300)
+++ packages/gosmore/trunk/debian/rules	2009-06-22 21:02:53 UTC (rev 2301)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-  
+
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
@@ -9,7 +9,7 @@
 CFLAGS := -DRES_DIR='\"/usr/share/gosmore/\"'
 
 SVNREPO := http://svn.openstreetmap.org/applications/rendering/gosmore
-SVNREV := 8034
+SVNREV := 15979
 DATE := $(shell date +%Y%m%d)
 
 get-orig-source:
@@ -17,6 +17,10 @@
 	test -d ../tarballs/. || mkdir -p ../tarballs
 	@echo Downloading gosmore from ${SVNREPO}
 	svn -r $(SVNREV) export ${SVNREPO} ../tarballs/gosmore-0.0.0.${DATE}
+	@echo Removing debian dir
+	rm -rf ../tarballs/gosmore-0.0.0.${DATE}/debian
+	@echo Removing map-icons
+	rm -rf ../tarballs/gosmore-0.0.0.${DATE}/map-icons
 	@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