Merge branch 'master' of salsa.debian.org:rust-team/debcargo-conf

2025-04-28 09:41:55 +00:00 · 2018-11-17 13:47:46 +01:00 · 2018-11-17 13:47:46 +01:00 · 3c71a5f640
commit 3c71a5f640
parent 0e7de7ed08 60e1bf1ed3
30 changed files with 246 additions and 75 deletions
--- a/TODO.rst
+++ b/TODO.rst
@ -67,13 +67,13 @@ Ready for upload (Request For Sponsor)
 These packages (RFS) are prepared in the master branch and can be uploaded
 because all required dependencies are available in main::

-    glib
-    structopt-derive (update)
-    hexyl
+    pango-sys
+    fragile
+    ryu (update)
+    pulldown-cmark (update 0.1.2 to 0.2.0)
+    hexyl (updated to run tests)
    crossbeam-utils (update)
-    cssparser-macros (update, syn)
    owning-ref 0.3.3
-    stdweb-derive (update)
    md5 (update)
    encoding-rs (update)
    cmake (update)
@ -87,13 +87,6 @@ because all required dependencies are available in main::

 Delayed/problematic::

-    syn-0.15 (update from 0.14)
-        Updatable dependencies:
-            stdweb-derive (RFS)
-            stdweb-internal-macros
-                (version 0.2.2 depends on rustc_version 0.2 which is
-                in NEW queue)
-            structopt-derive
    winapi-0.2.8 -- dependency of mio, iovec, etc
        iovec           https://github.com/carllerche/iovec/issues/16
        see also https://salsa.debian.org/rust-team/debcargo/issues/14
@ -201,6 +194,7 @@ grep needs grep-cli, grep-printer, grep-searcher
 grep-cli needs globset 0.4.2 (uploaded)
 grep-printer needs grep-searcher (in NEW), serde-derive (in NEW), serde-json (uploaded)

+
 ignore => crossbeam-channel => parking_lot => parking_lot_core => rustc-version (in NEW)

 dependencies of mdbook/exa
--- a/src/cssparser-macros/debian/changelog
+++ b/src/cssparser-macros/debian/changelog
@ -1,8 +1,8 @@
-rust-cssparser-macros (0.3.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-cssparser-macros (0.3.5-1) unstable; urgency=medium

  * Package cssparser-macros 0.3.5 from crates.io using debcargo 2.2.8

- -- kpcyrd <git@rxv.cc>  Thu,  8 Nov 2018 02:58:26 +0000
+ -- kpcyrd <git@rxv.cc>  Fri, 16 Nov 2018 12:51:47 +0100

 rust-cssparser-macros (0.3.4-1) unstable; urgency=medium

--- a/src/datetime/debian/patches/relax-iso.diff
+++ b/src/datetime/debian/patches/relax-iso.diff
@ -0,0 +1,22 @@
+Index: datetime/Cargo.toml
+===================================================================
+--- datetime.orig/Cargo.toml
+++ datetime/Cargo.toml
+@@ -23,7 +23,7 @@ license = "MIT"
+ [lib]
+ name = "datetime"
+ [dependencies.iso8601]
+-version = "0.1.0"
+version = "0.2.0"
+ 
+ [dependencies.libc]
+ version = "0.2"
+@@ -32,7 +32,7 @@ version = "0.2"
+ version = "0.2"
+ 
+ [dependencies.num-traits]
+-version = "0.1.35"
+version = "0.2.5"
+ 
+ [dependencies.pad]
+ version = "0.1"
--- a/src/datetime/debian/patches/remove-useless-dep.diff
+++ b/src/datetime/debian/patches/remove-useless-dep.diff
@ -2,7 +2,7 @@ Index: datetime/Cargo.toml
 ===================================================================
 --- datetime.orig/Cargo.toml
 +++ datetime/Cargo.toml
-@@ -41,10 +41,10 @@ version = "0.1"
+@@ -41,10 +41,3 @@ version = "0.1"
 
 [dev-dependencies.rustc-serialize]
 version = "0.3"
@ -10,12 +10,6 @@ Index: datetime/Cargo.toml
 -version = "0.1.29"
 -[target."cfg(windows)".dependencies.kernel32-sys]
 -version = "0.2.2"
-+#[target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
-+#version = "0.1.29"
-+#[target."cfg(windows)".dependencies.kernel32-sys]
-+#version = "0.2.2"
- 
+-
 -[target."cfg(windows)".dependencies.winapi]
 -version = "0.2.8"
-+#[target."cfg(windows)".dependencies.winapi]
-+#version = "0.2.8"
--- a/src/datetime/debian/patches/series
+++ b/src/datetime/debian/patches/series
@ -1 +1,2 @@
-remove-useless-dep.diff
+remove-win-deps.diff
+relax-iso.diff
--- a/src/fragile/debian/changelog
+++ b/src/fragile/debian/changelog
@ -0,0 +1,5 @@
+rust-fragile (0.3.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package fragile 0.3.0 from crates.io using debcargo 2.2.9
+
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Fri, 16 Nov 2018 14:46:21 +0100
--- a/src/fragile/debian/copyright
+++ b/src/fragile/debian/copyright
@ -0,0 +1,18 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: fragile
+Upstream-Contact: Armin Ronacher <armin.ronacher@active-4.com>
+Source: https://github.com/mitsuhiko/rust-fragile
+
+Files: *
+Copyright: 2018 Armin Ronacher <armin.ronacher@active-4.com>
+License: Apache-2.0
+
+Files: debian/*
+Copyright:
+ 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+License: Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
--- a/src/fragile/debian/copyright.debcargo.hint
+++ b/src/fragile/debian/copyright.debcargo.hint
@ -0,0 +1,23 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: fragile
+Upstream-Contact: Armin Ronacher <armin.ronacher@active-4.com>
+Source: https://github.com/mitsuhiko/rust-fragile
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-YEARS Armin Ronacher <armin.ronacher@active-4.com>
+License: Apache-2.0
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: debian/*
+Copyright:
+ 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+License: Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
--- a/src/fragile/debian/debcargo.toml
+++ b/src/fragile/debian/debcargo.toml
@ -0,0 +1,5 @@
+overlay = "."
+uploaders = ["Wolfgang Silbermayr <wolfgang@silbermayr.at>"]
+
+# The auto-generated summary is too long.
+summary = "Wrapper types that permit sending non Send types"
--- a/src/grep-searcher/debian/changelog
+++ b/src/grep-searcher/debian/changelog
@ -1,3 +1,10 @@
+rust-grep-searcher (0.1.1-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package grep-searcher 0.1.1 from crates.io using debcargo 2.2.9
+  * Relax the bytecount dep (0.4)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 16 Nov 2018 09:49:11 +0100
+
 rust-grep-searcher (0.1.1-1) unstable; urgency=medium

  * Package grep-searcher 0.1.1 from crates.io using debcargo 2.2.7
--- a/src/grep-searcher/debian/patches/relax-dep.diff
+++ b/src/grep-searcher/debian/patches/relax-dep.diff
@ -7,7 +7,7 @@ Index: grep-searcher/Cargo.toml
 repository = "https://github.com/BurntSushi/ripgrep"
 [dependencies.bytecount]
 -version = "0.3.2"
-+version = "0.3.1"
+version = "0.4.0"
 
 [dependencies.encoding_rs]
 version = "0.8.6"
--- a/src/hexyl/debian/changelog
+++ b/src/hexyl/debian/changelog
@ -1,3 +1,10 @@
+rust-hexyl (0.2.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Run tests at build
+  * Package hexyl 0.2.0 from crates.io using debcargo 2.2.9
+
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Fri, 16 Nov 2018 13:53:28 +0100
+
 rust-hexyl (0.2.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium

  * Package hexyl 0.2.0 from crates.io using debcargo 2.2.9
--- a/src/hexyl/debian/rules
+++ b/src/hexyl/debian/rules
@ -12,3 +12,6 @@ override_dh_installman:
 		--version-string $(DEB_VERSION_UPSTREAM) \
 		debian/hexyl/usr/bin/hexyl > debian/hexyl.1
 	dh_installman -O--buildsystem=cargo
+
+override_dh_auto_test:
+	dh_auto_test -- test --all
--- a/src/pango-sys/debian/changelog
+++ b/src/pango-sys/debian/changelog
@ -0,0 +1,5 @@
+rust-pango-sys (0.7.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package pango-sys 0.7.0 from crates.io using debcargo 2.2.9
+
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Sat, 17 Nov 2018 09:12:39 +0100
--- a/src/pango-sys/debian/copyright
+++ b/src/pango-sys/debian/copyright
@ -0,0 +1,33 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pango-sys
+Upstream-Contact: The Gtk-rs Project Developers
+Source: https://github.com/gtk-rs/sys
+
+Files: *
+Copyright: 2013-2018 The Gtk-rs Project Developers
+License: MIT
+
+Files: debian/*
+Copyright:
+ 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+License: MIT
+
+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 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:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ 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 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 IN THE
+ SOFTWARE.
--- a/src/pango-sys/debian/copyright.debcargo.hint
+++ b/src/pango-sys/debian/copyright.debcargo.hint
@ -0,0 +1,45 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pango-sys
+Upstream-Contact: The Gtk-rs Project Developers
+Source: https://github.com/gtk-rs/sys
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-YEARS The Gtk-rs Project Developers
+License: MIT
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: ./LICENSE
+Copyright: 2013-2015, The Gtk-rs Project Developers.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: debian/*
+Copyright:
+ 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+License: MIT
+
+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 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:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ 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 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 IN THE
+ SOFTWARE.
--- a/src/pango-sys/debian/debcargo.toml
+++ b/src/pango-sys/debian/debcargo.toml
@ -0,0 +1,5 @@
+overlay = "."
+uploaders = ["Wolfgang Silbermayr <wolfgang@silbermayr.at>"]
+
+[packages.lib]
+depends = ["libpango1.0-dev"]
--- a/src/pulldown-cmark/debian/README.Debian
+++ b/src/pulldown-cmark/debian/README.Debian
@ -1,6 +0,0 @@
-Upstream does not provide a manpage, the manpage for Debian is built with
-help2man \
-  --name pulldown-cmark \
-  --no-info \
-  --version-string=<version> \
-  pulldown-cmark
--- a/src/pulldown-cmark/debian/changelog
+++ b/src/pulldown-cmark/debian/changelog
@ -1,6 +1,15 @@
-rust-pulldown-cmark (0.1.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-pulldown-cmark (0.2.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package pulldown-cmark 0.2.0 from crates.io using debcargo 2.2.9
+  * Generate manpages during build (Closes: #911452)
+  * Run tests during build (marked non-fail for now, some tests don't succeed
+    yet)
+
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Fri, 16 Nov 2018 13:41:14 +0100
+
+rust-pulldown-cmark (0.1.2-1) unstable; urgency=medium

  * Package pulldown-cmark 0.1.2 from crates.io using debcargo 2.2.7
    (Closes: #895353)

- -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Sun, 14 Oct 2018 21:23:49 +0200
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Tue, 16 Oct 2018 22:01:57 +0200
--- a/src/pulldown-cmark/debian/copyright.debcargo.hint
+++ b/src/pulldown-cmark/debian/copyright.debcargo.hint
@ -1,10 +1,10 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pulldown-cmark
-Upstream-Contact: Raph Levien <raph@google.com>
+Upstream-Contact: Raph Levien <raph.levien@gmail.com>
 Source: https://github.com/google/pulldown-cmark

 Files: *
-Copyright: FIXME (overlay) UNKNOWN-YEARS Raph Levien <raph@google.com>
+Copyright: FIXME (overlay) UNKNOWN-YEARS Raph Levien <raph.levien@gmail.com>
 License: MIT
 Comment:
 FIXME (overlay): Since upstream copyright years are not available in
--- a/src/pulldown-cmark/debian/debcargo.toml
+++ b/src/pulldown-cmark/debian/debcargo.toml
@ -1,6 +1,9 @@
 overlay = "."
 uploaders = ["Wolfgang Silbermayr <wolfgang@silbermayr.at>"]

+[source]
+build_depends = ["help2man"]
+
 [packages.bin]
 section = "text"
 summary = "Simple command-line tool for rendering CommonMark to HTML"
--- a/src/pulldown-cmark/debian/pulldown-cmark.1
+++ b/src/pulldown-cmark/debian/pulldown-cmark.1
@ -1,29 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH PULLDOWN-CMARK "1" "October 2018" "pulldown-cmark 0.1.2" "User Commands"
-.SH NAME
-pulldown-cmark \- pulldown-cmark
-.SH SYNOPSIS
-.B pulldown-cmark
-\fI\,FILE \/\fR[\fI\,options\/\fR]
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-this help message
-.TP
-\fB\-d\fR, \fB\-\-dry\-run\fR
-dry run, produce no output
-.TP
-\fB\-e\fR, \fB\-\-events\fR
-print event sequence instead of rendering
-.TP
-\fB\-T\fR, \fB\-\-enable\-tables\fR
-enable GitHub\-style tables
-.TP
-\fB\-F\fR, \fB\-\-enable\-footnotes\fR
-enable Hoedown\-style footnotes
-.TP
-\fB\-s\fR, \fB\-\-spec\fR FILE
-run tests from spec file
-.TP
-\fB\-b\fR, \fB\-\-bench\fR FILE
-run benchmark
--- a/src/pulldown-cmark/debian/rules
+++ b/src/pulldown-cmark/debian/rules
@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/pkg-info.mk
+
+%:
+	dh $@ --buildsystem cargo
+
+override_dh_installman:
+	help2man \
+		--name pulldown-cmark \
+		--no-info \
+		--version-string $(DEB_VERSION_UPSTREAM) \
+		debian/pulldown-cmark/usr/bin/pulldown-cmark > debian/pulldown-cmark.1
+	dh_installman -O--buildsystem=cargo
+
+override_dh_auto_test:
+# the test suite does not pass all tests against the spec yet, see
+# https://github.com/raphlinus/pulldown-cmark/issues/154
+	dh_auto_test -- test --all || true
--- a/src/pulldown-cmark/debian/rules.debcargo.hint
+++ b/src/pulldown-cmark/debian/rules.debcargo.hint
@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+	dh $@ --buildsystem cargo
--- a/src/ryu/debian/changelog
+++ b/src/ryu/debian/changelog
@ -1,3 +1,9 @@
+rust-ryu (0.2.7-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package ryu 0.2.7 from crates.io using debcargo 2.2.9
+
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Fri, 16 Nov 2018 06:16:01 +0100
+
 rust-ryu (0.2.6-1) unstable; urgency=medium

  * Package ryu 0.2.6 from crates.io using debcargo 2.2.7
--- a/src/stdweb-derive/debian/changelog
+++ b/src/stdweb-derive/debian/changelog
@ -1,9 +1,9 @@
-rust-stdweb-derive (0.5.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-stdweb-derive (0.5.1-1) unstable; urgency=medium

  * Team upload.
  * Package stdweb-derive 0.5.1 from crates.io using debcargo 2.2.8

- -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Mon,  5 Nov 2018 06:59:17 +0100
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Fri, 16 Nov 2018 12:53:42 +0100

 rust-stdweb-derive (0.5.0-1) unstable; urgency=medium

--- a/src/stdweb-internal-macros/debian/changelog
+++ b/src/stdweb-internal-macros/debian/changelog
@ -1,5 +1,10 @@
-rust-stdweb-internal-macros (0.2.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-stdweb-internal-macros (0.2.2-1) unstable; urgency=medium

+  * Team upload.
+  * Update stdweb-internal-macros 0.2.2 from crates.io using debcargo 2.2.9
+  * Remove obsolete patch
+
+  [ kpcyrd ]
  * Package stdweb-internal-macros 0.2.0 from crates.io using debcargo 2.2.7

- -- kpcyrd <git@rxv.cc>  Tue, 16 Oct 2018 05:43:20 +0000
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Fri, 16 Nov 2018 12:54:08 +0100
--- a/src/stdweb-internal-macros/debian/patches/series
+++ b/src/stdweb-internal-macros/debian/patches/series
@ -1 +0,0 @@
-stabilized-proc-macro.patch
--- a/src/stdweb-internal-macros/debian/patches/stabilized-proc-macro.patch
+++ b/src/stdweb-internal-macros/debian/patches/stabilized-proc-macro.patch
@ -1,5 +0,0 @@
--- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -1,2 +1 @@
-#![feature(proc_macro)]
- #![recursion_limit="128"]
--- a/src/structopt-derive/debian/changelog
+++ b/src/structopt-derive/debian/changelog
@ -1,8 +1,8 @@
-rust-structopt-derive (0.2.13-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-structopt-derive (0.2.13-1) unstable; urgency=medium

  * Package structopt-derive 0.2.13 from crates.io using debcargo 2.2.9

- -- kpcyrd <git@rxv.cc>  Thu, 15 Nov 2018 09:23:49 +0000
+ -- kpcyrd <git@rxv.cc>  Fri, 16 Nov 2018 12:46:51 +0100

 rust-structopt-derive (0.2.10-1) unstable; urgency=medium