* Team upload.

* Package bat 0.22.1 from crates.io using debcargo 2.6.0
* Ship bat as bat (instead of batcat) (Closes: #1029096)

diff --git a/src/bat/debian/README.Debian b/src/bat/debian/README.Debian
index 127d4ed22c44532c0e777dfb8113b91ca3a6f4f9..51d69c6b99fd660feef8ef8213d401db697f4afa 100644 (file)
--- a/src/bat/debian/README.Debian
+++ b/src/bat/debian/README.Debian
@@ -1,5 +1,8 @@
 bat for Debian
 ==============
 
-In this package the executable and its manpage have been renamed from ‘bat’ to
-‘batcat’ because of a file name clash with another Debian package.
+Before 0.22.1-3, the binary was called batcat. As the other Debian package has been
+renamed, we renamed it to bat.
+We kept ‘batcat’ as symlink for compatiblity reasons.
+
+ -- Sylvestre Ledru <sylvestre@debian.org>, Sat, 21 Jan 2023 10:55:49 +0100

diff --git a/src/bat/debian/bat.install b/src/bat/debian/bat.install
old mode 100755 (executable)
new mode 100644 (file)
index 4da19ef..b21c74b
--- a/src/bat/debian/bat.install
+++ b/src/bat/debian/bat.install
@@ -1,7 +1 @@
-#!/usr/bin/dh-exec
-
-# Do not install the completions yet, as they are not consistent with the
-# bat->batcat rename. This is fixed upstream but not yet released: in the
-# new versions of bat the binary name will be parametrized.
-#
-# assets/completions/bat.fish => /usr/share/fish/completions/batcat.fish
+assets/completions/bat.fish => /usr/share/fish/completions/bat.fish

diff --git a/src/bat/debian/bat.lintian-overrides b/src/bat/debian/bat.lintian-overrides
index 3d96d42e487928a37cafb1e543e71721002b3265..53f8a283724fcdd658575514aec828de02784f27 100644 (file)
--- a/src/bat/debian/bat.lintian-overrides
+++ b/src/bat/debian/bat.lintian-overrides
@@ -1,2 +1,2 @@
 # Remove this once #932634 is fixed
-bat: embedded-library usr/bin/batcat: libyaml
+bat: embedded-library usr/bin/cat: libyaml

diff --git a/src/bat/debian/bat.manpages b/src/bat/debian/bat.manpages
old mode 100755 (executable)
new mode 100644 (file)
index 77e2532..25884be
--- a/src/bat/debian/bat.manpages
+++ b/src/bat/debian/bat.manpages
@@ -1,3 +1 @@
-#!/usr/bin/dh-exec
-
-#doc/bat.1 => usr/share/man/man1/batcat.1
+doc/bat.1

diff --git a/src/bat/debian/changelog b/src/bat/debian/changelog
index 85165a1d684ffc51779a2d457ada9b4f6d60db19..8116d402dba2f78137d11717654b3f24734b59c5 100644 (file)
--- a/src/bat/debian/changelog
+++ b/src/bat/debian/changelog
@@ -1,3 +1,11 @@
+rust-bat (0.22.1-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package bat 0.22.1 from crates.io using debcargo 2.6.0
+  * Ship bat as bat (instead of batcat) (Closes: #1029096)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 21 Jan 2023 10:52:37 +0100
+
 rust-bat (0.22.1-2) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/bat/debian/debcargo.toml b/src/bat/debian/debcargo.toml
index fa67c8c1b3cf79d09bb4043056be48b6480ded75..e7b0e52445d370795852262c730197755e705a88 100644 (file)
--- a/src/bat/debian/debcargo.toml
+++ b/src/bat/debian/debcargo.toml
@@ -19,7 +19,4 @@ bat is a drop-in cat(1) replacement featuring:
  * git integration;
  * automatic paging;
  * a user-friendly command-line interface.
-
-In this package the executable and its manpage have been renamed from ‘bat’ to
-‘batcat’ because of a file name clash with another Debian package.
 """

diff --git a/src/bat/debian/rules b/src/bat/debian/rules
index 2f275bf8b7bc1d70bcf326a2877eb81f601eff6c..211bb6c3f2b0b0c90dd7951124baf58b8b90d9aa 100755 (executable)
--- a/src/bat/debian/rules
+++ b/src/bat/debian/rules
@@ -3,8 +3,3 @@
 %:
        dh $@ --buildsystem cargo
 
-override_dh_auto_install:
-       # Once #946616 is fixed run `dh_auto_install --destdir=debian/tmp/`
-       # and use d/bat.install with dh-exec to install the renamed binary.
-       dh_auto_install
-       mv debian/bat/usr/bin/bat debian/bat/usr/bin/batcat