[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 3316669aaf23602253937e4e5b3629a8631c759c Author: David Paleino da...@debian.org Date: Sat Feb 20 21:46:52 2010 +0100 Fix file permissions without touching the upstream source. diff --git a/debian/rules b/debian/rules index

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 2e31b2a548a1afa8e368475e7e3bb66bb88f45a9 Author: David Paleino da...@debian.org Date: Sun Feb 21 00:06:47 2010 +0100 Trick epydoc into documenting the compiled module too diff --git a/debian/rules b/debian/rules index

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit e24e2360db4767e4ecad31582ca3a3fb5d01fbc2 Author: David Paleino da...@debian.org Date: Sun Feb 21 00:05:26 2010 +0100 01-generate_local_docs.patch added, tell epydoc to generate docs from local code, don't look for a

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit f960710f5bd72080ad12e4a871dfa4e9e9b6fd7d Author: David Paleino da...@debian.org Date: Sat Feb 20 10:40:03 2010 +0100 Put remaining install actions inside the overriden loop diff --git a/debian/rules b/debian/rules index

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 62b96261ffb86b87bc7fd7d56f16df17e0af2b8a Author: David Paleino da...@debian.org Date: Sat Feb 20 11:47:14 2010 +0100 Remove stale scons configuration files in the py* loop diff --git a/debian/rules b/debian/rules index

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit fdb50757822845efebd66847e3b7b509a7678a3f Author: David Paleino da...@debian.org Date: Sat Feb 20 15:38:49 2010 +0100 Improve overriden targets diff --git a/debian/rules b/debian/rules index f49fdbe..99d506d 100755 ---

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 5496f570e8cd446f8cba080f1e91335e1a12a94a Author: David Paleino da...@debian.org Date: Sat Feb 20 15:57:19 2010 +0100 added scons build-dependency, don't use the embedded one diff --git a/debian/changelog b/debian/changelog

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 09e762de4dccd1c407fea28f42a56511da621bd6 Author: David Paleino da...@debian.org Date: Sat Feb 20 16:58:28 2010 +0100 Fix dh7 command ordering, it was deleting debian/tmp (!!!) diff --git a/debian/rules b/debian/rules index

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 46286219aa22c8587c26370ab05f20d9952be2dd Author: David Paleino da...@debian.org Date: Sat Feb 20 17:10:24 2010 +0100 debian/rules: fix wrong passing of CFLAGS diff --git a/debian/rules b/debian/rules index 6fed138..51a0aed

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 7c74c9fc1d53dc8c01e69adf2e4bf48a8abc90bb Author: David Paleino da...@debian.org Date: Sat Feb 20 17:16:38 2010 +0100 Revert changes to upstream sources made by old maintainer. diff --git a/demo/README b/demo/README deleted

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit f1ed6c91f9640958f4c36f94c3d35dea70a4e84a Author: David Paleino da...@debian.org Date: Sat Feb 20 17:54:21 2010 +0100 added ${misc:Depends} where missing diff --git a/debian/changelog b/debian/changelog index e40e16d..8da8a7b

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit c76d422b65bd84a97168694266f33b395a5a586e Author: David Paleino da...@debian.org Date: Sat Feb 20 18:18:51 2010 +0100 debian/copyright updated to be DEP-5-compliant diff --git a/debian/changelog b/debian/changelog index

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit ffdc6a61865d23d0bd677ebedd140b6cfc4f909e Author: David Paleino da...@debian.org Date: Sat Feb 20 18:22:36 2010 +0100 The software is under LGPL-2.1+, not -2+ diff --git a/debian/copyright b/debian/copyright index

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit ab53067fa62232f2146c77f2ec17d2f29b3a79b9 Author: David Paleino da...@debian.org Date: Sat Feb 20 18:26:18 2010 +0100 Install mapnik-plugin-base via dh_install, not manually diff --git a/debian/libmapnik-dev.install

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 69e8ca5659d1207e0947f2594efa6a8fc7c68591 Author: David Paleino da...@debian.org Date: Sat Feb 20 19:03:52 2010 +0100 Try harder not to delete debian/tmp diff --git a/debian/rules b/debian/rules index ffea2b3..1ba68ce 100755

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 0c0e4070cf71cfde88c06d0c9b647e7586040c9f Author: David Paleino da...@debian.org Date: Sat Feb 20 20:14:36 2010 +0100 Enable generation of Python API docs diff --git a/debian/control b/debian/control index 70192a4..678646c

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 3316669aaf23602253937e4e5b3629a8631c759c Author: David Paleino da...@debian.org Date: Sat Feb 20 21:46:52 2010 +0100 Fix file permissions without touching the upstream source. diff --git a/debian/rules b/debian/rules index

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit e24e2360db4767e4ecad31582ca3a3fb5d01fbc2 Author: David Paleino da...@debian.org Date: Sun Feb 21 00:05:26 2010 +0100 01-generate_local_docs.patch added, tell epydoc to generate docs from local code, don't look for a

[DebianGIS-dev] [SCM] mapnik branch, master, updated. debian/0.6.1-1-46-g2e31b2a

2010-02-20 Thread David Paleino
The following commit has been merged in the master branch: commit 2e31b2a548a1afa8e368475e7e3bb66bb88f45a9 Author: David Paleino da...@debian.org Date: Sun Feb 21 00:06:47 2010 +0100 Trick epydoc into documenting the compiled module too diff --git a/debian/rules b/debian/rules index