[PATCH] git bugfixes and cleanups, mainly Debian things

Generate docs for gitk. Install them in the right deb package.

Signed-off-by: Tommi Virtanen <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index e928bcf28059daa3494d6bc925ff45c09703d34b..bd6833b79ef1354c05062fb063d335dcb6bb8511 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,4 +1,4 @@
-MAN1_TXT=$(wildcard git-*.txt)
+MAN1_TXT=$(wildcard git-*.txt) gitk.txt
 MAN7_TXT=git.txt
 
 DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))

diff --git a/debian/git-tk.files b/debian/git-tk.files
index 3801e7564b41e4f917d8eb27ad174c1f822c5b2f..e54f897ce3fb68416bc86e844c9702eb8ca8e005 100644 (file)
--- a/debian/git-tk.files
+++ b/debian/git-tk.files
@@ -1 +1,3 @@
 /usr/bin/gitk
+/usr/share/man/man1/gitk.*
+/usr/share/doc/git-core/gitk.*