Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch upgrade, preferred form for making modifications #24

Merged
merged 2 commits into from Sep 19, 2013

Conversation

kapouer
Copy link
Contributor

@kapouer kapouer commented Sep 6, 2013

This is mainly about redistributability of the embedded copy of Catch
in the test suite. For example debian policy requires source code to
be distributed in its "preferred form for making modifications".

I took the opportunity to upgrade Catch to version 1.0 build 8, which
required some relatively obvious changes and one patch for Catch,
see catchorg/Catch2#195.

@springmeyer
Copy link
Contributor

Thanks for helping upgrade catch. As far as distributing catch in its non amalgamated form, wouldn't that make sense only for a catch .deb itself. Why would a test framework need to be modified?

Also, in general are you thinking of packaging mapnik-vector-tile as a .deb? If so can you explain why? I would prefer this not be packaged. It should rather be considered to be part of node-mapnik.

@kapouer
Copy link
Contributor Author

kapouer commented Sep 7, 2013

The single file catch.hpp can be indeed rebuilt from source when there is a catch.deb.
I postponed packaging Catch just because it looked to be near a 1.0 release (and also
it needed to be patched to compile).

I'm an early adopter of your great work on vector tiles, so the idea was to
package an up-to-date mapnik/tilelive stack. Debian is currently at the start
of a new release cycle, so there will be plenty of time before those packages
hit next stable release.
I understand mapnik-vector-tile is bound to be used only by node-mapnik,
and suppose you had a reason to externalize it. If that's the case, it is
perfectly all right to build node-mapnik deb out of multiple source tarballs,
that are node-mapnik.tar.gz + mapnik-vector-tile.tar.gz.

@kapouer
Copy link
Contributor Author

kapouer commented Sep 15, 2013

  • catch debian package uploaded

@kapouer
Copy link
Contributor Author

kapouer commented Sep 15, 2013

  • kept single file catch

@springmeyer
Copy link
Contributor

node-mapnik deb out of multiple source tarballs, that are node-mapnik.tar.gz + mapnik-vector-tile.tar.gz.

That would be excellent. The idea of the repo being external on github is so that it can have its own test suite and because this code is a candidate for inclusion in mapnik core at some point. But as I said, and as it sounds like you understand, currently this code should functionally be considered sources of node-mapnik only (or sources of whatever app uses it - in the future I plan standalone python bindings). So I really do not want the situation where this repo is it own .deb because that would be very hard to keep in sync. Right now its dead easy to keep in sync because of the way npm/package.json works but I can't imagine that working as well with .debs.

Anyway, thanks for packaging mapnik and node-mapnik in debian, which is awesome.

springmeyer pushed a commit that referenced this pull request Sep 19, 2013
Catch upgrade, preferred form for making modifications
@springmeyer springmeyer merged commit c0d9a0c into mapbox:master Sep 19, 2013
springmeyer pushed a commit that referenced this pull request Sep 19, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants