From: Junio C Hamano Date: Sat, 5 Nov 2005 20:54:25 +0000 (-0800) Subject: Further Debian split fixes. X-Git-Tag: v0.99.9e^2~11 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9eba845f2088c33de3efe04492b9e33114c5fb52;p=git.git 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 --- diff --git a/debian/control b/debian/control index f03ca492..8cc527e2 100644 --- 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 0762f379..567f5d7a 100644 --- 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 9f951464..4ab221ce 100755 --- 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