diff -Nru git-delta-0.16.5/debian/changelog git-delta-0.16.5/debian/changelog --- git-delta-0.16.5/debian/changelog 2023-08-07 16:10:28.000000000 +0000 +++ git-delta-0.16.5/debian/changelog 2023-08-09 08:27:30.000000000 +0000 @@ -1,3 +1,19 @@ +git-delta (0.16.5-3) unstable; urgency=medium + + * mention unrelated but similarly named package and binary executable + in long description and README.Debian file; + closes: bug#1043316, thanks to Carl Suster + * install theme file below /etc/delta, + symlinked from below /usr/share/delta; + add patch 2001 + to list path of theme file within its own usage comment; + mention theming in README.Debian + * stop install upstream README in Markdown source format + (only rendered as plaintext and html) + * render and install upstream documentation file ARCHITECTURE + + -- Jonas Smedegaard Wed, 09 Aug 2023 10:27:30 +0200 + git-delta (0.16.5-2) unstable; urgency=medium * update dh-cargo fork diff -Nru git-delta-0.16.5/debian/control git-delta-0.16.5/debian/control --- git-delta-0.16.5/debian/control 2023-08-07 16:10:28.000000000 +0000 +++ git-delta-0.16.5/debian/control 2023-08-09 07:25:59.000000000 +0000 @@ -71,3 +71,11 @@ to the layout and styling of diffs, as well as allowing you to stay arbitrarily close to the default git/diff output. + . + This package provides the executable binary /usr/bin/delta. + . + (Unrelated executable binary /usr/bin/git-delta + is in the package git-extras, + and unrelated executable binaries + /usr/bin/multidelta and /usr/bin/singledelta + are in the package delta.) diff -Nru git-delta-0.16.5/debian/copyright_hints git-delta-0.16.5/debian/copyright_hints --- git-delta-0.16.5/debian/copyright_hints 2023-08-06 23:38:09.000000000 +0000 +++ git-delta-0.16.5/debian/copyright_hints 2023-08-09 08:27:18.000000000 +0000 @@ -11,19 +11,20 @@ HomeBrewFormula/git-delta.rb Makefile README.md + debian/README.Debian debian/TODO debian/bash-completion debian/clean debian/control debian/copyright-check debian/dh-cargo/README.md - debian/docs - debian/examples debian/gbp.conf debian/install + debian/links debian/manpages debian/patches/1001_deps.patch debian/patches/1002_completion_shebang.patch + debian/patches/2001_theme.patch debian/patches/README debian/patches/series debian/rules diff -Nru git-delta-0.16.5/debian/docs git-delta-0.16.5/debian/docs --- git-delta-0.16.5/debian/docs 2022-11-15 11:39:49.000000000 +0000 +++ git-delta-0.16.5/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -README.md diff -Nru git-delta-0.16.5/debian/examples git-delta-0.16.5/debian/examples --- git-delta-0.16.5/debian/examples 2022-11-15 12:09:22.000000000 +0000 +++ git-delta-0.16.5/debian/examples 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -themes.gitconfig diff -Nru git-delta-0.16.5/debian/install git-delta-0.16.5/debian/install --- git-delta-0.16.5/debian/install 2022-11-15 11:55:00.000000000 +0000 +++ git-delta-0.16.5/debian/install 2023-08-09 08:08:43.000000000 +0000 @@ -1 +1,2 @@ debian/_delta /usr/share/zsh/vendor-completions +themes.gitconfig /etc/delta diff -Nru git-delta-0.16.5/debian/links git-delta-0.16.5/debian/links --- git-delta-0.16.5/debian/links 1970-01-01 00:00:00.000000000 +0000 +++ git-delta-0.16.5/debian/links 2023-08-09 08:08:34.000000000 +0000 @@ -0,0 +1 @@ +/etc/delta/themes.gitconfig /usr/share/delta/themes.gitconfig diff -Nru git-delta-0.16.5/debian/patches/2001_theme.patch git-delta-0.16.5/debian/patches/2001_theme.patch --- git-delta-0.16.5/debian/patches/2001_theme.patch 1970-01-01 00:00:00.000000000 +0000 +++ git-delta-0.16.5/debian/patches/2001_theme.patch 2023-08-09 07:48:56.000000000 +0000 @@ -0,0 +1,16 @@ +Description: list path to theme file within its own usage comment +Author: Jonas Smedegaard +Last-Update: 2023-08-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/themes.gitconfig ++++ b/themes.gitconfig +@@ -1,7 +1,7 @@ + # To use these themes, first include this file in your own gitconfig file: + # + # [include] +-# path = PATH/TO/delta/themes.gitconfig ++# path = /usr/share/delta/themes.gitconfig + # + # Then, in your own gitconfig file, activate the chosen theme, e.g. + # diff -Nru git-delta-0.16.5/debian/patches/series git-delta-0.16.5/debian/patches/series --- git-delta-0.16.5/debian/patches/series 2023-07-24 10:59:19.000000000 +0000 +++ git-delta-0.16.5/debian/patches/series 2023-08-09 07:45:45.000000000 +0000 @@ -1,2 +1,3 @@ 1001_deps.patch 1002_completion_shebang.patch +2001_theme.patch diff -Nru git-delta-0.16.5/debian/README.Debian git-delta-0.16.5/debian/README.Debian --- git-delta-0.16.5/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ git-delta-0.16.5/debian/README.Debian 2023-08-09 08:07:31.000000000 +0000 @@ -0,0 +1,23 @@ +# Delta packaged for Debian + +## Theming + +A helper file for integrating delta with git is provided +below /etc/delta/ and symlinked from /usr/share/delta/. +See the usage comments at the top of that file for its use. + + +## Naming and other unrelated but similarly named tools + +This package provides the project "delta", +with its main component provided as /usr/bin/delta. + +It is unrelated to package "delta" from tigris.delta.org, +which contains executable binaries +/usr/bin/multidelta and /usr/bin/singledelta. + +It is also unrelated to package "git-extras", +which contains executable binary /usr/bin/git-delta. + + + -- Jonas Smedegaard Wed, 09 Aug 2023 10:07:21 +0200 diff -Nru git-delta-0.16.5/debian/rules git-delta-0.16.5/debian/rules --- git-delta-0.16.5/debian/rules 2023-07-24 10:57:54.000000000 +0000 +++ git-delta-0.16.5/debian/rules 2023-08-09 08:15:12.000000000 +0000 @@ -7,7 +7,7 @@ # generate documentation unless nodoc requested ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) -DOCS = README.html README.txt +DOCS = README.html README.txt ARCHITECTURE.html ARCHITECTURE.txt MANPAGES = debian/delta.1 endif