Merge branch 'markdown' into 'master'
Markdown
See merge request rust-team/debcargo-conf!197
Sylvestre Ledru
2 years ago
| 0 | rust-markdown (0.3.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
| 1 | ||
| 2 | * Package markdown 0.3.0 from crates.io using debcargo 2.4.4 | |
| 3 | * Fill in copyright | |
| 4 | * Add / correct information in control | |
| 5 | * Patch dev dependency "difference" from 0.4 to 2.0.0 | |
| 6 | * Lintian override for test fixtures that look like docs | |
| 7 | ||
| 8 | -- Christopher Hoskin <mans0954@debian.org> Thu, 27 May 2021 08:09:08 +0100 |
| 0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | |
| 1 | Upstream-Name: markdown | |
| 2 | Upstream-Contact: Johann Hofmann <mail@johann-hofmann.com> | |
| 3 | Source: https://github.com/johannhof/markdown.rs | |
| 4 | ||
| 5 | Files: * | |
| 6 | Copyright: 2014-2020 Johann Hofmann <mail@johann-hofmann.com> | |
| 7 | License: MIT or Apache-2.0 | |
| 8 | ||
| 9 | Files: tests/fixtures/* | |
| 10 | Copyright: | |
| 11 | 2003-2004, John Gruber | |
| 12 | 2005-2006 Fletcher T. Penney | |
| 13 | 2006-2009 Darren Kulp and Tomas Doran | |
| 14 | License: BSD-3-Clause | |
| 15 | ||
| 16 | Files: debian/* | |
| 17 | Copyright: | |
| 18 | 2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
| 19 | 2021 Christopher Hoskin <mans0954@debian.org> | |
| 20 | License: MIT or Apache-2.0 | |
| 21 | ||
| 22 | License: Apache-2.0 | |
| 23 | Debian systems provide the Apache 2.0 license in | |
| 24 | /usr/share/common-licenses/Apache-2.0 | |
| 25 | ||
| 26 | License: MIT | |
| 27 | Permission is hereby granted, free of charge, to any person obtaining a copy | |
| 28 | of this software and associated documentation files (the "Software"), to deal | |
| 29 | in the Software without restriction, including without limitation the rights | |
| 30 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
| 31 | copies of the Software, and to permit persons to whom the Software is | |
| 32 | furnished to do so, subject to the following conditions: | |
| 33 | . | |
| 34 | The above copyright notice and this permission notice shall be included in all | |
| 35 | copies or substantial portions of the Software. | |
| 36 | . | |
| 37 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 38 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 39 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
| 40 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
| 41 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
| 42 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
| 43 | SOFTWARE. | |
| 44 | ||
| 45 | License: BSD-3-Clause | |
| 46 | Redistribution and use in source and binary forms, with or without | |
| 47 | modification, are permitted provided that the following conditions are | |
| 48 | met: | |
| 49 | . | |
| 50 | * Redistributions of source code must retain the above copyright notice, | |
| 51 | this list of conditions and the following disclaimer. | |
| 52 | . | |
| 53 | * Redistributions in binary form must reproduce the above copyright | |
| 54 | notice, this list of conditions and the following disclaimer in the | |
| 55 | documentation and/or other materials provided with the distribution. | |
| 56 | . | |
| 57 | * Neither the name "Markdown" nor the names of its contributors may | |
| 58 | be used to endorse or promote products derived from this software | |
| 59 | without specific prior written permission. | |
| 60 | . | |
| 61 | This software is provided by the copyright holders and contributors "as | |
| 62 | is" and any express or implied warranties, including, but not limited | |
| 63 | to, the implied warranties of merchantability and fitness for a | |
| 64 | particular purpose are disclaimed. In no event shall the copyright owner | |
| 65 | or contributors be liable for any direct, indirect, incidental, special, | |
| 66 | exemplary, or consequential damages (including, but not limited to, | |
| 67 | procurement of substitute goods or services; loss of use, data, or | |
| 68 | profits; or business interruption) however caused and on any theory of | |
| 69 | liability, whether in contract, strict liability, or tort (including | |
| 70 | negligence or otherwise) arising in any way out of the use of this | |
| 71 | software, even if advised of the possibility of such damage. |
| 0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | |
| 1 | Upstream-Name: markdown | |
| 2 | Upstream-Contact: Johann Hofmann <mail@johann-hofmann.com> | |
| 3 | Source: https://github.com/johannhof/markdown.rs | |
| 4 | ||
| 5 | Files: * | |
| 6 | Copyright: FIXME (overlay) UNKNOWN-YEARS Johann Hofmann <mail@johann-hofmann.com> | |
| 7 | License: MIT or Apache-2.0 | |
| 8 | Comment: | |
| 9 | FIXME (overlay): Since upstream copyright years are not available in | |
| 10 | Cargo.toml, they were extracted from the upstream Git repository. This may not | |
| 11 | be correct information so you should review and fix this before uploading to | |
| 12 | the archive. | |
| 13 | ||
| 14 | Files: ./LICENSE-MIT | |
| 15 | Copyright: 2015 The markdown.rs Developers | |
| 16 | License: UNKNOWN-LICENSE; FIXME (overlay) | |
| 17 | Comment: | |
| 18 | FIXME (overlay): These notices are extracted from files. Please review them | |
| 19 | before uploading to the archive. | |
| 20 | ||
| 21 | Files: ./tests/fixtures/README | |
| 22 | Copyright: | |
| 23 | 2004, John Gruber | |
| 24 | 2005-2006 Fletcher T. Penney | |
| 25 | 2006-2009 Darren Kulp | |
| 26 | License: UNKNOWN-LICENSE; FIXME (overlay) | |
| 27 | Comment: | |
| 28 | FIXME (overlay): These notices are extracted from files. Please review them | |
| 29 | before uploading to the archive. | |
| 30 | ||
| 31 | Files: debian/* | |
| 32 | Copyright: | |
| 33 | 2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
| 34 | 2021 Christopher Hoskin <mans0954@debian.org> | |
| 35 | License: MIT or Apache-2.0 | |
| 36 | ||
| 37 | License: Apache-2.0 | |
| 38 | Debian systems provide the Apache 2.0 license in | |
| 39 | /usr/share/common-licenses/Apache-2.0 | |
| 40 | ||
| 41 | License: MIT | |
| 42 | Permission is hereby granted, free of charge, to any person obtaining a copy | |
| 43 | of this software and associated documentation files (the "Software"), to deal | |
| 44 | in the Software without restriction, including without limitation the rights | |
| 45 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
| 46 | copies of the Software, and to permit persons to whom the Software is | |
| 47 | furnished to do so, subject to the following conditions: | |
| 48 | . | |
| 49 | The above copyright notice and this permission notice shall be included in all | |
| 50 | copies or substantial portions of the Software. | |
| 51 | . | |
| 52 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 53 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 54 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
| 55 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
| 56 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
| 57 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
| 58 | SOFTWARE. |
| 0 | overlay = "." | |
| 1 | uploaders = ["Christopher Hoskin <mans0954@debian.org>"] | |
| 2 | ||
| 3 | [source] | |
| 4 | ||
| 5 | homepage = "https://github.com/johannhof/markdown.rs" | |
| 6 | ||
| 7 | [packages.lib] | |
| 8 | ||
| 9 | summary = "native Rust library for parsing Markdown and outputting HTML - Rust source code" | |
| 10 | ||
| 11 | [packages.bin] | |
| 12 | ||
| 13 | section = "text" | |
| 14 | summary = "command line utility for parsing Markdown and outputting HTML" | |
| 15 | description = """ | |
| 16 | This package provides a command line utility `markdown` which uses the rust | |
| 17 | markdown crate to parse a markdown file and output HTML. | |
| 18 | """ |
| 0 | # These are test fixtures, not documentation | |
| 1 | librust-markdown-dev: package-contains-documentation-outside-usr-share-doc usr/share/cargo/registry/markdown-0.3.0/tests/fixtures/* |
| 0 | Description: Update dev dependency difference from 0.4 to 2.0.0 | |
| 1 | Author: Christopher Hoskin <mans0954@debian.org> | |
| 2 | Forwarded: https://github.com/johannhof/markdown.rs/pull/40 | |
| 3 | Last-Update: 2021-05-26 | |
| 4 | --- a/Cargo.toml | |
| 5 | +++ b/Cargo.toml | |
| 6 | @@ -33,7 +33,7 @@ | |
| 7 | [dependencies.regex] | |
| 8 | version = "1" | |
| 9 | [dev-dependencies.difference] | |
| 10 | -version = "0.4" | |
| 11 | +version = "2.0.0" | |
| 12 | ||
| 13 | [features] | |
| 14 | default = [] | |
| 15 | --- a/tests/lib.rs | |
| 16 | +++ b/tests/lib.rs | |
| 17 | @@ -1,4 +1,5 @@ | |
| 18 | extern crate markdown; | |
| 19 | +#[macro_use(assert_diff)] | |
| 20 | extern crate difference; | |
| 21 | ||
| 22 | mod fixtures; | |
| 23 | --- a/tests/fixtures/mod.rs | |
| 24 | +++ b/tests/fixtures/mod.rs | |
| 25 | @@ -2,7 +2,6 @@ | |
| 26 | use std::fs::File; | |
| 27 | use std::io::Read; | |
| 28 | use markdown; | |
| 29 | -use difference; | |
| 30 | ||
| 31 | fn compare(name: &str) { | |
| 32 | let html = format!("tests/fixtures/docs-maruku-unittest/{}.html", name); | |
| 33 | @@ -15,7 +14,7 @@ | |
| 34 | File::open(md).unwrap().read_to_string(&mut tokens).unwrap(); | |
| 35 | println!("{:?}", markdown::tokenize(&tokens)); | |
| 36 | ||
| 37 | - difference::assert_diff(&comp, &markdown::file_to_html(md).unwrap(), " ", 0); | |
| 38 | + assert_diff!(&comp, &markdown::file_to_html(md).unwrap(), " ", 0); | |
| 39 | } | |
| 40 | ||
| 41 | fn roundtrip(name: &str) { | |
| 42 | @@ -34,7 +33,7 @@ | |
| 43 | ||
| 44 | println!("BEGIN\n{}\nEND", out); | |
| 45 | ||
| 46 | - difference::assert_diff(&comp, &markdown::to_html(&out), " ", 0); | |
| 47 | + assert_diff!(&comp, &markdown::to_html(&out), " ", 0); | |
| 48 | } | |
| 49 | ||
| 50 | #[test] |
| 0 | difference.patch |
| 0 | rust-pipeline (0.5.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
| 1 | ||
| 2 | * Package pipeline 0.5.0 from crates.io using debcargo 2.4.4 | |
| 3 | * Fill in copyright | |
| 4 | * Shorten synopsis in control | |
| 5 | * Add homepage to control | |
| 6 | ||
| 7 | -- Christopher Hoskin <mans0954@debian.org> Sat, 22 May 2021 21:05:56 +0100 |
| 0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | |
| 1 | Upstream-Name: pipeline | |
| 2 | Upstream-Contact: Johann Hofmann <mail@johann-hofmann.com> | |
| 3 | Source: https://github.com/johannhof/pipeline.rs | |
| 4 | ||
| 5 | Files: * | |
| 6 | Copyright: 2015-2018 Johann Hofmann <mail@johann-hofmann.com> | |
| 7 | License: MIT | |
| 8 | ||
| 9 | Files: debian/* | |
| 10 | Copyright: | |
| 11 | 2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
| 12 | 2021 Christopher Hoskin <mans0954@debian.org> | |
| 13 | License: MIT | |
| 14 | ||
| 15 | License: MIT | |
| 16 | Permission is hereby granted, free of charge, to any person obtaining a copy | |
| 17 | of this software and associated documentation files (the "Software"), to deal | |
| 18 | in the Software without restriction, including without limitation the rights | |
| 19 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
| 20 | copies of the Software, and to permit persons to whom the Software is | |
| 21 | furnished to do so, subject to the following conditions: | |
| 22 | . | |
| 23 | The above copyright notice and this permission notice shall be included in all | |
| 24 | copies or substantial portions of the Software. | |
| 25 | . | |
| 26 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 27 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 28 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
| 29 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
| 30 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
| 31 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
| 32 | SOFTWARE. |
| 0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | |
| 1 | Upstream-Name: pipeline | |
| 2 | Upstream-Contact: Johann Hofmann <mail@johann-hofmann.com> | |
| 3 | Source: https://github.com/johannhof/pipeline.rs | |
| 4 | ||
| 5 | Files: * | |
| 6 | Copyright: FIXME (overlay) UNKNOWN-YEARS Johann Hofmann <mail@johann-hofmann.com> | |
| 7 | License: MIT | |
| 8 | Comment: | |
| 9 | FIXME (overlay): Since upstream copyright years are not available in | |
| 10 | Cargo.toml, they were extracted from the upstream Git repository. This may not | |
| 11 | be correct information so you should review and fix this before uploading to | |
| 12 | the archive. | |
| 13 | ||
| 14 | Files: ./LICENSE | |
| 15 | Copyright: 2015 Johann Hofmann | |
| 16 | License: UNKNOWN-LICENSE; FIXME (overlay) | |
| 17 | Comment: | |
| 18 | FIXME (overlay): These notices are extracted from files. Please review them | |
| 19 | before uploading to the archive. | |
| 20 | ||
| 21 | Files: debian/* | |
| 22 | Copyright: | |
| 23 | 2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
| 24 | 2021 Christopher Hoskin <mans0954@debian.org> | |
| 25 | License: MIT | |
| 26 | ||
| 27 | License: MIT | |
| 28 | Permission is hereby granted, free of charge, to any person obtaining a copy | |
| 29 | of this software and associated documentation files (the "Software"), to deal | |
| 30 | in the Software without restriction, including without limitation the rights | |
| 31 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
| 32 | copies of the Software, and to permit persons to whom the Software is | |
| 33 | furnished to do so, subject to the following conditions: | |
| 34 | . | |
| 35 | The above copyright notice and this permission notice shall be included in all | |
| 36 | copies or substantial portions of the Software. | |
| 37 | . | |
| 38 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 39 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 40 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
| 41 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
| 42 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
| 43 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
| 44 | SOFTWARE. |