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 f03ca49..8cc527e 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 0762f37..567f5d7 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 9f95146..4ab221c 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