From: Junio C Hamano <junkio@cox.net>
Date: Tue, 8 Nov 2005 09:20:24 +0000 (-0800)
Subject: Debian: packaging updates.
X-Git-Tag: v0.99.9f^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=76bca9d1a95c0fbf9e31bcb7b6a52e1d318577e7;p=git.git

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>
---

diff --git a/debian/changelog b/debian/changelog
index 0c6e34b89..10f67b8a2 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 1ad4656c5..d7449540c 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 1ed46333d..eff1a9523 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 8bf509068..a6b40ff9e 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 567f5d7a8..0daf545ad 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 236754ceb..2d6a51fc3 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 317b12a74..eea8d83f6 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 e54f897ce..478ec9440 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.*