[DebianGIS-dev] r2725 - packages/osm2pgsql/trunk/debian/patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-02-22 12:35:48 +0000 (Mon, 22 Feb 2010)
New Revision: 2725

Added:
   packages/osm2pgsql/trunk/debian/patches/01_style_location.dpatch
Removed:
   packages/osm2pgsql/trunk/debian/patches/01_style_location
Log:
Missing patch added.


Deleted: packages/osm2pgsql/trunk/debian/patches/01_style_location
===================================================================
--- packages/osm2pgsql/trunk/debian/patches/01_style_location	2010-02-22 12:33:39 UTC (rev 2724)
+++ packages/osm2pgsql/trunk/debian/patches/01_style_location	2010-02-22 12:35:48 UTC (rev 2725)
@@ -1,27 +0,0 @@
-#! /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;

Added: packages/osm2pgsql/trunk/debian/patches/01_style_location.dpatch
===================================================================
--- packages/osm2pgsql/trunk/debian/patches/01_style_location.dpatch	                        (rev 0)
+++ packages/osm2pgsql/trunk/debian/patches/01_style_location.dpatch	2010-02-22 12:35:48 UTC (rev 2725)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_style_location.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' osm2pgsql-0.69+r20104~/osm2pgsql.c osm2pgsql-0.69+r20104/osm2pgsql.c
+--- osm2pgsql-0.69+r20104~/osm2pgsql.c	2010-02-22 10:57:44.000000000 +0100
++++ osm2pgsql-0.69+r20104/osm2pgsql.c	2010-02-22 10:59:33.000000000 +0100
+@@ -523,7 +523,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");
+@@ -643,7 +643,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;
+     const char *output_backend = "pgsql";
+     int cache = 800;


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