Debian patches #246
Merged
Debian patches #246
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Patch by David Paleino <dapal@debian.org>
Patch by Andrew Harvey <andrew.harvey4@gmail.com>
Tilestache uses PIL.Image.fromstring, which has been deprecated in Pillow since 2.0.0, and has now been removed in 3.0.0. Patch by Eric Soroos <eric-debian@soroos.net>
|
@sebastic I'm trying to go over old PRs. Could you fix the conflicts and merge master into your branch? |
Conflicts: TileStache/Mapnik.py TileStache/Pixels.py
|
Merge conflicts have been solved, unless new ones have appeared in the mean time. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR forwards patches included in the tilestache Debian package.
The first commit (93b5e82) fixes the manpage syntax to prevent warnings from the lintian QA tool by escaping the minus signs.
The second commit (92885db) supports modestmaps versions >= 2.0.0.
The third commit (4aa3a22) adds support for Pillow 3.0.0.
The fourth commit (dade8b2) fixes a syntax error in the Pillow 3.0.0 changes.