[imposm] 25/27: Drop sql file location patch in favor of symlinks.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Mon Aug 31 17:47:31 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository imposm.

commit 4e4db109dfe7a67afb69d80690e974098240252f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 31 16:44:14 2015 +0200

    Drop sql file location patch in favor of symlinks.
---
 debian/changelog                     |  1 +
 debian/patches/00-fix_sql_path.patch | 20 --------------------
 debian/patches/series                |  1 -
 debian/python-imposm.links           |  1 +
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd49874..c45c647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ imposm (2.6.0+ds-1) UNRELEASED; urgency=medium
     python-psycopg2 & python-imposm-parser.
   * Override dh_auto_test to ignore test failures.
   * Add patch to fix Shapely geos_capi_version check.
+  * Drop sql file location patch in favor of symlinks.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 31 Aug 2015 13:40:19 +0200
 
diff --git a/debian/patches/00-fix_sql_path.patch b/debian/patches/00-fix_sql_path.patch
deleted file mode 100644
index 2fb97fe..0000000
--- a/debian/patches/00-fix_sql_path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: point to the correctly installed file
-Origin: vendor
-Forwarded: not-needed
-
----
- imposm/psqldb.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/imposm/psqldb.py
-+++ b/imposm/psqldb.py
-@@ -116,7 +116,7 @@ def main():
-         'password': options.password,
-     }
- 
--    mapping['epsg900913_sql'] = join(dirname(__file__), '900913.sql')
-+    mapping['epsg900913_sql'] = '/usr/share/python-imposm/900913.sql'
-     find_sql_files(options.pg_version, options.postgis_version, mapping)
- 
-     if options.postgis_version == '2.0':
diff --git a/debian/patches/series b/debian/patches/series
index a1da294..9b378af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-00-fix_sql_path.patch
 geos-capi-version.patch
diff --git a/debian/python-imposm.links b/debian/python-imposm.links
new file mode 100644
index 0000000..550d6f3
--- /dev/null
+++ b/debian/python-imposm.links
@@ -0,0 +1 @@
+usr/share/python-imposm/900913.sql usr/lib/python2.7/dist-packages/imposm/900913.sql

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git



More information about the Pkg-grass-devel mailing list