[DebianGIS-dev] r2240 - in packages/osm2pgsql/trunk/debian: . patches

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2009-05-26 18:13:27 +0000 (Tue, 26 May 2009)
New Revision: 2240

Added:
   packages/osm2pgsql/trunk/debian/patches/01_style_location
Modified:
   packages/osm2pgsql/trunk/debian/install
   packages/osm2pgsql/trunk/debian/patches/00list
Log:
added patch from Frederik Ramm to install styles system-wide.


Modified: packages/osm2pgsql/trunk/debian/install
===================================================================
--- packages/osm2pgsql/trunk/debian/install	2009-05-26 17:57:31 UTC (rev 2239)
+++ packages/osm2pgsql/trunk/debian/install	2009-05-26 18:13:27 UTC (rev 2240)
@@ -1 +1,2 @@
 osm2pgsql /usr/bin/
+default.style /usr/share/osm2pgsql

Modified: packages/osm2pgsql/trunk/debian/patches/00list
===================================================================
--- packages/osm2pgsql/trunk/debian/patches/00list	2009-05-26 17:57:31 UTC (rev 2239)
+++ packages/osm2pgsql/trunk/debian/patches/00list	2009-05-26 18:13:27 UTC (rev 2240)
@@ -1 +1 @@
-#10-missing-includes
+01_style_location

Added: packages/osm2pgsql/trunk/debian/patches/01_style_location
===================================================================
--- packages/osm2pgsql/trunk/debian/patches/01_style_location	                        (rev 0)
+++ packages/osm2pgsql/trunk/debian/patches/01_style_location	2009-05-26 18:13:27 UTC (rev 2240)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_style_location.dpatch by  <fred at lochewe>
+##
+## DP: Change default location of style file
+
+ at DPATCH@
+diff -urNad old/osm2pgsql.c new/osm2pgsql.c
+--- old/osm2pgsql.c	(revision 14063)
++++ new/osm2pgsql.c	(working copy)
+@@ -483,7 +483,7 @@
+     fprintf(stderr, "   -p|--prefix\t\tPrefix for table names (default planet_osm)\n");
+     fprintf(stderr, "   -s|--slim\t\tStore temporary data in the database. This greatly\n");
+     fprintf(stderr, "            \t\treduces the RAM usage but is much slower.\n");
+-    fprintf(stderr, "   -S|--style\t\tLocation of the style file. Defaults to ./default.style\n");
++    fprintf(stderr, "   -S|--style\t\tLocation of the style file. Defaults to /usr/share/osm2pgsql/default.style\n");
+     fprintf(stderr, "   -C|--cache\t\tOnly for slim mode: Use upto this many MB for caching nodes\n");
+     fprintf(stderr, "             \t\tDefault is 800\n");
+     fprintf(stderr, "   -U|--username\tPostgresql user name.\n");
+@@ -592,7 +592,7 @@
+     const char *port = "5432";
+     const char *conninfo = NULL;
+     const char *prefix = "planet_osm";
+-    const char *style = "./default.style";
++    const char *style = "/usr/share/osm2pgsql/default.style";
+     const char *temparg;
+     int cache = 800;
+     struct output_options options;


Property changes on: packages/osm2pgsql/trunk/debian/patches/01_style_location
___________________________________________________________________
Added: svn:executable
   + *