-
Committer:
Package Import Robot
-
Author(s):
Allison Randal
-
Date:
2013-01-19 10:42:27 UTC
-
mfrom:
(3.1.8 sid)
-
Revision ID:
package-import@ubuntu.com-20130119104227-ygecm3dad7uzet3s
Tags: 2.10~pre4-6.dfsg-5.2ubuntu1
* Merge from Debian unstable, remaining changes:
- scripts/geo-code: Changed executing environment from /bin/sh
to /bin/bash. Resequenced as debian/patches/106-lp-325288.dpatch
- Preserved config.{guess,sub} override.
* Dropped changes:
- debian/patches/107-fix-disable-mapnik.dpatch: now upstream in Debian.
- debian/patches/105-fix-xcursor-check.dpatch removed,
in Debian as 104-fix-xcursor-check.dpatch.
- debian/patches/106-add-boost-links.dpatch removed,
in Debian as 105-add-boost-links.dpatch.