New dgit-infrastructure binary package containing dgit-repos-server et al. Client...

diff --git a/.gitignore b/.gitignore
index 737875fe91efcff5f912487666d9baf79eada259..c25efea8a806503aca6938f5bc33435211ca4c52 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *~
 tests/tmp
 debian/dgit
 *~
 tests/tmp
 debian/dgit

+debian/dgit-infrastructure

 debian/files
 debian/*.substvars
 debian/*.log
 debian/files
 debian/*.substvars
 debian/*.log

diff --git a/Makefile b/Makefile
index f456d93eb2459d529caeafbf83b8fe3b8809f9e3..caac3d984120d05367541aa45b65a96552433a70 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,14 @@ prefix?=/usr/local
 bindir=$(prefix)/bin
 mandir=$(prefix)/share/man
 man1dir=$(mandir)/man1
 bindir=$(prefix)/bin
 mandir=$(prefix)/share/man
 man1dir=$(mandir)/man1

+infraexamplesdir=$(prefix)/share/doc/dgit-infrastructure/examples

 
 

-PROGRAMS=dgit dgit-repos-server
+PROGRAMS=dgit

 MAN1PAGES=dgit.1
 
 MAN1PAGES=dgit.1
 

+INFRA_PROGRAMS=dgit-repos-server dgit-ssh-dispatch
+INFRA_EXAMPLES=get-dm-txt ssh-wrap
+

 all:
 
 install:       installdirs
 all:
 
 install:       installdirs


@@ -39,6 +43,15 @@ install:     installdirs
 installdirs:
        $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
 
 installdirs:
        $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
 

+install-infra: installdirs-infra
+       $(INSTALL_PROGRAM) $(addprefix infra/, $(INFRA_PROGRAMS)) \
+               $(DESTDIR)$(bindir)
+       $(INSTALL_PROGRAM) $(addprefix infra/, $(INFRA_EXAMPLES)) \
+               $(DESTDIR)$(infraexamplesdir)
+
+installdirs-infra:
+       $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(infraexamplesdir)
+

 check installcheck:
 
 clean distclean mostlyclean maintainer-clean:
 check installcheck:
 
 clean distclean mostlyclean maintainer-clean:

diff --git a/debian/changelog b/debian/changelog
index 775be6c675eaec07a177e7b1ff203ef812831157..6629b0b57491ae9fc0608b73956ac6895205e800 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,10 @@ dgit (0.23~) unstable; urgency=low
 
   * Add missing `gpgv' to test dependencies in debian/tests/control.
 
 
   * Add missing `gpgv' to test dependencies in debian/tests/control.
 

+  * New dgit-infrastructure binary package containing dgit-repos-server et
+    al.  Client users probably don't want this stuff.  Also, it provides a
+    convenient way to publish the dependencies.
+

  --
 
 dgit (0.22.1) unstable; urgency=high
  --
 
 dgit (0.22.1) unstable; urgency=high

diff --git a/debian/control b/debian/control
index 798465bdb1cfd776ef65b5fd63bddb39773f1996..cc26c043454ef172c581d3b21f7542f73ffd9172 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,3 +21,13 @@ Description: git interoperability with the Debian archive
  dgit push constructs uploads from git commits
  .
  dgit clone and dgit fetch construct git commits from uploads.
  dgit push constructs uploads from git commits
  .
  dgit clone and dgit fetch construct git commits from uploads.

+
+Package: dgit-infrastructure
+Depends: ${misc:Depends}
+Recommends: perl, git-core, gpgv, chiark-utils-bin, wget,
+            libdigest-sha-perl
+Architecture: all
+Priority: extra
+Description: dgit server backend infrastructure
+ This package contains tools which are useful for setting up a dgit
+ git repository server.  You probably want dgit, the client package.

diff --git a/debian/rules b/debian/rules
index fece672aef8cbf8f3be503c4bf72fef9b0bacc78..e02ea9066f39cb81dac090c504e3b7630dd639d7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,3 +29,7 @@ override_dh_gencontrol:
         cd debian/dgit; \
         v=$$(perl -ne 'print if s/^version:\s+//i' DEBIAN/control); \
         perl -i -pe "s/UNRELEASED/$$v/g if m/###substituted###/" usr/bin/dgit
         cd debian/dgit; \
         v=$$(perl -ne 'print if s/^version:\s+//i' DEBIAN/control); \
         perl -i -pe "s/UNRELEASED/$$v/g if m/###substituted###/" usr/bin/dgit

+
+override_dh_auto_install:
+       make install prefix=/usr DESTDIR=debian/dgit
+       make install-infra prefix=/usr DESTDIR=debian/dgit-infrastructure

diff --git a/debian/tests/control b/debian/tests/control
index aca24c4b807cb4084372e7b26907bf3b5c767435..37124e6447938a9c04ac1a4dd3e87337c06cb4ee 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: clone-nogit fetch-localgitonly fetch-somegit-notlast push-newpackage push-nextdgit quilt push-buildproductsdir
 Tests-Directory: tests/tests
 Tests: clone-nogit fetch-localgitonly fetch-somegit-notlast push-newpackage push-nextdgit quilt push-buildproductsdir
 Tests-Directory: tests/tests

-Depends: @, devscripts, gpgv
+Depends: dgit, dgit-infrastructure, devscripts, gpgv

diff --git a/dgit-repos-server b/infra/dgit-repos-server
similarity index 100%
rename from dgit-repos-server
rename to infra/dgit-repos-server

diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index bd8582aaae2aaae9ccd4cff5b3e349b8767224ff..b515edad988391635275fd4c54c7400a2eb7e9aa 100755 (executable)
--- a/infra/dgit-ssh-dispatch
+++ b/infra/dgit-ssh-dispatch
@@ -120,7 +120,7 @@ sub dispatch () {
        my $cmd=$1;
        selectpackage $2,$3;
        if ($cmd eq 'receive-pack') {
        my $cmd=$1;
        selectpackage $2,$3;
        if ($cmd eq 'receive-pack') {

-           my $s = "$dgitlive/dgit-repos-server";
+           my $s = "$dgitlive/infra/dgit-repos-server";

            exec $s, $suites, $authrune, $repos, qw(--ssh);
            die "exec $s: $!";
        } elsif ($cmd eq 'upload-pack') {
            exec $s, $suites, $authrune, $repos, qw(--ssh);
            die "exec $s: $!";
        } elsif ($cmd eq 'upload-pack') {

diff --git a/tests/lib b/tests/lib
index 019a9984875eb784d4d5041db97d2c82e8c3e646..adbd79ff587870bcd39e5443fd5e7f42f49258dc 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -5,7 +5,7 @@ set -x
 
 if [ "x$DGIT_TEST_INTREE" != x ]; then
        : ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
 
 if [ "x$DGIT_TEST_INTREE" != x ]; then
        : ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}

-       : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/dgit-repos-server}
+       : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/infra/dgit-repos-server}

        : ${DGIT_SSH_DISPATCH_TEST:=$DGIT_TEST_INTREE/infra/dgit-ssh-dispatch}
        export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
 fi
        : ${DGIT_SSH_DISPATCH_TEST:=$DGIT_TEST_INTREE/infra/dgit-ssh-dispatch}
        export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
 fi