[Pkg-osm-commits] [SCM] imposm branch, master, updated. debian/2.4.0+dfsg-0.1-8-ge03391a

2012-12-12 Thread David Paleino
The following commit has been merged in the master branch:
commit 9543d7f80ff3603bd012b98b88e24768e91c485a
Author: David Paleino 
Date:   Mon Dec 10 19:25:45 2012 +0100

debhelper compat bumped to 9.

diff --git a/debian/changelog b/debian/changelog
index ffd5e85..26043e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ imposm (2.5.0-1) UNRELEASED; urgency=low
   * Acknowledge NMU.
   * New upstream version.
   * Standards-Version bump to 3.9.4, no changes needed.
+  * debhelper compat bumped to 9.
 
- -- David Paleino   Mon, 10 Dec 2012 19:24:59 +0100
+ -- David Paleino   Mon, 10 Dec 2012 19:25:36 +0100
 
 imposm (2.4.0+dfsg-0.1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 8d66a6d..7b2d3a7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian OpenStreetMap Team 
 Uploaders:
  David Paleino 
-Build-Depends: debhelper (>= 8~)
+Build-Depends: debhelper (>= 9~)
  , python-all-dev (>= 2.6.6-3~)
  , python-setuptools
  , libtokyocabinet-dev

-- 
Python importer for OpenStreetMap data

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits


[Pkg-osm-commits] [SCM] imposm branch, master, updated. debian/2.4.0+dfsg-0.1-8-ge03391a

2012-12-12 Thread David Paleino
The following commit has been merged in the master branch:
commit e5dea87b79a5e803d69887c1849a259f53acefa4
Author: David Paleino 
Date:   Wed Dec 12 22:04:07 2012 +0100

Patch refreshed

diff --git a/debian/patches/00-fix_sql_path.patch 
b/debian/patches/00-fix_sql_path.patch
index d0dc370..952752f 100644
--- a/debian/patches/00-fix_sql_path.patch
+++ b/debian/patches/00-fix_sql_path.patch
@@ -9,12 +9,12 @@ Forwarded: no
 
 --- imposm.orig/imposm/psqldb.py
 +++ imposm/imposm/psqldb.py
-@@ -88,7 +88,7 @@ def main():
+@@ -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, mapping)
- 
- template = string.Template(db_create_template)
+ find_sql_files(options.pg_version, options.postgis_version, mapping)
+ 
+ if options.postgis_version == '2.0':

-- 
Python importer for OpenStreetMap data

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits


[Pkg-osm-commits] [SCM] imposm branch, master, updated. debian/2.4.0+dfsg-0.1-8-ge03391a

2012-12-12 Thread David Paleino
The following commit has been merged in the master branch:
commit 40b451ce96b76d5a407b0b3eff7c418547600a3f
Author: David Paleino 
Date:   Mon Dec 10 19:25:08 2012 +0100

Standards-Version bump to 3.9.4, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index d0d3f77..ffd5e85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ imposm (2.5.0-1) UNRELEASED; urgency=low
 
   * Acknowledge NMU.
   * New upstream version.
+  * Standards-Version bump to 3.9.4, no changes needed.
 
- -- David Paleino   Mon, 10 Dec 2012 19:24:37 +0100
+ -- David Paleino   Mon, 10 Dec 2012 19:24:59 +0100
 
 imposm (2.4.0+dfsg-0.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4f16b50..8d66a6d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 8~)
  , cython
  , protobuf-compiler
  , libprotobuf-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://imposm.org/
 Vcs-Git: git://git.debian.org/pkg-osm/imposm.git
 Vcs-Browser: http://git.debian.org/?p=pkg-osm/imposm.git;a=summary

-- 
Python importer for OpenStreetMap data

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits


[Pkg-osm-commits] [SCM] imposm branch, master, updated. debian/2.4.0+dfsg-0.1-8-ge03391a

2012-12-12 Thread David Paleino
The following commit has been merged in the master branch:
commit e03391a7b4564695c9331cae520abc2e99b21afa
Author: David Paleino 
Date:   Wed Dec 12 22:04:29 2012 +0100

Uploading to experimental

diff --git a/debian/changelog b/debian/changelog
index 26043e4..7b25069 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-imposm (2.5.0-1) UNRELEASED; urgency=low
+imposm (2.5.0-1) experimental; urgency=low
 
   * Acknowledge NMU.
   * New upstream version.
   * Standards-Version bump to 3.9.4, no changes needed.
   * debhelper compat bumped to 9.
 
- -- David Paleino   Mon, 10 Dec 2012 19:25:36 +0100
+ -- David Paleino   Wed, 12 Dec 2012 22:04:12 +0100
 
 imposm (2.4.0+dfsg-0.1) unstable; urgency=low
 

-- 
Python importer for OpenStreetMap data

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits


[Pkg-osm-commits] [SCM] imposm branch, master, updated. debian/2.4.0+dfsg-0.1-8-ge03391a

2012-12-12 Thread David Paleino
The following commit has been merged in the master branch:
commit 28b26714733e8b31a2a0983bfa802ce85276c42e
Author: David Paleino 
Date:   Mon Dec 10 19:24:49 2012 +0100

New upstream version.

diff --git a/debian/changelog b/debian/changelog
index 9ccabb2..d0d3f77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-imposm (2.4.0+dfsg-1) UNRELEASED; urgency=low
+imposm (2.5.0-1) UNRELEASED; urgency=low
 
   * Acknowledge NMU.
+  * New upstream version.
 
- -- David Paleino   Mon, 10 Dec 2012 19:21:34 +0100
+ -- David Paleino   Mon, 10 Dec 2012 19:24:37 +0100
 
 imposm (2.4.0+dfsg-0.1) unstable; urgency=low
 

-- 
Python importer for OpenStreetMap data

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits


[Pkg-osm-commits] [SCM] imposm branch, master, updated. debian/2.4.0+dfsg-0.1-8-ge03391a

2012-12-12 Thread David Paleino
The following commit has been merged in the master branch:
commit bbe6af7a868174441c9351456bd03a1f33b200df
Merge: aea5604be791c3b7c4878462b333e8f1ae05a452 
03271ca7a8799c0c9e21408cd32d97ba926496ba
Author: David Paleino 
Date:   Mon Dec 10 19:23:49 2012 +0100

Merge tag 'upstream/2.5.0'

Upstream version 2.5.0

# gpg: Signature made lun 10 dic 2012 19:23:46 CET using DSA key ID 1392B174
# gpg: Good signature from "David Paleino "
# gpg: aka "[jpeg image of size 6708]"
# gpg: aka "Hanska "
# gpg: aka "David Paleino "
# gpg: aka "David Paleino "


-- 
Python importer for OpenStreetMap data

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits