From 76bca9d1a95c0fbf9e31bcb7b6a52e1d318577e7 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Tue, 8 Nov 2005 01:20:24 -0800
Subject: [PATCH] Debian: packaging updates.

Do not scatter txt and html documentation into feature subpackages.
Do place man pages into them.

Capture more cvs stuff into git-cvs package.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 debian/changelog         | 8 ++++++++
 debian/git-arch.files    | 4 ++--
 debian/git-core.doc-base | 4 +++-
 debian/git-cvs.files     | 4 ++--
 debian/git-doc.files     | 3 ---
 debian/git-email.files   | 2 +-
 debian/git-svn.files     | 4 ++--
 debian/git-tk.files      | 1 -
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c6e34b89d..10f67b8a2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+git-core (0.99.9.GIT-1) unstable; urgency=low
+
+  * Do not scatter txt and html documentation into feature
+    subpackages.  Do place man pages into them.
+  * Capture more cvs stuff into git-cvs package.
+
+ -- Junio C Hamano <junkio@cox.net>  Tue,  8 Nov 2005 01:19:06 -0800
+
 git-core (0.99.9.GIT-0) unstable; urgency=low
 
   * Test Build.
diff --git a/debian/git-arch.files b/debian/git-arch.files
index 1ad4656c53..d7449540cb 100644
--- a/debian/git-arch.files
+++ b/debian/git-arch.files
@@ -1,2 +1,2 @@
-/usr/bin/git-archimport
-/usr/share/doc/git-core/git-archimport.*
+/usr/bin/git-arch*
+/usr/share/man/*/git-arch*
diff --git a/debian/git-core.doc-base b/debian/git-core.doc-base
index 1ed46333d1..eff1a9523e 100644
--- a/debian/git-core.doc-base
+++ b/debian/git-core.doc-base
@@ -6,6 +6,8 @@ Section: Devel
 Format: HTML
 Index: /usr/share/doc/git-core/git.html
 Files: /usr/share/doc/git-core/*.html
+ /usr/share/doc/git-core/*/*.html
 
 Format: text
-Files: /usr/share/doc/git-core/git.txt*
+Files: /usr/share/doc/git-core/*.txt
+ /usr/share/doc/git-core/*/*.txt
diff --git a/debian/git-cvs.files b/debian/git-cvs.files
index 8bf5090681..a6b40ff9ea 100644
--- a/debian/git-cvs.files
+++ b/debian/git-cvs.files
@@ -1,2 +1,2 @@
-/usr/bin/git-cvsimport
-/usr/share/doc/git-core/git-cvsimport.*
+/usr/bin/git-cvs*
+/usr/share/man/*/git-cvs*
diff --git a/debian/git-doc.files b/debian/git-doc.files
index 567f5d7a8c..0daf545ad5 100644
--- a/debian/git-doc.files
+++ b/debian/git-doc.files
@@ -2,6 +2,3 @@
 /usr/share/doc/git-core/*.html
 /usr/share/doc/git-core/*/*.html
 /usr/share/doc/git-core/*/*.txt
-
-
-
diff --git a/debian/git-email.files b/debian/git-email.files
index 236754ceb6..2d6a51fc33 100644
--- a/debian/git-email.files
+++ b/debian/git-email.files
@@ -1,2 +1,2 @@
 /usr/bin/git-send-email
-/usr/share/doc/git-core/git-send-email.*
+/usr/share/man/*/git-send-email.*
diff --git a/debian/git-svn.files b/debian/git-svn.files
index 317b12a74a..eea8d83f62 100644
--- a/debian/git-svn.files
+++ b/debian/git-svn.files
@@ -1,2 +1,2 @@
-/usr/bin/git-svnimport
-/usr/share/doc/git-core/git-svnimport.*
+/usr/bin/git-svn*
+/usr/share/man/*/git-svn*
diff --git a/debian/git-tk.files b/debian/git-tk.files
index e54f897ce3..478ec94404 100644
--- a/debian/git-tk.files
+++ b/debian/git-tk.files
@@ -1,3 +1,2 @@
 /usr/bin/gitk
 /usr/share/man/man1/gitk.*
-/usr/share/doc/git-core/gitk.*
-- 
2.11.4.GIT