[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit bf2952397f64ce43a2adffd1de1a15fb422ed240 Merge: 6c1be2e3071c4cb4263c15aaab341460ae0b3f37 cb96010c8af238dc6036aeeb314199fa3815ed7b Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 10:39:02 2013 +0200 Merge tag 'upstream/2.2.0+ds1' Upstream version 2.2.0+ds1 # gpg: Signature faite le dim. 11 août 2013 10:38:58 CEST avec la clef RSA d'identifiant DD39F374 # gpg: Bonne signature de « Jérémy Lal kapo...@melix.org » # gpg: alias « Jérémy Lal je...@edagames.com » -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 8052212a4fce8de1fb81497e7372ae68d7e1a0b7 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 13:01:12 2013 +0200 Copyright format 1.0 diff --git a/debian/copyright b/debian/copyright index 960ae42..50ee82f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,10 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://github.com/mapnik/mapnik/ + Repackaged to remove the following third-party software: + - SCons 1.2.0 + - SCons 2.1.0.alpha.20101125 + - DejaVu fonts 2.33 + - TinyXML Files: debian/* Copyright: © 2006-2009, Dominic Hargreaves d...@earth.li @@ -21,7 +27,6 @@ License: GPL-2 with exception fonts are released under the terms of the GNU GPL version 2, with the exception that embedding the font in a document does not in itself bind that document to the terms of the GPL. -X-Comment: see fonts/unifont_license.txt Files: * Copyright: © 2006-2009, Artem Pavlenko @@ -42,7 +47,7 @@ License: LGPL-2.1+ You should have received a copy of the GNU Lesser General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -X-Comment: on Debian systems, the complete text of the GNU Lesser General +Comment: on Debian systems, the complete text of the GNU Lesser General Public License v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. License: GPL-2+ @@ -59,5 +64,5 @@ License: GPL-2+ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -X-Comment: on Debian systems, the complete text of the GNU General Public +Comment: on Debian systems, the complete text of the GNU General Public License v2 can be found in `/usr/share/common-licenses/GPL-2'. -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 59c69366daed18f005501af15c6449a43ee7e90e Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 12:58:17 2013 +0200 rules: get-orig-source move generated tarballs to ../tarballs diff --git a/debian/rules b/debian/rules index 8e5bc90..2d6d44c 100755 --- a/debian/rules +++ b/debian/rules @@ -81,18 +81,19 @@ override_dh_auto_test: --with python2 get-orig-source: - uscan \ + mkdir -p ../tarballs uscan \ --verbose \ --force-download \ --download-version $(UPVER) \ --rename \ - --destdir . + --destdir ../tarballs - tar xvf mapnik_$(UPVER).orig.tar.gz @rm -vrf mapnik_$(UPVER).orig.tar.gz + tar xvf ../tarballs/mapnik_$(UPVER).orig.tar.gz @echo Removing third-party sources from orig.tar.gz @rm -rf mapnik-$(UPVER)/fonts/dejavu* @rm -rf mapnik-$(UPVER)/scons/ tar cf $(TARNAME) mapnik-$(UPVER)/ gzip -9 $(TARNAME) rm -rf mapnik-$(UPVER)/ + mv $(TARNAME) ../tarballs/$(TARNAME) -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 73dd7c35b24795af8b40025115597db97419f9ce Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 13:03:35 2013 +0200 copyright: update agg license from upstream, mapnik had a wrong copy. diff --git a/debian/copyright b/debian/copyright index 09eea0c..e8a3715 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,14 +12,11 @@ Copyright: © 2006-2009, Dominic Hargreaves d...@earth.li © 2010-2011, David Paleino da...@debian.org License: GPL-2+ -Files: agg/* -Copyright: © 2002-2005, Maxim McSeem Shemanarev -License: other - Permission to copy, use, modify, sell and distribute this software - is granted provided this copyright notice appears in all copies. - This software is provided as is without express or implied - warranty, and with no claim as to its suitability for any purpose. - +Files: deps/agg/* +Copyright: © 2002-2005, Maxim Shemanarev (McSeem) +License: agg or BSD-3-clause +Comment: upstream mapnik forgot to update deps/agg/copying, see + https://github.com/mapnik/mapnik/issues/1982 Files: * Copyright: © 2006-2009, Artem Pavlenko @@ -59,3 +56,38 @@ License: GPL-2+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Comment: on Debian systems, the complete text of the GNU General Public License v2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: agg + Permission to copy, use, modify, sell and distribute this software + is granted provided this copyright notice appears in all copies. + This software is provided as is without express or implied + warranty, and with no claim as to its suitability for any purpose. + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + . + 3. The name of the author may not be used to endorse or promote + products derived from this software without specific prior + written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 94d7e46235eeec1042a61ae35a112840935efccd Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 13:03:57 2013 +0200 copyright: ocd 80 diff --git a/debian/copyright b/debian/copyright index e8a3715..9bf6e07 100644 --- a/debian/copyright +++ b/debian/copyright @@ -34,9 +34,9 @@ License: LGPL-2.1+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . - You should have received a copy of the GNU Lesser General Public - License along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU Lesser General Public License + along with this package; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Comment: on Debian systems, the complete text of the GNU Lesser General Public License v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 72cfe87e66f1e10c646a6c3fe288e56035118b38 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 13:02:27 2013 +0200 Repackaging: remove useless and with incomplete license unifont-5.1 file. diff --git a/debian/copyright b/debian/copyright index 50ee82f..09eea0c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,6 +4,7 @@ Source: https://github.com/mapnik/mapnik/ - SCons 1.2.0 - SCons 2.1.0.alpha.20101125 - DejaVu fonts 2.33 + - unifont-5.1 - TinyXML Files: debian/* @@ -19,14 +20,6 @@ License: other This software is provided as is without express or implied warranty, and with no claim as to its suitability for any purpose. -Files: fonts/unifont-5.1.20080907.ttf -Copyright: © -License: GPL-2 with exception - My software and is released under the terms of the GNU General Public License - (GNU GPL) version 2.0, or (at your option) a later version. The precompiled - fonts are released under the terms of the GNU GPL version 2, with the - exception that embedding the font in a document does not in itself bind that - document to the terms of the GPL. Files: * Copyright: © 2006-2009, Artem Pavlenko diff --git a/debian/rules b/debian/rules index ba79735..1a0c38d 100755 --- a/debian/rules +++ b/debian/rules @@ -92,6 +92,7 @@ get-orig-source: tar xvf ../tarballs/mapnik_$(UPVER).orig.tar.gz @echo Removing third-party sources from orig.tar.gz @rm -r mapnik-$(UPVER)/fonts/dejavu* + @rm mapnik-$(UPVER)/fonts/unifont* @rm -r mapnik-$(UPVER)/scons/ tar cf $(TARNAME) mapnik-$(UPVER)/ gzip -9 $(TARNAME) -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 5636475c5f13b44bf22ca42c4273226a4266907b Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 13:02:59 2013 +0200 rules: get-orig-source: do not remove tarball diff --git a/debian/rules b/debian/rules index 1a0c38d..622fc04 100755 --- a/debian/rules +++ b/debian/rules @@ -88,7 +88,6 @@ get-orig-source: --rename \ --destdir ../tarballs - @rm -vrf mapnik_$(UPVER).orig.tar.gz tar xvf ../tarballs/mapnik_$(UPVER).orig.tar.gz @echo Removing third-party sources from orig.tar.gz @rm -r mapnik-$(UPVER)/fonts/dejavu* -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 3e30d88217aaa36ea5888426fac0edb66b4ec297 Merge: c34cbd7b1bdcac6b512b507a7228edd455198e99 66bf3f9477172fb3774529d069de2386de1e766a Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 13:11:15 2013 +0200 Merge tag 'upstream/2.2.0+ds1' Upstream version 2.2.0+ds1 # gpg: Signature faite le dim. 11 août 2013 13:11:12 CEST avec la clef RSA d'identifiant DD39F374 # gpg: Bonne signature de « Jérémy Lal kapo...@melix.org » # gpg: alias « Jérémy Lal je...@edagames.com » -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit c34cbd7b1bdcac6b512b507a7228edd455198e99 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 13:09:53 2013 +0200 copyright and repack: list removed software in README.source, mention it. diff --git a/debian/README.source b/debian/README.source index af1b1c3..d90417f 100644 --- a/debian/README.source +++ b/debian/README.source @@ -7,10 +7,12 @@ mapnik for Debian - SCons 1.2.0 - SCons 2.1.0.alpha.20101125 - DejaVu fonts 2.33 + - Unifont 5.1 - TinyXML To obtain the tarball used to build this package, run: $ debian/rules get-orig-source - -- David Paleino da...@debian.org Tue, 27 Sep 2011 01:01:16 +0200 + -- Jérémy Lal kapo...@melix.org Sun, 11 Aug 2013 13:08:39 +0200 + diff --git a/debian/copyright b/debian/copyright index 9bf6e07..4ec83d7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: https://github.com/mapnik/mapnik/ - Repackaged to remove the following third-party software: - - SCons 1.2.0 - - SCons 2.1.0.alpha.20101125 - - DejaVu fonts 2.33 - - unifont-5.1 - - TinyXML + Repackaged to remove some third-party software, see debian/README.source. Files: debian/* Copyright: © 2006-2009, Dominic Hargreaves d...@earth.li -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 3f08b6e5e496e8b6ff4a5a8b15dceaf1d6c7da7d Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 17:38:21 2013 +0200 Copyright: demo/data/* Geogratis license diff --git a/debian/copyright b/debian/copyright index 5d9d013..9bd07e3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -23,6 +23,11 @@ Files: * Copyright: © 2006-2009, Artem Pavlenko © 2006-2009, Jean-Francois Doyon License: LGPL-2.1+ +Files: demo/data/* +Copyright: Her Majesty the Queen in Right of Canada, Department of + Natural Resources. All rights reserved. +License: Geogratis + License: LGPL-2.1+ This package is free software; you can redistribute it and/or @@ -118,3 +123,137 @@ License: BSL-1.0 LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: Geogratis + GEOGRATIS LICENCE AGREEMENT FOR UNRESTRICTED USE OF DIGITAL DATA + This is a legal agreement between you (Licensee) and Her Majesty + the Queen in Right of Canada (Canada), as represented by the + Minister of Natural Resources Canada. BY ACCESSING, DOWNLOADING, + PRINTING OR USING THE DATA, INFORMATION AND MATERIALS BEING + PROVIDED WITH, OR ACCESSIBLE PURSUANT TO THIS AGREEMENT, YOU ARE + AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT. IF YOU DO NOT + AGREE TO THE TERMS OF THIS AGREEMENT, YOU MUST IMMEDIATELY DISPOSE + OF ANY SUCH DATA, INFORMATION, MATERIALS AND ANY DERIVED PRODUCTS. + . + 1. WHEREAS Canada is the owner of the data (the Data) accessible + pursuant to the terms and conditions of this Agreement; + 2. AND WHEREAS the Licensee wishes to obtain certain rights to + the Data, on terms and conditions herein contained; + 3. AND WHEREAS Canada represents that it has full authority to grant + the rights desired by the Licensee on the terms and conditions + herein contained; + 4. AND WHEREAS the parties hereto are desirous of entering into a + licence agreement on the basis herein set forth. + . + NOW, THEREFORE, in consideration of the covenants contained in this + Agreement, the parties agree as follows: + . + 1.0 DEFINITIONS + . + 1. Canada's Data means any and all Data, the Intellectual Property + Rights of which vest with Canada. + 2. Data means any digital data, meta-data, or documentation subject + to the terms and conditions of this Agreement. + 3. Derivative Products means any product, system, sub-system, + device, component, material or software that incorporates or uses + any part of the Data. + 4. Intellectual Property Rights means any intellectual property + right recognised by law, including any intellectual property right + protected through legislation, such as that governing, but not + limited to, copyright and patents. + . + 2.0 LICENCE GRANT + . + 1. Subject to this Agreement, Canada hereby grants to the Licensee a + non-exclusive, fully paid, royalty-free right and licence to + exercise all Intellectual Property Rights in the Data. This + includes the right to use, incorporate, sublicense (with further + right of sublicensing), modify, improve, further develop, and + distribute the Data; and to manufacture and / or distribute + Derivative Products. + 2. The Intellectual Property Rights arising from any modification, + improvement, development or translation of the Data, or from the + manufacture of Derivative Products, effected by or for the + Licensee, shall vest in the Licensee or in such person as the + Licensee shall decide. + . + 3.0 PROTECTION AND ACKNOWLEDGEMENT OF SOURCE + . + 1. Use of the Data shall not be construed as an endorsement by Canada + of any Derivative Products. The Licensee shall identify the source + of the Data, in the following manner, where any of the Data are + redistributed, or contained within Derivative Products: + © Her Majesty the Queen in Right of Canada, Department of Natural + Resources. All rights reserved. + . + 4.0 WARRANTY, LIABILITY, INDEMNITY + . + 1. Canada makes no representation or warranty of any kind with + respect to the accuracy, usefulness, novelty, validity, scope, + completeness or currency of the Data and expressly disclaims + any implied warranty of merchantability or fitness for a + particular purpose of the Data. Canada does not ensure or + warrant compatibility with past, current or future versions of + any browser to access the site's Data. + 2. The Licensee shall have no recourse against Canada, whether by + way of any suit or action, for any loss, liability, damage or + cost that the Licensee may suffer or incur at any time, by + reason of the Licensee's possession or use of the Data. + 3. The Licensee shall indemnify Canada and its officers, + employees, agents and contractors from
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 6080ca74265a1893771da4803d6e4663648dd273 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 17:37:34 2013 +0200 copyright: add Upstream-Contact diff --git a/debian/copyright b/debian/copyright index 088a2ba..5d9d013 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,5 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: https://github.com/mapnik/mapnik/issues Source: https://github.com/mapnik/mapnik/ Repackaged to remove some third-party software, see debian/README.source. -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit cbcc1f9b7ede57ec596e189905969a0f01499f70 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 17:40:33 2013 +0200 Remove README.source. What is said there is already said in copyright. diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index d90417f..000 --- a/debian/README.source +++ /dev/null @@ -1,18 +0,0 @@ -mapnik for Debian -= - - The mapnik tarball has been repackaged to remove the following third-party - software: - - - SCons 1.2.0 - - SCons 2.1.0.alpha.20101125 - - DejaVu fonts 2.33 - - Unifont 5.1 - - TinyXML - - To obtain the tarball used to build this package, run: - - $ debian/rules get-orig-source - - -- Jérémy Lal kapo...@melix.org Sun, 11 Aug 2013 13:08:39 +0200 - -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit a5295d9841242cbf94e3d3bbd7678af6f69a4c81 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 17:38:44 2013 +0200 Copyright: add myself diff --git a/debian/copyright b/debian/copyright index 9bd07e3..8208394 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,8 +4,9 @@ Source: https://github.com/mapnik/mapnik/ Repackaged to remove some third-party software, see debian/README.source. Files: debian/* -Copyright: © 2006-2009, Dominic Hargreaves d...@earth.li - © 2010-2011, David Paleino da...@debian.org +Copyright: 2006-2009 Dominic Hargreaves d...@earth.li + 2010-2011 David Paleino da...@debian.org + 2013 Jérémy Lal kapo...@melix.org License: GPL-2+ Files: boost/* -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 8471a63b320680506e5e26469a3195735fa710c3 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 15:05:20 2013 +0200 copyright: add license for boost files diff --git a/debian/copyright b/debian/copyright index 4ec83d7..088a2ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,6 +7,11 @@ Copyright: © 2006-2009, Dominic Hargreaves d...@earth.li © 2010-2011, David Paleino da...@debian.org License: GPL-2+ +Files: boost/* +Copyright: 2008 Federico J. Fernandez, + 2004-2007 2007 Christian Henning +License: BSL-1.0 + Files: deps/agg/* Copyright: © 2002-2005, Maxim Shemanarev (McSeem) License: agg or BSD-3-clause @@ -86,3 +91,29 @@ License: BSD-3-clause STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: BSL-1.0 + Permission is hereby granted, free of charge, to any person or + organization obtaining a copy of the software and accompanying + documentation covered by this license (the Software) to use, + reproduce, display, distribute, execute, and transmit the Software, + and to prepare derivative works of the Software, and to permit + third-parties to whom the Software is furnished to do so, all + subject to the following: + . + The copyright notices in the Software and this entire statement, + including the above license grant, this restriction and the + following disclaimer, must be included in all copies of the + Software, in whole or in part, and all derivative works of the + Software, unless such copies or derivative works are solely in the + form of machine-executable object code generated by a source + language processor. + . + THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND + NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE + DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER + LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT + OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 55f6d2395357c105bfd904bf3ed3355e9f6ebc5b Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 17:43:27 2013 +0200 Update changelog diff --git a/debian/changelog b/debian/changelog index c35d504..18db5ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,13 @@ mapnik (2.2.0+ds1-1) UNRELEASED; urgency=low * Bump Standards-Version to 3.9.4, no changes needed [ Jérémy Lal ] - * New upstream version 2.2 + * New upstream version 2.2 + * Copyright: entire tarball review. Switch to copyright 1.0 format. + * DFSG-exclusions: ++ deps/agg/include/agg_conv_gpc.h ++ tests/data/fonts/XB\ Zar.ttf + * Conveniently exclude some big data files used in tests, or files +with undocumented licenses. -- David Paleino da...@debian.org Sun, 21 Apr 2013 10:40:52 +0200 -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 3800ee09e4b65374ec4023b3568ddfb2605dc5f4 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 17:40:12 2013 +0200 Copyright: add several missing sections. Document DFSG repackaging in source. diff --git a/debian/copyright b/debian/copyright index 8208394..8135f07 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,30 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: https://github.com/mapnik/mapnik/issues Source: https://github.com/mapnik/mapnik/ - Repackaged to remove some third-party software, see debian/README.source. + Repackaged to exclude non-DFSG files in + ./deps/agg/include/agg_conv_gpc.h (from non-free software) + ./tests/data/fonts/XB\ Zar.ttf (cannot find upstream) + ./tests/data/fonts/LICENCE.txt (refers to a dead url) + Conveniently, remove unused software to simplify this file maintenance: + ./scons + ./fonts/dejavu* + ./fonts/unifont* + ./tests/data/fonts/DejaVuSansMono-BoldOblique.ttf + ./tests/data/csv/10m-land.csv + ./tests/data/raster/* + ./tests/data/shp/ne_110m* + ./tests/data/shp/world_merc* + ./tests/data/shp/new_zealand/ne_50m* + +Files: * +Copyright: 2006-2013 Artem Pavlenko + 2005-2012 Jean-Francois Doyon + 2010 Robert Coup + 2006 10East Corp. + 2008 Tom Hughes + 2009 Dane Springmeyer + 2011 Hermann Kraus +License: LGPL-2.1+ Files: debian/* Copyright: 2006-2009 Dominic Hargreaves d...@earth.li @@ -9,26 +32,67 @@ Copyright: 2006-2009 Dominic Hargreaves d...@earth.li 2013 Jérémy Lal kapo...@melix.org License: GPL-2+ -Files: boost/* -Copyright: 2008 Federico J. Fernandez, - 2004-2007 2007 Christian Henning +Files: boost/geometry/* +Copyright: 2008 Federico J. Fernandez +License: BSL-1.0 + +Files: boost/gil/* +Copyright: 2004-2007 Christian Henning +License: BSL-1.0 + +Files: include/mapnik/hash_variant.cpp +Copyright: 2011 Antony Polukhin License: BSL-1.0 Files: deps/agg/* -Copyright: © 2002-2005, Maxim Shemanarev (McSeem) +Copyright: 2002-2005 Maxim Shemanarev (McSeem) + 2005 Tony Juricic License: agg or BSD-3-clause Comment: upstream mapnik forgot to update deps/agg/copying, see https://github.com/mapnik/mapnik/issues/1982 -Files: * -Copyright: © 2006-2009, Artem Pavlenko - © 2006-2009, Jean-Francois Doyon -License: LGPL-2.1+ +Files: deps/agg/include/agg_conv_clipper.h, + deps/clipper/src/clipper.cpp, + deps/clipper/include/clipper.hpp +Copyright: 2010-2013 Angus Johnson +License: BSL-1.0 + +Files: deps/mapnik/sparsehash/* +Copyright: 2005-2010 Google Inc. +License: BSD-3-clause + Files: demo/data/* Copyright: Her Majesty the Queen in Right of Canada, Department of Natural Resources. All rights reserved. License: Geogratis +Files: src/miniz.c +Copyright: none (Public Domain) +License: public-domain + This is free and unencumbered software released into the public domain. + . + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + . + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the benefit + of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + . + THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + . + For more information, please refer to http://unlicense.org/ License: LGPL-2.1+ This package is free software; you can redistribute it and/or -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, pristine-tar, updated. b641dde67ef3b672f164b75c102162abdab1c48a
The following commit has been merged in the pristine-tar branch: commit 4c4ad9e35937ffb1cf9d3db89a2b5bbb379b4fbf Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 13:11:12 2013 +0200 pristine-tar data for mapnik_2.2.0+ds1.orig.tar.gz diff --git a/mapnik_2.2.0+ds1.orig.tar.gz.delta b/mapnik_2.2.0+ds1.orig.tar.gz.delta index 3e055f1..54bae88 100644 Binary files a/mapnik_2.2.0+ds1.orig.tar.gz.delta and b/mapnik_2.2.0+ds1.orig.tar.gz.delta differ diff --git a/mapnik_2.2.0+ds1.orig.tar.gz.id b/mapnik_2.2.0+ds1.orig.tar.gz.id index 6fc559a..97206a3 100644 --- a/mapnik_2.2.0+ds1.orig.tar.gz.id +++ b/mapnik_2.2.0+ds1.orig.tar.gz.id @@ -1 +1 @@ -7f77ca05704ce0dfccc1e0648aeccadf6fad5392 +99be83fc238994b68306bd07bfa53f4454d4e724 -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, pristine-tar, updated. b641dde67ef3b672f164b75c102162abdab1c48a
The following commit has been merged in the pristine-tar branch: commit b641dde67ef3b672f164b75c102162abdab1c48a Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 17:49:10 2013 +0200 pristine-tar data for mapnik_2.2.0+ds1.orig.tar.gz diff --git a/mapnik_2.2.0+ds1.orig.tar.gz.delta b/mapnik_2.2.0+ds1.orig.tar.gz.delta index 54bae88..f1215a0 100644 Binary files a/mapnik_2.2.0+ds1.orig.tar.gz.delta and b/mapnik_2.2.0+ds1.orig.tar.gz.delta differ diff --git a/mapnik_2.2.0+ds1.orig.tar.gz.id b/mapnik_2.2.0+ds1.orig.tar.gz.id index 97206a3..c397c48 100644 --- a/mapnik_2.2.0+ds1.orig.tar.gz.id +++ b/mapnik_2.2.0+ds1.orig.tar.gz.id @@ -1 +1 @@ -99be83fc238994b68306bd07bfa53f4454d4e724 +2e9bf792a7a4b00ae98d3d5c705bc43349190845 -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 5ce3aedaf9ff44eaa0ee8b274871b8d9b3073d70 Merge: 1887582b5403720270dc4039a3f73bf992a33c52 db3a1f8cb39eae988b4709057a6b848e7a60b02b Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 17:49:14 2013 +0200 Merge tag 'upstream/2.2.0+ds1' Upstream version 2.2.0+ds1 # gpg: Signature faite le dim. 11 août 2013 17:49:10 CEST avec la clef RSA d'identifiant DD39F374 # gpg: Bonne signature de « Jérémy Lal kapo...@melix.org » # gpg: alias « Jérémy Lal je...@edagames.com » -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-45-g5ce3aed
The following commit has been merged in the master branch: commit 1887582b5403720270dc4039a3f73bf992a33c52 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 17:47:42 2013 +0200 Fix get-orig-source diff --git a/debian/rules b/debian/rules index c65a15b..b93bd00 100755 --- a/debian/rules +++ b/debian/rules @@ -81,28 +81,28 @@ override_dh_auto_test: --with python2 get-orig-source: - mkdir -p ../tarballs uscan \ + mkdir -p ../tarballs + uscan \ --verbose \ --force-download \ --download-version $(UPVER) \ --rename \ --destdir ../tarballs - tar xvf ../tarballs/mapnik_$(UPVER).orig.tar.gz @echo Removing third-party sources from orig.tar.gz @rm -r mapnik-$(UPVER)/fonts/dejavu* @rm mapnik-$(UPVER)/fonts/unifont* @rm -r mapnik-$(UPVER)/scons/ - @rm deps/agg/include/agg_conv_gpc.h - @rm tests/data/fonts/DejaVuSansMono-BoldOblique.ttf - @rm tests/data/fonts/XB\ Zar.ttf - @rm tests/data/fonts/LICENCE.txt - @rm tests/data/csv/10m-land.csv - @rm tests/data/raster/* - @rm tests/data/shp/ne_110m* - @rm tests/data/shp/world_merc* - @rm tests/data/shp/new_zealand/ne_50m* + @rm mapnik-$(UPVER)/deps/agg/include/agg_conv_gpc.h + @rm mapnik-$(UPVER)/tests/data/fonts/DejaVuSansMono-BoldOblique.ttf + @rm mapnik-$(UPVER)/tests/data/fonts/XB\ Zar.ttf + @rm mapnik-$(UPVER)/tests/data/fonts/LICENCE.txt + @rm mapnik-$(UPVER)/tests/data/csv/10m-land.csv + @rm mapnik-$(UPVER)/tests/data/raster/* + @rm mapnik-$(UPVER)/tests/data/shp/ne_110m* + @rm mapnik-$(UPVER)/tests/data/shp/world_merc* + @rm mapnik-$(UPVER)/tests/data/shp/new_zealand/ne_50m* tar cf $(TARNAME) mapnik-$(UPVER)/ - gzip -9 $(TARNAME) rm -rf mapnik-$(UPVER)/ - mv $(TARNAME) ../tarballs/$(TARNAME) + gzip -9 $(TARNAME) + mv $(TARNAME).gz ../tarballs/ -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, pristine-tar, updated. b641dde67ef3b672f164b75c102162abdab1c48a
The following commit has been merged in the pristine-tar branch: commit bcf137383b74e79e788b762790a4d4afbf85d589 Author: Jérémy Lal kapo...@melix.org Date: Sun Aug 11 10:38:58 2013 +0200 pristine-tar data for mapnik_2.2.0+ds1.orig.tar.gz diff --git a/mapnik_2.2.0+ds1.orig.tar.gz.delta b/mapnik_2.2.0+ds1.orig.tar.gz.delta new file mode 100644 index 000..3e055f1 Binary files /dev/null and b/mapnik_2.2.0+ds1.orig.tar.gz.delta differ diff --git a/mapnik_2.2.0+ds1.orig.tar.gz.id b/mapnik_2.2.0+ds1.orig.tar.gz.id new file mode 100644 index 000..6fc559a --- /dev/null +++ b/mapnik_2.2.0+ds1.orig.tar.gz.id @@ -0,0 +1 @@ +7f77ca05704ce0dfccc1e0648aeccadf6fad5392 -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik annotated tag, upstream/2.2.0+ds1, created. upstream/2.2.0+ds1
The annotated tag, upstream/2.2.0+ds1 has been created at 7024a968355ba44d499a36dcf8ca32caf8dc934d (tag) tagging db3a1f8cb39eae988b4709057a6b848e7a60b02b (commit) replaces upstream/2.1.0+ds1 tagged by Jérémy Lal on Sun Aug 11 17:49:10 2013 +0200 - Shortlog Upstream version 2.2.0+ds1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABCAAGBQJSB7J2AAoJEGYRwF7dOfN0ekgP/R3KvJkG0KCncXXG2jT8wqfE tBYZyHGzWmSr2iGN9cnWoNE7uSUBlATTrI/RQBNW0/jpMvcW9BRbVjhOI+cjUcd3 ZCHXqjhQEnTpeArDIhhZynJSCWy0arQSsR+PizwmXl4Uyn1MkJbjjYtdqJ1o4k0x mHumlYzLSBSaiChQe55CtRxqZ1HqqwCpxSVaIG1lcW38Vr+J3YsEI4gV2ftbJxAd 6HRItVWBy1I4jniq9iGM5bZNI1PoaZS0vvNB3KxCkCqA35m4meYYtvLDMXMbISzz WbWmdiT4TttbUGWVoEGPE4daOAgy5r0lzjK7oF4eAy/alwYmKCDcWWnebScR4ntB RTC9hov9+5doRou8q4tZWh6OU2j/jI+GzfHuTHTnOzefhr9+f0+FaJzWxfo8ZZ8+ YDSccEGlJMJK6bkjfoz5MFcwEO3Rvxq4qLnREDJhrxkk5uEXcBUlvopcVZ+cSUWN wMAq0XkrygfMB9KkH6Orldzz8w0Z9m12q5eSXWpoHk3dpKcYHCVqZ+OXpahmU/jJ FyZjC15QbkOw9obLuwnZmyB0lpdtD+xKHmuYEWiT8NvlQB9Cf5krjrn7iGFDvf4F 97+1A2LHysdizgGIEgypF2JnKkNU+Ow1O/mEx5R+8v4G6J5TxwICW8nsRq7oddy9 oENMlYpvTxhiyf2DeJnR =ct9a -END PGP SIGNATURE- Jérémy Lal (3): Imported Upstream version 2.2.0+ds1 Imported Upstream version 2.2.0+ds1 Imported Upstream version 2.2.0+ds1 --- -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-46-gad75c5a
The following commit has been merged in the master branch: commit ad75c5acf6ee08dcb1d95f57a5055bd703f95272 Author: YunQiang Su wzss...@gmail.com Date: Mon Aug 12 00:12:35 2013 +0800 Add YunQiang Su to copyright holders for debian/* diff --git a/debian/copyright b/debian/copyright index 8135f07..f877e23 100644 --- a/debian/copyright +++ b/debian/copyright @@ -30,6 +30,7 @@ Files: debian/* Copyright: 2006-2009 Dominic Hargreaves d...@earth.li 2010-2011 David Paleino da...@debian.org 2013 Jérémy Lal kapo...@melix.org + 2013 YunQiang Su wzss...@gmail.com License: GPL-2+ Files: boost/geometry/* -- C++/Python toolkit for developing GIS applications ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
