This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository imposm.
commit 1c3265ae0c94db9b200b2700902b4159e8f58010 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Aug 31 13:44:09 2015 +0200 Undo modification of the upstream sources, restore 00-fix_sql_path.patch. Revert "Drop 00-fix_sql_path.patch, applied upstream." This reverts commit febebcbedc0e34882195da6b226a0367819d6a18. --- debian/changelog | 1 - debian/patches/00-fix_sql_path.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + imposm/psqldb.py | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26e76db..4e197f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,6 @@ imposm (2.6.0+ds-1) UNRELEASED; urgency=medium - Bump Standards-Version to 3.9.6, no changes - Update Vcs-Browser URL to use cgit instead of gitweb, and HTTPS * Add gbp.conf to use pristine-tar by default. - * Drop 00-fix_sql_path.patch, applied upstream. * Use pybuild buildsystem and enable parallel builds. * Add upstream metadata. * Repack upstream tarball to exclude .egg-info directory. diff --git a/debian/patches/00-fix_sql_path.patch b/debian/patches/00-fix_sql_path.patch new file mode 100644 index 0000000..7cdb8fb --- /dev/null +++ b/debian/patches/00-fix_sql_path.patch @@ -0,0 +1,20 @@ +From: David Paleino <da...@debian.org> +Subject: point to the correctly installed file +Origin: vendor +Forwarded: no + +--- + 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 new file mode 100644 index 0000000..d2a6d63 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +00-fix_sql_path.patch diff --git a/imposm/psqldb.py b/imposm/psqldb.py index f6dbc21..fdfff42 100644 --- a/imposm/psqldb.py +++ b/imposm/psqldb.py @@ -116,7 +116,7 @@ def main(): 'password': options.password, } - mapping['epsg900913_sql'] = '/usr/share/python-imposm/900913.sql' + mapping['epsg900913_sql'] = join(dirname(__file__), '900913.sql') find_sql_files(options.pg_version, options.postgis_version, mapping) if options.postgis_version == '2.0': -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel