[Pkg-osm-commits] [SCM] imposm-parser branch, master, updated. upstream/1.0.1+hg20110424.5307e5693e0c-9-gdc4a1de

[David Paleino]

The following commit has been merged in the master branch:
commit 6843aff0246bb544d61bc145aeb9ea5217222a22
Author: David Paleino <dapal at debian.org>
Date:   Sun Apr 24 20:51:29 2011 +0200

    More fixes

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..4cc9292
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+imposm/parser/pbf/osm.pb.cc
+imposm/parser/pbf/osm.pb.h
diff --git a/debian/control b/debian/control
index 7b16981..bfceab5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,10 @@ Maintainer: Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
 Uploaders: David Paleino <dapal at debian.org>
 Build-Depends: debhelper (>= 8~)
  , python-support
+ , python-setuptools
+ , python-all-dev
+ , libprotobuf-dev (>= 2.4)
+ , protobuf-compiler
 XS-Python-Version: >= 2.5
 Standards-Version: 3.9.2
 Homepage: http://dev.omniscale.net/imposm.parser/
@@ -12,8 +16,12 @@ Vcs-Git: git://git.debian.org/pkg-osm/imposm-parser.git
 Vcs-Browser: http://git.debian.org/?p=pkg-osm/imposm-parser.git;a=summary
 
 Package: python-imposm-parser
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Architecture: any
+Depends:
+ ${shlibs:Depends}
+ , ${python:Depends}
+ , ${misc:Depends}
+ , python (>= 2.6) | python-multiprocessing
 Description: Python module to parse OpenStreetMap data
  imposm.parser is a Python library that parses OpenStreetMap data in XML 
  and PBF format.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..9a94508
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/share/python-imposm-parser/tests/
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..8e43930
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,3 @@
+imposm/parser/test/test.osm      usr/share/python-imposm-parser/tests/
+imposm/parser/test/test.osm.bz2  usr/share/python-imposm-parser/tests/
+imposm/parser/test/test.pbf      usr/share/python-imposm-parser/tests/
diff --git a/debian/patches/00-fix_testfiles_location.patch b/debian/patches/00-fix_testfiles_location.patch
new file mode 100644
index 0000000..eb35435
--- /dev/null
+++ b/debian/patches/00-fix_testfiles_location.patch
@@ -0,0 +1,33 @@
+From: David Paleino <dapal at debian.org>
+Subject: move test files to /usr/share/python-imposm-parser/
+Origin: vendor
+Forwarded: no
+
+---
+ imposm/parser/test/test_simple_parser.py |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- imposm-parser.orig/imposm/parser/test/test_simple_parser.py
++++ imposm-parser/imposm/parser/test/test_simple_parser.py
+@@ -95,16 +95,16 @@ class ParserTestBaseWithFilter(ParserTes
+         eq_(len(self.relations), 0)
+         
+ class TestXML(ParserTestBase):
+-    osm_filename = 'test.osm'
++    osm_filename = '/usr/share/python-imposm-parser/tests/test.osm'
+ 
+ class TestBZIP2(ParserTestBase):
+-    osm_filename = 'test.osm.bz2'
++    osm_filename = '/usr/share/python-imposm-parser/tests/test.osm.bz2'
+ 
+ class TestPBF(ParserTestBase):
+-    osm_filename = 'test.pbf'
++    osm_filename = '/usr/share/python-imposm-parser/tests/test.pbf'
+ 
+ class TestXMLWithFilter(ParserTestBaseWithFilter):
+-    osm_filename = 'test.osm'
++    osm_filename = '/usr/share/python-imposm-parser/tests/test.osm'
+ 
+ class TestPBFWithFilter(ParserTestBaseWithFilter):
+-    osm_filename = 'test.pbf'
++    osm_filename = '/usr/share/python-imposm-parser/tests/test.pbf'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..162101b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00-fix_testfiles_location.patch
diff --git a/debian/rules b/debian/rules
index e05d7fc..8006b85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,8 @@
 %:
 	dh $@ \
 		--with python2
+
+override_dh_auto_install:
+	dh_auto_install
+
+	find $(CURDIR)/debian/python-imposm-parser/ -name "test.*" -delete

-- 
Python module to parse OpenStreetMap data