summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-05 20:54:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-06 09:12:32 (GMT)
commit9eba845f2088c33de3efe04492b9e33114c5fb52 (patch)
treea3ea7d2776e689a15c1cf933eb88f89d4ace3df7
parent54c2533da0228244bbde7f94abfdb0a7fbb859c1 (diff)
downloadgit-9eba845f2088c33de3efe04492b9e33114c5fb52.zip
git-9eba845f2088c33de3efe04492b9e33114c5fb52.tar.gz
git-9eba845f2088c33de3efe04492b9e33114c5fb52.tar.bz2
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>
-rw-r--r--debian/control2
-rw-r--r--debian/git-doc.files4
-rwxr-xr-xdebian/rules4
3 files changed, 5 insertions, 5 deletions
diff --git a/debian/control b/debian/control
index f03ca49..8cc527e 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 0762f37..567f5d7 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 9f95146..4ab221c 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