On 2018-04-28 18:24 +0200, Muri Nicanor wrote: > Hi Wookey, > > sorry for the delay- there is an ITP for nlohmann-json3 > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886865
Ah yes. Well, it looks like I've done that work 'accidentally' :-). Should this conflict with nlohmann-json, so only one or the other can be installed? If both can be installed then they need different paths, and software will fail to find the headers unless it is modified to use a #include "nlohmann3/json.hpp" or similar. If we go for that then a new nlohmann-json needs uploading which also conflicts with nlohmann-json3. nlohmann-json3 provides both a single-file interface and a multiple-file interface. horizon-eda expects the multiple-header interface (it includes nlohmann/json_fwd.hpp as well as nlohmann/json.hpp). I don't know this package well enough to know whether providing the multiple-header interface works for all the programs that expect to just include nlohmann/json.hpp and get everything? Maybe we ned to provide two (conflicting again?) json-dev packages: nlhomann-json3-single-dev and nlohmann-json3-dev (or whatever) to satisfy everyone (hopefully not - that seems excessive) I've updated the copyright for new files in v3.1.2 as well as the couple of small fixes for the build. And the changes for nlohmann-json -> nlohmann-json3 (Except I think the watch file is probably wrong now) OK. Suggested patch file for that attached. This one installs the multiple-file headers. I've also uploaded it to: http://wookware.org/software/repo/ if you want to download it/install it as-is. http://wookware.org/software/repo/pool/main/n/nlohmann-json3/ Wookey -- Principal hats: Linaro, Debian, Wookware, ARM http://wookware.org/
diff -Nru nlohmann-json-2.0.6/debian/changelog nlohmann-json3-3.1.2/debian/changelog --- nlohmann-json-2.0.6/debian/changelog 2016-10-23 21:49:30.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/changelog 2018-04-27 04:49:55.000000000 +0100 @@ -1,3 +1,9 @@ +nlohmann-json3 (3.1.2-1) unstable; urgency=medium + + * New upstream release + + -- Wookey <woo...@debian.org> Fri, 27 Apr 2018 04:49:55 +0100 + nlohmann-json (2.0.6-1) unstable; urgency=medium * New upstream version 2.0.5 diff -Nru nlohmann-json-2.0.6/debian/control nlohmann-json3-3.1.2/debian/control --- nlohmann-json-2.0.6/debian/control 2016-09-12 17:07:25.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/control 2018-04-27 04:49:55.000000000 +0100 @@ -1,4 +1,4 @@ -Source: nlohmann-json +Source: nlohmann-json3 Priority: optional Maintainer: Muri Nicanor <m...@immerda.ch> Build-Depends: @@ -6,18 +6,18 @@ doxygen, ghostscript, graphviz, - re2c, texlive-binaries, texlive-latex-base, Standards-Version: 3.9.8 Section: libs Homepage: https://nlohmann.github.io/json/ -Package: nlohmann-json-dev +Package: nlohmann-json3-dev Section: libdevel Architecture: all Depends: - ${misc:Depends}, + ${misc:Depends} +Conflicts: nlohmann-json-dev Description: JSON for Modern C++ JSON library with intuitive syntax, trivial integration and serious testing. Other aspects, as memory efficiency and speed were not so diff -Nru nlohmann-json-2.0.6/debian/copyright nlohmann-json3-3.1.2/debian/copyright --- nlohmann-json-2.0.6/debian/copyright 2016-09-12 17:07:25.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/copyright 2018-04-27 04:49:55.000000000 +0100 @@ -3,7 +3,15 @@ Source: https://github.com/nlohmann/json Files: * -Copyright: 2013-2016 Niels Lohmann +Copyright: 2013-2018 Niels Lohmann +License: MIT + +Files: include/nlohmann/detail/conversions/to_chars.hpp +Copyright: 2009 Florian Loitsch +License: MIT + +Files: include/nlohmann/detail/output/serializer.hpp +Copyright: 2008-2009 Bjoern Hoehrmann <bjo...@hoehrmann.de> License: MIT Files: debian/* @@ -14,6 +22,10 @@ Copyright: 2015 Christopher Gilbert License: MIT +Files: benchmarks/thirdyparty/benchmark/* +Copyright: Numerous, listed in benchmarks/thirdyparty/benchmark/AUTHORS +License: Apache-2.0 + Files: benchmarks/cxxopts.hpp Copyright: 2014 Jarryd Beck License: MIT @@ -22,15 +34,39 @@ Copyright: 2015 Louis Dionne License: BSL-1.0 -Files: test/src/catch.hpp -Copyright: 2012 Two Blue Cubes Ltd. All rights reserved. - Phil Nash <git...@philnash.me> -License: BSL-1.0 +Files: test/data/nst_json_testsuite/* +Copyright: 2016 Nicolas Seriot +License: MIT Files: test/data/json_testsuite/* Copyright: Yidong Fang License: Apache-2.0 +Files: test/data/markus_kuhn/UTF-8-test.txt +Copyright: 2015 Markus Kuhn <mg...@cl.cam.ac.uk> +License: CC-BY-4.0 + +Files: test/data/big-list-of-naughty-strings/LICENSE* +Copyright: 2015 Max Woolf +License: MIT + +Files: test/data/json-patch-tests/README.md +Copyright: 2014 The Authors +License: Apache-2.0 + +Files: test/thirdparty/catch/catch.hpp +Copyright: 2012 Two Blue Cubes Ltd. + Phil Nash <git...@philnash.me> +License: BSL-1.0 + +Files: test/thirdparty/Fuzzer +Copyright: University of Illinois at Urbana-Champaign +License: U-OF-I-BSD-LIKE + +Files: third_party/amalgamate/* +Copyright: 2012, Erik Edlund <erik.edl...@32767.se> +License: BSD-3-clause + License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -88,3 +124,386 @@ . On Debian systems, the full text of the Apache License version 2 can be found in /usr/share/common-licenses/Apache-2.0. + +License: U-OF-I-BSD-LIKE + ============================================================================== + LLVM Release License + ============================================================================== + University of Illinois/NCSA + Open Source License + . + Copyright (c) 2003-2017 University of Illinois at Urbana-Champaign. + All rights reserved. + . + Developed by: + . + LLVM Team + . + University of Illinois at Urbana-Champaign + . + http://llvm.org + . + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal with + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + . + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + . + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + . + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + . + 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 + CONTRIBUTORS OR COPYRIGHT HOLDERS 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 WITH THE + SOFTWARE. + +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 copyright holders may be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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. + +License: CC-BY-4.0 + Creative Commons Attribution 4.0 International Public License + . + By exercising the Licensed Rights (defined below), You accept and agree + to be bound by the terms and conditions of this Creative Commons + Attribution 4.0 International Public License ("Public License"). To the + extent this Public License may be interpreted as a contract, You are + granted the Licensed Rights in consideration of Your acceptance of + these terms and conditions, and the Licensor grants You such rights in + consideration of benefits the Licensor receives from making the + Licensed Material available under these terms and conditions. + . + Section 1 -- Definitions. + . + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + . + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + . + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + . + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + . + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + . + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + . + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + . + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + . + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + . + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + . + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + . + Section 2 -- Scope. + . + a. License grant. + . + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + . + a. reproduce and Share the Licensed Material, in whole or + in part; and + . + b. produce, reproduce, and Share Adapted Material. + . + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + . + 3. Term. The term of this Public License is specified in Section + 6(a). + . + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + . + 5. Downstream recipients. + . + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + . + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + . + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + . + b. Other rights. + . + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + . + 2. Patent and trademark rights are not licensed under this + Public License. + . + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + . + Section 3 -- License Conditions. + . + Your exercise of the Licensed Rights is expressly made subject to the + following conditions. + . + a. Attribution. + . + 1. If You Share the Licensed Material (including in modified + form), You must: + . + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + . + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + . + ii. a copyright notice; + . + iii. a notice that refers to this Public License; + . + iv. a notice that refers to the disclaimer of + warranties; + . + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + . + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + . + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + . + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + . + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + . + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + . + Section 4 -- Sui Generis Database Rights. + . + Where the Licensed Rights include Sui Generis Database Rights that + apply to Your use of the Licensed Material: + . + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + . + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + . + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + . + For the avoidance of doubt, this Section 4 supplements and does not + replace Your obligations under this Public License where the Licensed + Rights include other Copyright and Similar Rights. + . + Section 5 -- Disclaimer of Warranties and Limitation of Liability. + . + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + . + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + . + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + . + Section 6 -- Term and Termination. + . + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + . + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + . + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + . + 2. upon express reinstatement by the Licensor. + . + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + . + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + . + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + . + Section 7 -- Other Terms and Conditions. + . + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + . + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + . + Section 8 -- Interpretation. + . + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + . + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + . + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + . + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. \ No newline at end of file diff -Nru nlohmann-json-2.0.6/debian/nlohmann-json3-dev.doc-base nlohmann-json3-3.1.2/debian/nlohmann-json3-dev.doc-base --- nlohmann-json-2.0.6/debian/nlohmann-json3-dev.doc-base 1970-01-01 01:00:00.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/nlohmann-json3-dev.doc-base 2018-04-27 04:49:55.000000000 +0100 @@ -0,0 +1,9 @@ +Document: nlohmann-json +Title: JSON +Author: Niels Lohmann +Abstract: JSON for Modern C++ +Section: Programming + +Format: HTML +Index: /usr/share/doc/nlohmann-json3-dev/html/index.html +Files: /usr/share/doc/nlohmann-json3-dev/html/*.html diff -Nru nlohmann-json-2.0.6/debian/nlohmann-json3-dev.examples nlohmann-json3-3.1.2/debian/nlohmann-json3-dev.examples --- nlohmann-json-2.0.6/debian/nlohmann-json3-dev.examples 1970-01-01 01:00:00.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/nlohmann-json3-dev.examples 2016-09-12 17:07:25.000000000 +0100 @@ -0,0 +1 @@ +doc/examples/* diff -Nru nlohmann-json-2.0.6/debian/nlohmann-json3-dev.install nlohmann-json3-3.1.2/debian/nlohmann-json3-dev.install --- nlohmann-json-2.0.6/debian/nlohmann-json3-dev.install 1970-01-01 01:00:00.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/nlohmann-json3-dev.install 2018-04-27 04:49:55.000000000 +0100 @@ -0,0 +1,3 @@ +README.md usr/share/doc/nlohmann-json3-dev +doc/html usr/share/doc/nlohmann-json3-dev +include/nlohmann usr/include/ diff -Nru nlohmann-json-2.0.6/debian/nlohmann-json-dev.doc-base nlohmann-json3-3.1.2/debian/nlohmann-json-dev.doc-base --- nlohmann-json-2.0.6/debian/nlohmann-json-dev.doc-base 2016-09-12 17:07:25.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/nlohmann-json-dev.doc-base 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -Document: nlohmann-json -Title: JSON -Author: Niels Lohmann -Abstract: JSON for Modern C++ -Section: Programming - -Format: HTML -Index: /usr/share/doc/nlohmann-json-dev/html/index.html -Files: /usr/share/doc/nlohmann-json-dev/html/*.html diff -Nru nlohmann-json-2.0.6/debian/nlohmann-json-dev.examples nlohmann-json3-3.1.2/debian/nlohmann-json-dev.examples --- nlohmann-json-2.0.6/debian/nlohmann-json-dev.examples 2016-09-12 17:07:25.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/nlohmann-json-dev.examples 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -doc/examples/* diff -Nru nlohmann-json-2.0.6/debian/nlohmann-json-dev.install nlohmann-json3-3.1.2/debian/nlohmann-json-dev.install --- nlohmann-json-2.0.6/debian/nlohmann-json-dev.install 2016-09-12 17:07:25.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/nlohmann-json-dev.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -README.md usr/share/doc/nlohmann-json-dev -doc/html usr/share/doc/nlohmann-json-dev -src/json.hpp usr/include/ diff -Nru nlohmann-json-2.0.6/debian/rules nlohmann-json3-3.1.2/debian/rules --- nlohmann-json-2.0.6/debian/rules 2016-09-12 17:07:25.000000000 +0100 +++ nlohmann-json3-3.1.2/debian/rules 2018-04-27 04:49:55.000000000 +0100 @@ -10,12 +10,13 @@ override_dh_clean: dh_clean make -C doc clean + rm -f -r doc/xml override_dh_auto_test: make all override_dh_auto_build: - make re2c make -C doc rm -f doc/html/*.md5 rm -f doc/html/jquery.js +
signature.asc
Description: PGP signature
