Package split: Debian.

As discussed on the list, split the foreign SCM interoperability
packages and documentation from the git-core binary package.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 60646728183fca5addb0e25bf23a981e16b3ea35..76d33b44f896bdf78a71ec3ceda7d3f785b4af71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -450,8 +450,8 @@ clean:
        rm -f git-core.spec *.pyc *.pyo
        rm -rf $(GIT_TARNAME)
        rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
        rm -f git-core.spec *.pyc *.pyo
        rm -rf $(GIT_TARNAME)
        rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz

-       rm -f git-core_$(GIT_VERSION)-*.deb git-core_$(GIT_VERSION)-*.dsc
-       rm -f git-tk_$(GIT_VERSION)-*.deb
+       rm -f git-core_$(GIT_VERSION)-*.dsc
+       rm -f git-*_$(GIT_VERSION)-*.deb

        $(MAKE) -C Documentation/ clean
        $(MAKE) -C templates clean
        $(MAKE) -C t/ clean
        $(MAKE) -C Documentation/ clean
        $(MAKE) -C templates clean
        $(MAKE) -C t/ clean

diff --git a/debian/changelog b/debian/changelog
index 5fd31b7ef4ffb0854571d810ba85f81e2d998a77..9ea3139dbb359eeaff932cd1a4e2c0c1a1c9203f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-core (0.99.9-1) unstable; urgency=low
+
+  * Split the git-core binary package into core, doc, and foreign SCM
+    interoperability modules.
+
+ -- Junio C Hamano <junkio@cox.net>  Sat,  5 Nov 2005 11:18:13 -0800
+

 git-core (0.99.9-0) unstable; urgency=low
 
   * GIT 0.99.9
 git-core (0.99.9-0) unstable; urgency=low
 
   * GIT 0.99.9

diff --git a/debian/control b/debian/control
index 1f45f93b365ee11d743105582d1d29eea0fb0232..f03ca4925e292aa88f238a48daa24a680dde4402 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.1
 Package: git-core
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, rcs
 Package: git-core
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, rcs

-Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl, libsvn-core-perl (>= 1.2.1), python (>= 2.4.0), less
+Recommends: rsync, curl, ssh, python (>= 2.4.0), less

 Suggests: cogito, patch
 Conflicts: git, cogito (<< 0.13)
 Description: The git content addressable filesystem
 Suggests: cogito, patch
 Conflicts: git, cogito (<< 0.13)
 Description: The git content addressable filesystem


@@ -18,9 +18,46 @@ Description: The git content addressable filesystem
  enables human beings to work with the database in a manner to a degree
  similar to other SCM tools.
 
  enables human beings to work with the database in a manner to a degree
  similar to other SCM tools.
 

+Package: git-doc
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4
+Description: The git content addressable filesystem, Documentation
+ This package contains documentation for GIT.
+

 Package: git-tk
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4
 Description: The git content addressable filesystem, GUI add-on
  This package contains 'gitk', the git revision tree visualizer.
 
 Package: git-tk
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4
 Description: The git content addressable filesystem, GUI add-on
  This package contains 'gitk', the git revision tree visualizer.
 

+Package: git-svn
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core, libsvn-core-perl (>= 1.2.1)
+Suggests: subversion
+Description: The git content addressable filesystem, SVN interoperability
+ This package contains 'git-svnimport', to import development history from
+ SVN repositories.
+
+Package: git-arch
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core
+Suggests: tla, bazaar
+Description: The git content addressable filesystem, GNUArch interoperability
+ This package contains 'git-archimport', to import development history from
+ GNUArch repositories.
+
+Package: git-cvs
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core
+Suggests: cvs
+Description: The git content addressable filesystem, CVS interoperability
+ This package contains 'git-cvsimport', to import development history from
+ CVS repositories.
+
+Package: git-email
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, libmail-sendmail-perl, libemail-valid-perl
+Description: The git content addressable filesystem, e-mail add-on
+ This package contains 'git-send-email', to send a series of patch e-mails.
+
+

diff --git a/debian/git-arch.files b/debian/git-arch.files
new file mode 100644 (file)
index 0000000..1ad4656
--- /dev/null
+++ b/debian/git-arch.files
@@ -0,0 +1,2 @@
+/usr/bin/git-archimport
+/usr/share/doc/git-core/git-archimport.*

diff --git a/debian/git-cvs.files b/debian/git-cvs.files
new file mode 100644 (file)
index 0000000..8bf5090
--- /dev/null
+++ b/debian/git-cvs.files
@@ -0,0 +1,2 @@
+/usr/bin/git-cvsimport
+/usr/share/doc/git-core/git-cvsimport.*

diff --git a/debian/git-doc.files b/debian/git-doc.files
new file mode 100644 (file)
index 0000000..0762f37
--- /dev/null
+++ b/debian/git-doc.files
@@ -0,0 +1,7 @@
+/usr/share/doc/git-core/git-*.txt
+/usr/share/doc/git-core/git-*.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
new file mode 100644 (file)
index 0000000..236754c
--- /dev/null
+++ b/debian/git-email.files
@@ -0,0 +1,2 @@
+/usr/bin/git-send-email
+/usr/share/doc/git-core/git-send-email.*

diff --git a/debian/git-svn.files b/debian/git-svn.files
new file mode 100644 (file)
index 0000000..317b12a
--- /dev/null
+++ b/debian/git-svn.files
@@ -0,0 +1,2 @@
+/usr/bin/git-svnimport
+/usr/share/doc/git-core/git-svnimport.*

diff --git a/debian/rules b/debian/rules
index 568d430932bf96efd9c6a448adbb42507c821a0f..9f9514648f2c42e4f92a8c44441ededfbc0d6a59 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ MAN_DESTDIR := $(DESTDIR)/$(MANDIR)
 build: debian/build-stamp
 debian/build-stamp:
        dh_testdir
 build: debian/build-stamp
 debian/build-stamp:
        dh_testdir

-       $(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all doc test
+       $(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all test doc

        touch debian/build-stamp
 
 debian-clean:
        touch debian/build-stamp
 
 debian-clean:


@@ -65,7 +65,12 @@ install: build
        mkdir -p $(DOC_DESTDIR)
        find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'
 
        mkdir -p $(DOC_DESTDIR)
        find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'
 

+       dh_movefiles -p git-arch
+       dh_movefiles -p git-cvs
+       dh_movefiles -p git-svn

        dh_movefiles -p git-tk
        dh_movefiles -p git-tk

+       dh_movefiles -p git-email
+       dh_movefiles -p git-doc

        dh_movefiles -p git-core
        find debian/tmp -type d -o -print | sed -e 's/^/? /'
 
        dh_movefiles -p git-core
        find debian/tmp -type d -o -print | sed -e 's/^/? /'