Attempt at a good package

diff --git a/debian/changelog b/debian/changelog
index 17009bc9b3e606e4d07f0455ff208a3fbb6f9fcb..47206f8cb2f6ac79ee6cf1ff19dbae20f7d130f7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+userv-utils (0.4~beta1) unstable; urgency=low
+
+  git-daemon:
+  * New userv-git-daemon service.
+
+  package admin:
+  * Now in git.
+  * Fixed up some portability problems.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 22 May 2010 19:50:57 +0100
+

 userv-utils (0.3) unstable; urgency=medium
 
   dyndns:
 userv-utils (0.3) unstable; urgency=medium
 
   dyndns:

diff --git a/debian/rules b/debian/rules
index 30ec6a340c1495a1739b1b44babf58e1294e3c60..b7353f3718106fef500e59e0a335b2468af6398a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 subdirs_build= ipif www-cgi git-daemon
 subdirs_nobuild=dyndns groupmanage misc
 package=       userv-utils
 subdirs_build= ipif www-cgi git-daemon
 subdirs_nobuild=dyndns groupmanage misc
 package=       userv-utils

-packages_indep=        userv-dyndns userv-groupmanage userv-misc git-daemon
+packages_indep=        userv-dyndns userv-groupmanage userv-misc userv-git-daemon

 packages_arch= userv-ipif userv-cgi
 packages=      $(packages_indep) $(packages_arch)
 
 packages_arch= userv-ipif userv-cgi
 packages=      $(packages_indep) $(packages_arch)
 


@@ -34,7 +34,8 @@ binary-prep:
                $(MAKE) -C $$s install install-docs install-examples \
                        prefix=$t/userv-$$s/usr \
                        etcdir=$t/userv-$$s/etc \
                $(MAKE) -C $$s install install-docs install-examples \
                        prefix=$t/userv-$$s/usr \
                        etcdir=$t/userv-$$s/etc \

-                       varlib=$t/userv-$$s/var/lib; \
+                       vardir=$t/userv-$$s/var \
+                       gituser=root; \

        done
        #
        mv debian/tmp/userv-www-cgi debian/tmp/userv-cgi
        done
        #
        mv debian/tmp/userv-www-cgi debian/tmp/userv-cgi

diff --git a/debian/userv-git-daemon/postinst b/debian/userv-git-daemon/postinst
new file mode 100755 (executable)
index 0000000..8609c73
--- /dev/null
+++ b/debian/userv-git-daemon/postinst
@@ -0,0 +1,32 @@
+#!/bin/sh
+set -e
+
+# Copyright (C) 2010 Ian Jackson
+#
+# This file is part of userv-git-daemon, part of userv-utils
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with userv-utils; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+GITDUSER=git
+
+defaults=/etc/default/userv-git-daemon
+if test -f $defaults; then . $defaults; fi
+
+if [ "$GITDUSER" ]; then
+       if id $GITDUSER >/dev/null 2>&1; then exit 0; fi
+
+       adduser --system --group --gecos 'userv git daemon' \
+               --home /etc/userv $GITDUSER
+fi

diff --git a/git-daemon/Makefile b/git-daemon/Makefile
index ef117fe675be87f889ef83bbcb50aa48c37b859f..ea76975c2936bc839c45c3e324f8d2d4d34455db 100644 (file)
--- a/git-daemon/Makefile
+++ b/git-daemon/Makefile
@@ -45,6 +45,15 @@ install:     all
                        mv $$f:new $$f; \
                done
 
                        mv $$f:new $$f; \
                done
 

+mkdocdir:
+               mkdir -p $(docdir)/userv-git-daemon
+
+install-docs:  mkdocdir
+               cp README $(docdir)/userv-git-daemon/README
+
+install-examples: all mkdocdir
+               cp inetd.conf $(docdir)/userv-git-daemon/inetd.conf
+

 distclean clean:
                rm -f $(TARGETS) *~
 
 distclean clean:
                rm -f $(TARGETS) *~