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

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-02-22 12:55:43 +0000 (Mon, 22 Feb 2010)
New Revision: 2727

Removed:
   packages/osm2pgsql/trunk/debian/patches/01_style_location.dpatch
Modified:
   packages/osm2pgsql/trunk/debian/changelog
   packages/osm2pgsql/trunk/debian/patches/00list
Log:
Final true fix :-/


Modified: packages/osm2pgsql/trunk/debian/changelog
===================================================================
--- packages/osm2pgsql/trunk/debian/changelog	2010-02-22 12:44:59 UTC (rev 2726)
+++ packages/osm2pgsql/trunk/debian/changelog	2010-02-22 12:55:43 UTC (rev 2727)
@@ -3,6 +3,7 @@
   * Added 900913.sql, containing EPSG:900913 for postgis, as example. (Andreas)
   * New upstream svn snapshot as taken from upstream svn. Now using svn release
     number instead of date to identify better the relevant snapshot.
+  * Patch 01_style_location merged upstream.
   * Added Vcs-* fields to debian/control.
   * Policy bumped to 3.8.4 without changes.
   * Added a new set of examples (gazetteer and other scripts).

Modified: packages/osm2pgsql/trunk/debian/patches/00list
===================================================================
--- packages/osm2pgsql/trunk/debian/patches/00list	2010-02-22 12:44:59 UTC (rev 2726)
+++ packages/osm2pgsql/trunk/debian/patches/00list	2010-02-22 12:55:43 UTC (rev 2727)
@@ -1 +1 @@
-01_style_location
+# no patch currently

Deleted: packages/osm2pgsql/trunk/debian/patches/01_style_location.dpatch
===================================================================
--- packages/osm2pgsql/trunk/debian/patches/01_style_location.dpatch	2010-02-22 12:44:59 UTC (rev 2726)
+++ packages/osm2pgsql/trunk/debian/patches/01_style_location.dpatch	2010-02-22 12:55:43 UTC (rev 2727)
@@ -1,28 +0,0 @@
-#! /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 13:43:32.000000000 +0100
-+++ osm2pgsql-0.69+r20104/osm2pgsql.c	2010-02-22 13:43:43.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;