Further Debian split fixes.

The doc installation was flattened, breaking links to howto/.
Silly cut&paste error made git-doc depend on tk8.4.  Doh.
Move most of the documentation (except manuals) to git-doc.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/debian/control b/debian/control
index f03ca4925e292aa88f238a48daa24a680dde4402..8cc527e2daf7888ec60f2f0fe2fa8910ef770002 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Description: The git content addressable filesystem
 
 Package: git-doc
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4
+Depends: ${shlibs:Depends}, ${misc:Depends}, git-core
 Description: The git content addressable filesystem, Documentation
  This package contains documentation for GIT.
 

diff --git a/debian/git-doc.files b/debian/git-doc.files
index 0762f3791b7bede4d8e28af86c9c7a4c86698ffa..567f5d7a8c0113dddd638c6e6f1b0fd1870ffe61 100644 (file)
--- a/debian/git-doc.files
+++ b/debian/git-doc.files
@@ -1,5 +1,5 @@
-/usr/share/doc/git-core/git-*.txt
-/usr/share/doc/git-core/git-*.html
+/usr/share/doc/git-core/*.txt
+/usr/share/doc/git-core/*.html
 /usr/share/doc/git-core/*/*.html
 /usr/share/doc/git-core/*/*.txt
 

diff --git a/debian/rules b/debian/rules
index 9f9514648f2c42e4f92a8c44441ededfbc0d6a59..4ab221ce9ea5a24201b1bf37c3c9d07eff243770 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,8 @@ install: build
        make DESTDIR=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) \
                install install-doc
 
-       mkdir -p $(DOC_DESTDIR)
-       find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'
+       make -C Documentation DESTDIR=$(DESTDIR) prefix=$(PREFIX) \
+               WEBDOC_DEST=$(DOC_DESTDIR) install-webdoc
 
        dh_movefiles -p git-arch
        dh_movefiles -p git-cvs