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 0c6e34b89d796deada9fc8fa0d977d3ec3dedc94..10f67b8a2e3f61fa86bed6d59b474e0b9e91f9fb 100644 (file)
--- 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.
 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 1ad4656c53366fd285ebd5ecb3c0f1356160183a..d7449540cb8db712613cf67c3211fc451ac85a5b 100644 (file)
--- 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 1ed46333d186aac0ec12ea3aeb7684d843014b3e..eff1a9523ed5060d5d562c2749d7b75c928305de 100644 (file)
--- 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
 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
 
 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 8bf50906814650d307d5e70b8445bc300aa202cd..a6b40ff9ea38d66a4b0e7ed0e1baa7ef270f3c0e 100644 (file)
--- 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 567f5d7a8c0113dddd638c6e6f1b0fd1870ffe61..0daf545ad5dcb3c774025592f94e8816287f39b5 100644 (file)
--- 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
 /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 236754ceb67f44e0eac1bcf9419f0c2fda61fb3d..2d6a51fc339f88bae208b0669bff1ab80feaa240 100644 (file)
--- a/debian/git-email.files
+++ b/debian/git-email.files
@@ -1,2 +1,2 @@
 /usr/bin/git-send-email
 /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 317b12a74a2d4403acee8fae9505f4fc02cafe02..eea8d83f62a50dffbebd08ca50296b0853b6c5d6 100644 (file)
--- 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 e54f897ce3fb68416bc86e844c9702eb8ca8e005..478ec944047c6f93db56c66ca72b7054d7f1d5b7 100644 (file)
--- a/debian/git-tk.files
+++ b/debian/git-tk.files
@@ -1,3 +1,2 @@
 /usr/bin/gitk
 /usr/share/man/man1/gitk.*
 /usr/bin/gitk
 /usr/share/man/man1/gitk.*

-/usr/share/doc/git-core/gitk.*