Temporarily remove work in progress on new bat version so I can patch the existing...

diff --git a/src/bat/debian/RFS b/src/bat/debian/RFS
deleted file mode 100644 (file)
index c8c6f5d..0000000
--- a/src/bat/debian/RFS
+++ /dev/null
@@ -1 +0,0 @@
-librust-bugreport-0.4+default-dev librust-clircle-0.3+default-dev librust-console-0.14+default-dev (>= 0.14.1-~~) librust-path-abs-0.5-dev librust-semver-0.11+default-dev librust-syntect-4+dump-create-dev (>= 4.5.0-~~) librust-syntect-4+dump-load-dev (>= 4.5.0-~~) librust-syntect-4+parsing-dev (>= 4.5.0-~~) librust-syntect-4+regex-onig-dev (>= 4.5.0-~~) librust-syntect-4+yaml-load-dev (>= 4.5.0-~~)

diff --git a/src/bat/debian/changelog b/src/bat/debian/changelog
index e69d63b281958720c204c7b780c585ef58ef7605..33ac38fc03d6675a1f9867e7aecc62be00d12f6f 100644 (file)
--- a/src/bat/debian/changelog
+++ b/src/bat/debian/changelog
@@ -1,10 +1,3 @@
-rust-bat (0.18.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
-
-  * Team upload.
-  * Package bat 0.18.2 from crates.io using debcargo 2.4.4-alpha.0
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 21 Aug 2021 21:33:55 +0200
-
 rust-bat (0.12.1-6) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/bat/debian/copyright.debcargo.hint b/src/bat/debian/copyright.debcargo.hint
index dc668b4e11fdfac220b89d00ddb2bd6ca5ad2d38..2c519dc2a911cbf5d6c4b01d9158709a0fe588cf 100644 (file)
--- a/src/bat/debian/copyright.debcargo.hint
+++ b/src/bat/debian/copyright.debcargo.hint
@@ -13,313 +13,7 @@ Comment:
  the archive.
 
 Files: ./LICENSE-MIT
-Copyright: 2018-2021 bat-developers (https://github.com/sharkdp/bat).
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./README.md
-Copyright: 2018-2021 [bat-developers](https://github.com/sharkdp/bat).
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./doc/README-ja.md
-Copyright: 2018-2021 [bat-developers](https://github.com/sharkdp/bat).
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./doc/README-ko.md
-Copyright: 2018-2021 [bat-developers](https://github.com/sharkdp/bat).
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./doc/README-ru.md
-Copyright: 2018-2021 [Разработчики bat](https://github.com/sharkdp/bat).
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/less.rs
-Copyright:
- 1984-2016  Mark Nudelman
- 1984-2017  Mark Nudelman
- 1984-2019  Mark Nudelman
- 1984-2021  Mark Nudelman
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/highlighted/Bash/batgrep.sh
-Copyright:
- 2020 eth-p and contributors | MIT License\e[0m
- 2019-2020 eth-p | MIT License\e[0m\e[38;2;255;255;255m"\e[0m\e[38;2;255;255;255m \e[0m\e[38;2;255;255;255m\\e[0m
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/highlighted/Fortran (Fixed Form)/quicksort_real_F77.F
-Copyright: 2019 Jason Allen Anema\e[0m
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/highlighted/Java Server Page (JSP)/sessionDetail.jsp
-Copyright: 2005-2021 the Apache Software Foundation\e[0m\e[38;2;255;255;255m"\e[0m\e[38;2;255;255;255m/>\e[0m
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/highlighted/Makefile/Makefile
-Copyright: 2009 Salvatore Sanfilippo <antirez at gmail dot com>\e[0m
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/highlighted/NAnt Build File/Default.build
-Copyright: 2007 Travis Illig\e[0m\e[38;2;230;219;116m"\e[0m\e[38;2;248;248;242m \e[0m\e[38;2;255;255;255m/>\e[0m
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/highlighted/Scala/ConcurrentEffectLaws.scala
-Copyright: 2017-2019 The Typelevel Cats-effect Project Developers\e[0m
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/highlighted/Verilog/div_pipelined.v
-Copyright: 2018 Schuyler Eldridge\e[0m
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Bash/batgrep.sh
-Copyright:
- 2020 eth-p and contributors | MIT License
- 2019-2020 eth-p | MIT License" \
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Cabal/LICENSE.md
-Copyright: 2015-2019 GitHub
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Cabal/semantic.cabal
-Copyright: 2015-2020 GitHub, Inc.
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/CoffeeScript/LICENSE.md
-Copyright: 2009-2018 Jeremy Ashkenas
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/DotENV/LICENSE.md
-Copyright: 2016 Zayn Ali
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Elixir/LICENSE.md
-Copyright: 2020 José Eduardo
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Elm/LICENSE.md
-Copyright: 2012-present Evan Czaplicki
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Fortran (Fixed Form)/LICENSE.md
-Copyright: 2019 Jason Anema
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Fortran (Fixed Form)/quicksort_real_F77.F
-Copyright: 2019 Jason Allen Anema
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Fortran (Modern)/LICENSE.md
-Copyright: 2019 Fortran stdlib developers
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Git Ignore/LICENSE.md
-Copyright:
- 2003-2013 University of Illinois at
- 2009-2014 by the contributors listed in
- 2009-2014 by the contributors listed in
- 2008-2010 Tachyon Technologies.
- 2012-2014 Free Software Foundation, Inc.
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Graphviz DOT/LICENSE.md
-Copyright: 2014 Pavel Roschin
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Java Server Page (JSP)/NOTICE
-Copyright:
- 1999-2021 The Apache Software Foundation
- 2014 The Netty Project
- 2014 Twitter
- 2002-2018 Red Hat Inc.
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Java Server Page (JSP)/sessionDetail.jsp
-Copyright: 2005-2021 the Apache Software Foundation"/>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Lisp/LICENSE.md
-Copyright: 2009-2010 Kat Marchán
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/MATLAB/LICENSE.md
-Copyright: 2006-2020 by the respective authors (see AUTHORS file).
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Makefile/LICENSE.md
-Copyright: 2006-2020, Salvatore Sanfilippo
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Makefile/Makefile
-Copyright: 2009 Salvatore Sanfilippo <antirez at gmail dot com>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/NAnt Build File/Default.build
-Copyright: 2007 Travis Illig" />
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/NAnt Build File/LICENSE.md
-Copyright: 2009 Travis Illig
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Robot Framework/LICENSE.md
-Copyright: 2020 Adrian Yorke
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Scala/ConcurrentEffectLaws.scala
-Copyright: 2017-2019 The Typelevel Cats-effect 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: ./tests/syntax-tests/source/Solidity/LICENSE.md
-Copyright: 2016-2020 zOS Global Limited
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Stylus/LICENSE.md
-Copyright: 2014 TJ Holowaychuk <tj@vision-media.ca>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Svelte/LICENSE.md
-Copyright: 2016-20 [these people](https://github.com/sveltejs/svelte/graphs/contributors)
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/TypeScriptReact/LICENSE.md
-Copyright: 2016 brauliodiez
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/Verilog/div_pipelined.v
-Copyright: 2018 Schuyler Eldridge
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/dash/LICENSE.md
-Copyright: 2020 Dylan Araps
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./tests/syntax-tests/source/varlink/LICENSE.md
-Copyright:
- 2018 Red Hat, Inc.
- 2016 - 2018 Red Hat, Inc.
+Copyright: 2018 bat-developers (https://github.com/sharkdp/bat).
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
@@ -327,10 +21,10 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2021 Paride Legovini <paride@debian.org>
- 2019-2021 Helen Koike <helen@koikeco.de>
- 2019-2021 Sylvestre ledru <sylvestre@debian.org>
+ 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2020 Paride Legovini <paride@debian.org>
+ 2019-2020 Helen Koike <helen@koikeco.de>
+ 2019-2020 Sylvestre ledru <sylvestre@debian.org>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/bat/debian/debcargo.toml b/src/bat/debian/debcargo.toml
index 2164b2737b243e74e95c4bf2ca8487241ab8be4f..232887879d6152359127eb931741ed0b8acbd0c4 100644 (file)
--- a/src/bat/debian/debcargo.toml
+++ b/src/bat/debian/debcargo.toml
@@ -1,7 +1,6 @@
 overlay = "."
 uploaders = ["Paride Legovini <paride@debian.org>", "Helen Koike <helen@koikeco.de>", "Sylvestre ledru <sylvestre@debian.org>"]
 excludes = ["tests/benchmarks/test-src/**", "tests/examples/**"]
-whitelist = ["tests/*.c"]
 
 [source]
 build_depends = ["dh-exec"]

diff --git a/src/bat/debian/patches/bump-dep.diff b/src/bat/debian/patches/bump-dep.diff
new file mode 100644 (file)
index 0000000..a62107d
--- /dev/null
+++ b/src/bat/debian/patches/bump-dep.diff
@@ -0,0 +1,31 @@
+Index: bat/Cargo.toml
+===================================================================
+--- bat.orig/Cargo.toml
++++ bat/Cargo.toml
+@@ -44,7 +44,7 @@ version = "0.8"
+ version = "0.2.4"
+ 
+ [dependencies.dirs]
+-version = "2.0"
++version = "3.0"
+ 
+ [dependencies.encoding]
+ version = "0.2"
+@@ -55,7 +55,7 @@ features = []
+ default-features = false
+ 
+ [dependencies.git2]
+-version = "0.10"
++version = "0.13"
+ features = []
+ default-features = false
+ 
+@@ -63,7 +63,7 @@ default-features = false
+ version = "1.4"
+ 
+ [dependencies.shell-words]
+-version = "0.1.0"
++version = "1.0"
+ 
+ [dependencies.syntect]
+ version = "3.2.1"

diff --git a/src/bat/debian/patches/series b/src/bat/debian/patches/series
new file mode 100644 (file)
index 0000000..bbad2f2
--- /dev/null
+++ b/src/bat/debian/patches/series
@@ -0,0 +1 @@
+bump-dep.diff