Moved debian-tools (from CVS) to here.
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 6 Nov 2008 12:49:54 +0000 (13:49 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 6 Nov 2008 12:49:54 +0000 (13:49 +0100)
18 files changed:
README [new file with mode: 0644]
cvsignore-mv.sh [deleted file]
cvsignore-mv/cvsignore-mv.sh [new file with mode: 0755]
id-cvs-to-git.sh [deleted file]
id-cvs-to-git/id-cvs-to-git.sh [new file with mode: 0755]
id-cvs-to-git/import.names [new file with mode: 0644]
id-deb-build/id-deb-build.sh [new file with mode: 0755]
id-deb-build/id-mk-deb-src.sh [new file with mode: 0755]
id-new-project.sh [deleted file]
id-new-project/id-new-project.sh [new file with mode: 0755]
id-new-project/post-receive-email-id [new file with mode: 0644]
import.names [deleted file]
post-receive-email-id [deleted file]
update-archive/README [new file with mode: 0644]
update-archive/apt-ftparchive.conf.in [new file with mode: 0644]
update-archive/apt-release.conf.in [new file with mode: 0644]
update-archive/symclean.sh [new file with mode: 0755]
update-archive/update-archive.sh [new file with mode: 0755]

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..5147345
--- /dev/null
+++ b/README
@@ -0,0 +1,17 @@
+Index Data's Debian-tools.
+
+update-archive: Tools for making a Debian APT-based repository.
+
+Be sure to build Debian package files on a clean systems such as
+"etch" or "lenny" -- not a machine polluted with non-Debian installs.
+
+Copy all four files of each package (.dsc, .tar.gz, .deb and .changes
+on kebab) into a directory within /home/ftp/pub, of the form:
+       /home/ftp/pub/<source-package-name>/debian/<version>
+For example:
+       /home/ftp/pub/zebra/debian/etch
+       /home/ftp/pub/libnet-z3950-pqf-perl/debian/lenny
+
+Then, on kebab, run the script:
+       update-archive/update-archive.sh
+
diff --git a/cvsignore-mv.sh b/cvsignore-mv.sh
deleted file mode 100755 (executable)
index ffb8ac9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# moves all .cvsignore to .gitignore
-for c in `find . -name .cvsignore`; do
-       n=`echo $c|sed -es/cvsignore/gitignore/`
-       git mv $c $n
-done
diff --git a/cvsignore-mv/cvsignore-mv.sh b/cvsignore-mv/cvsignore-mv.sh
new file mode 100755 (executable)
index 0000000..ffb8ac9
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+# moves all .cvsignore to .gitignore
+for c in `find . -name .cvsignore`; do
+       n=`echo $c|sed -es/cvsignore/gitignore/`
+       git mv $c $n
+done
diff --git a/id-cvs-to-git.sh b/id-cvs-to-git.sh
deleted file mode 100755 (executable)
index 761b57f..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# id-cvs-to-git.sh: Creates new bare Git Project from CVS
-#
-usage() {
-       cat  <<EOF
-Usage:
-id-cvs-to-git.sh source project description
-
- source: is a GIT project source or 'CVS'
- project: is the GIT project name (destination) and project source (If CVS)
- description: description for the project
- Convert YAZ from CVS to Git
-  id-cvs-to-git.sh CVS yaz "Yet another Z39.50 toolkit"
-
- Make bare new Git project from existing Git repo ../newproject
-  id-cvs-to-git.sh ../newproject newproject "My new project"
-EOF
-}
-
-SRC=$1
-P=$2
-DESC="$3"
-
-if test -z "$SRC"; then
-       usage
-       exit 1
-fi
-if test -z "$P"; then
-       echo "Error: Missing Project"
-       usage
-       exit 1
-fi
-if test -z "$DESC"; then
-       echo "Error: Missing Description"
-       usage
-       exit 1
-fi
-if test "$SRC" = "CVS"; then
-       rm -fr import_project
-       mkdir import_project
-       cd import_project
-       git-cvsimport -u -A ../import.names -v $P
-       cd ..
-       git clone --bare import_project ${P}.git
-else
-       git clone --bare ${SRC} ${P}.git
-fi
-touch ${P}.git/git-daemon-export-ok
-echo $DESC > ${P}.git/description
diff --git a/id-cvs-to-git/id-cvs-to-git.sh b/id-cvs-to-git/id-cvs-to-git.sh
new file mode 100755 (executable)
index 0000000..761b57f
--- /dev/null
@@ -0,0 +1,50 @@
+#!/bin/sh
+# id-cvs-to-git.sh: Creates new bare Git Project from CVS
+#
+usage() {
+       cat  <<EOF
+Usage:
+id-cvs-to-git.sh source project description
+
+ source: is a GIT project source or 'CVS'
+ project: is the GIT project name (destination) and project source (If CVS)
+ description: description for the project
+ Convert YAZ from CVS to Git
+  id-cvs-to-git.sh CVS yaz "Yet another Z39.50 toolkit"
+
+ Make bare new Git project from existing Git repo ../newproject
+  id-cvs-to-git.sh ../newproject newproject "My new project"
+EOF
+}
+
+SRC=$1
+P=$2
+DESC="$3"
+
+if test -z "$SRC"; then
+       usage
+       exit 1
+fi
+if test -z "$P"; then
+       echo "Error: Missing Project"
+       usage
+       exit 1
+fi
+if test -z "$DESC"; then
+       echo "Error: Missing Description"
+       usage
+       exit 1
+fi
+if test "$SRC" = "CVS"; then
+       rm -fr import_project
+       mkdir import_project
+       cd import_project
+       git-cvsimport -u -A ../import.names -v $P
+       cd ..
+       git clone --bare import_project ${P}.git
+else
+       git clone --bare ${SRC} ${P}.git
+fi
+touch ${P}.git/git-daemon-export-ok
+echo $DESC > ${P}.git/description
diff --git a/id-cvs-to-git/import.names b/id-cvs-to-git/import.names
new file mode 100644 (file)
index 0000000..f871975
--- /dev/null
@@ -0,0 +1,8 @@
+heikki=Heikki Levanto <heikki@indexdata.dk>
+adam=Adam Dickmeiss <adam@indexdata.dk>
+perhans=Per M. Hansen <perhans@indexdata.dk>
+quinn=Sebastian Hammer <quinn@indexdata.com>
+sondberg=Anders S. Mortensen <sondberg@indexdata.dk>
+marc=Marc Cromme <marc@indexdata.dk>
+jakub=Jakub Skoczen <jakub@indexdata.dk>
+mike=Mike Taylor <mike@indexdata.com>
diff --git a/id-deb-build/id-deb-build.sh b/id-deb-build/id-deb-build.sh
new file mode 100755 (executable)
index 0000000..edd3d51
--- /dev/null
@@ -0,0 +1,40 @@
+#!/bin/sh
+HOST=$1
+if test -z "${HOST}"; then
+       echo "Usage"
+       echo " $0 host"
+       exit 1
+fi
+DEBCHANGELOG=debian/changelog
+if test ! -f $DEBCHANGELOG; then
+       echo "$DEBCHANGELOG missing"
+       exit 1
+fi
+l=`head -1 $DEBCHANGELOG`
+PROD=`echo $l|sed 's/ .*//g'`
+VERSION=`echo $l|sed 's/.*(//g'|sed 's/).*//g'`
+echo "VERSION=$VERSION"
+MAJOR=`echo $VERSION|sed 's/-.*//g'`
+echo "MAJOR=$MAJOR"
+MINOR=`echo $VERSION|sed 's/.*-//g'`
+echo "MINOR=$MINOR"
+TAR=${PROD}-${MAJOR}.tar.gz
+if test ! -f ${TAR}; then
+       echo "$0: ${TAR} missing"
+       exit 1
+fi
+ORIG=${PROD}_${MAJOR}.orig.tar.gz
+echo "TAR=$TAR"
+echo "ORIG=$ORIG"
+DIR="debian/build-${PROD}-${VERSION}"
+set -e
+ssh $HOST "rm -fr ${DIR}; mkdir ${DIR}"
+scp ${TAR} ${HOST}:${DIR}/${ORIG}
+ssh ${HOST} "cd ${DIR} && tar xzf ${ORIG}"
+scp -r debian "${HOST}:${DIR}/${PROD}-${MAJOR}"
+ssh ${HOST} "cd ${DIR}/${PROD}-${MAJOR} && dpkg-buildpackage -rfakeroot"
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 8
+# End:
diff --git a/id-deb-build/id-mk-deb-src.sh b/id-deb-build/id-mk-deb-src.sh
new file mode 100755 (executable)
index 0000000..84814e4
--- /dev/null
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Makes Debian source for package in deb-src
+# The current directory should hold a .tar.gz (dist) for the package
+# And the current directory should hold a debian and a corresponding changelog
+DEBCHANGELOG=debian/changelog
+if test ! -f $DEBCHANGELOG; then
+       echo "$DEBCHANGELOG missing"
+       echo "The current directory should be base source of package"
+       exit 1
+fi
+if test -d deb-src; then
+       echo "deb-src exist. You might remove it"
+       exit 1
+fi
+l=`head -1 $DEBCHANGELOG`
+PROD=`echo $l|sed 's/ .*//g'`
+VERSION=`echo $l|sed 's/.*(//g'|sed 's/).*//g'`
+echo "VERSION=$VERSION"
+MAJOR=`echo $VERSION|sed 's/-.*//g'`
+echo "MAJOR=$MAJOR"
+MINOR=`echo $VERSION|sed 's/.*-//g'`
+echo "MINOR=$MINOR"
+TAR=${PROD}-${MAJOR}.tar.gz
+if test ! -f ${TAR}; then
+       echo "$0: ${TAR} missing"
+       exit 1
+fi
+set -e
+mkdir deb-src
+ORIG=${PROD}_${MAJOR}.orig.tar.gz
+echo "TAR=$TAR"
+echo "ORIG=$ORIG"
+cp ${TAR} deb-src/${ORIG}
+cd deb-src
+tar xf ${ORIG}
+cp -r ../debian ${PROD}-${MAJOR}
+dpkg-source -b ${PROD}-${MAJOR}
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 8
+# End:
diff --git a/id-new-project.sh b/id-new-project.sh
deleted file mode 100755 (executable)
index 42d9410..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-usage() {
-       echo "Usage:"
-       echo "id-new-git.sh srcdir description {pub/private}"
-       echo "For example:"
-       echo "id-new-git.sh ../myproj \"Which does good things\" private"
-       exit 1
-}
-
-SRC=$1
-DESC=$2
-TYPE=$3
-
-if test -z "${TYPE}"; then
-       usage 
-fi
-
-if test ! -e post-receive-email-id; then
-       echo "file post-receive-email-id must be in current directory"
-       exit 1  
-fi
-
-PROJ=`basename $SRC`
-
-if test -d ${PROJ}.git; then
-       echo "${PROJ}.git already exists"
-       exit 1
-fi
-
-
-if git clone --bare $SRC ${PROJ}.git; then
-       cd ${PROJ}.git
-       touch git-daemon-export-ok
-       echo "${DESC}" >description
-       git config core.sharedRepository true
-       cp ../post-receive-email-id hooks/post-receive
-       chmod +x hooks/post-receive
-       git config hooks.mailinglist gitid@indexdata.dk
-       cd ..
-       scp -r ${PROJ}.git git.indexdata.com:/home/git/${TYPE}
-       ssh git.indexdata.com "cd /home/git/${TYPE}/${PROJ}.git && chmod -R g+w . && chgrp -R git . && find . -type d | xargs chmod g+s"
-fi
-
diff --git a/id-new-project/id-new-project.sh b/id-new-project/id-new-project.sh
new file mode 100755 (executable)
index 0000000..42d9410
--- /dev/null
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+usage() {
+       echo "Usage:"
+       echo "id-new-git.sh srcdir description {pub/private}"
+       echo "For example:"
+       echo "id-new-git.sh ../myproj \"Which does good things\" private"
+       exit 1
+}
+
+SRC=$1
+DESC=$2
+TYPE=$3
+
+if test -z "${TYPE}"; then
+       usage 
+fi
+
+if test ! -e post-receive-email-id; then
+       echo "file post-receive-email-id must be in current directory"
+       exit 1  
+fi
+
+PROJ=`basename $SRC`
+
+if test -d ${PROJ}.git; then
+       echo "${PROJ}.git already exists"
+       exit 1
+fi
+
+
+if git clone --bare $SRC ${PROJ}.git; then
+       cd ${PROJ}.git
+       touch git-daemon-export-ok
+       echo "${DESC}" >description
+       git config core.sharedRepository true
+       cp ../post-receive-email-id hooks/post-receive
+       chmod +x hooks/post-receive
+       git config hooks.mailinglist gitid@indexdata.dk
+       cd ..
+       scp -r ${PROJ}.git git.indexdata.com:/home/git/${TYPE}
+       ssh git.indexdata.com "cd /home/git/${TYPE}/${PROJ}.git && chmod -R g+w . && chgrp -R git . && find . -type d | xargs chmod g+s"
+fi
+
diff --git a/id-new-project/post-receive-email-id b/id-new-project/post-receive-email-id
new file mode 100644 (file)
index 0000000..6f87ac7
--- /dev/null
@@ -0,0 +1,617 @@
+#!/bin/sh
+#
+# Based on /usr/share/doc/git-core/contrib/hooks/post-receive-email
+#
+# Copyright (c) 2007 Andy Parkins
+#
+# An example hook script to mail out commit update information.  This hook sends emails
+# listing new revisions to the repository introduced by the change being reported.  The
+# rule is that (for branch updates) each commit will appear on one email and one email
+# only.
+#
+# This hook is stored in the contrib/hooks directory.  Your distribution will have put
+# this somewhere standard.  You should make this script executable then link to it in
+# the repository you would like to use it in.  For example, on debian the hook is stored
+# in /usr/share/doc/git-core/contrib/hooks/post-receive-email:
+#
+#  chmod a+x post-receive-email
+#  cd /path/to/your/repository.git
+#  ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive
+#
+# This hook script assumes it is enabled on the central repository of a project, with
+# all users pushing only to it and not between each other.  It will still work if you
+# don't operate in that style, but it would become possible for the email to be from
+# someone other than the person doing the push.
+#
+# Config
+# ------
+# hooks.mailinglist
+#   This is the list that all pushes will go to; leave it blank to not send
+#   emails for every ref update.
+# hooks.announcelist
+#   This is the list that all pushes of annotated tags will go to.  Leave it
+#   blank to default to the mailinglist field.  The announce emails lists the
+#   short log summary of the changes since the last annotated tag.
+# hook.envelopesender
+#   If set then the -f option is passed to sendmail to allow the envelope sender
+#   address to be set
+#
+# Notes
+# -----
+# All emails have their subjects prefixed with "[SCM]" to aid filtering.
+# All emails include the headers "X-Git-Refname", "X-Git-Oldrev",
+# "X-Git-Newrev", and "X-Git-Reftype" to enable fine tuned filtering and
+# give information for debugging.
+#
+
+# ---------------------------- Functions
+
+#
+# Top level email generation function.  This decides what type of update
+# this is and calls the appropriate body-generation routine after outputting
+# the common header
+#
+# Note this function doesn't actually generate any email output, that is taken
+# care of by the functions it calls:
+#  - generate_email_header
+#  - generate_create_XXXX_email
+#  - generate_update_XXXX_email
+#  - generate_delete_XXXX_email
+#  - generate_email_footer
+#
+generate_email()
+{
+       # --- Arguments
+       oldrev=$(git rev-parse $1)
+       newrev=$(git rev-parse $2)
+       refname="$3"
+
+       # --- Interpret
+       # 0000->1234 (create)
+       # 1234->2345 (update)
+       # 2345->0000 (delete)
+       if expr "$oldrev" : '0*$' >/dev/null
+       then
+               change_type="create"
+       else
+               if expr "$newrev" : '0*$' >/dev/null
+               then
+                       change_type="delete"
+               else
+                       change_type="update"
+               fi
+       fi
+
+       # --- Get the revision types
+       newrev_type=$(git cat-file -t $newrev 2> /dev/null)
+       oldrev_type=$(git cat-file -t "$oldrev" 2> /dev/null)
+       case "$change_type" in
+       create|update)
+               rev="$newrev"
+               rev_type="$newrev_type"
+               ;;
+       delete)
+               rev="$oldrev"
+               rev_type="$oldrev_type"
+               ;;
+       esac
+
+       # The revision type tells us what type the commit is, combined with
+       # the location of the ref we can decide between
+       #  - working branch
+       #  - tracking branch
+       #  - unannoted tag
+       #  - annotated tag
+       case "$refname","$rev_type" in
+               refs/tags/*,commit)
+                       # un-annotated tag
+                       refname_type="tag"
+                       short_refname=${refname##refs/tags/}
+                       ;;
+               refs/tags/*,tag)
+                       # annotated tag
+                       refname_type="annotated tag"
+                       short_refname=${refname##refs/tags/}
+                       # change recipients
+                       if [ -n "$announcerecipients" ]; then
+                               recipients="$announcerecipients"
+                       fi
+                       ;;
+               refs/heads/*,commit)
+                       # branch
+                       refname_type="branch"
+                       short_refname=${refname##refs/heads/}
+                       ;;
+               refs/remotes/*,commit)
+                       # tracking branch
+                       refname_type="tracking branch"
+                       short_refname=${refname##refs/remotes/}
+                       echo >&2 "*** Push-update of tracking branch, $refname"
+                       echo >&2 "***  - no email generated."
+                       exit 0
+                       ;;
+               *)
+                       # Anything else (is there anything else?)
+                       echo >&2 "*** Unknown type of update to $refname ($rev_type)"
+                       echo >&2 "***  - no email generated"
+                       exit 1
+                       ;;
+       esac
+
+       # Check if we've got anyone to send to
+       if [ -z "$recipients" ]; then
+               echo >&2 "*** hooks.recipients is not set so no email will be sent"
+               echo >&2 "*** for $refname update $oldrev->$newrev"
+               exit 0
+       fi
+
+       # Email parameters
+       # The committer will be obtained from the latest existing rev; so
+       # for a deletion it will be the oldrev, for the others, then newrev
+       committer=$(git show --pretty=full -s $rev | sed -ne "s/^Commit: //p" |
+               sed -ne 's/\(.*\) </"\1" </p')
+       # The email subject will contain the best description of the ref
+       # that we can build from the parameters
+       describe=$(git describe $rev 2>/dev/null)
+       if [ -z "$describe" ]; then
+               describe=$rev
+       fi
+
+       generate_email_header
+
+       # Call the correct body generation function
+       fn_name=general
+       case "$refname_type" in
+       "tracking branch"|branch)
+               fn_name=branch
+               ;;
+       "annotated tag")
+               fn_name=atag
+               ;;
+       esac
+       generate_${change_type}_${fn_name}_email
+
+       generate_email_footer
+}
+
+generate_email_header()
+{
+       # --- Email (all stdout will be the email)
+       # Generate header
+       dir=`pwd`
+       cat <<-EOF
+       From: $committer
+       To: $recipients
+       Subject: ${EMAILPREFIX}$dir $refname_type, $short_refname, ${change_type}d. $describe
+       X-Git-Refname: $refname
+       X-Git-Reftype: $refname_type
+       X-Git-Oldrev: $oldrev
+       X-Git-Newrev: $newrev
+
+       $dir : "$projectdesc".
+
+       The $refname_type, $short_refname has been ${change_type}d
+       EOF
+}
+
+generate_email_footer()
+{
+       cat <<-EOF
+
+
+       hooks/post-receive
+       --
+       $projectdesc
+       EOF
+}
+
+# --------------- Branches
+
+#
+# Called for the creation of a branch
+#
+generate_create_branch_email()
+{
+       # This is a new branch and so oldrev is not valid
+       echo "        at  $newrev ($newrev_type)"
+       echo ""
+
+       echo $LOGBEGIN
+       # This shows all log entries that are not already covered by
+       # another ref - i.e. commits that are now accessible from this
+       # ref that were previously not accessible (see generate_update_branch_email
+       # for the explanation of this command)
+       git rev-parse --not --branches | grep -v $(git rev-parse $refname) |
+       git rev-list --pretty --stdin $newrev
+       echo $LOGEND
+}
+
+#
+# Called for the change of a pre-existing branch
+#
+generate_update_branch_email()
+{
+       # Consider this:
+       #   1 --- 2 --- O --- X --- 3 --- 4 --- N
+       #
+       # O is $oldrev for $refname
+       # N is $newrev for $refname
+       # X is a revision pointed to by some other ref, for which we may
+       #   assume that an email has already been generated.
+       # In this case we want to issue an email containing only revisions
+       # 3, 4, and N.  Given (almost) by
+       #
+       #  git-rev-list N ^O --not --all
+       #
+       # The reason for the "almost", is that the "--not --all" will take
+       # precedence over the "N", and effectively will translate to
+       #
+       #  git-rev-list N ^O ^X ^N
+       #
+       # So, we need to build up the list more carefully.  git-rev-parse will
+       # generate a list of revs that may be fed into git-rev-list.  We can get
+       # it to make the "--not --all" part and then filter out the "^N" with:
+       #
+       #  git-rev-parse --not --all | grep -v N
+       #
+       # Then, using the --stdin switch to git-rev-list we have effectively
+       # manufactured
+       #
+       #  git-rev-list N ^O ^X
+       #
+       # This leaves a problem when someone else updates the repository
+       # while this script is running.  Their new value of the ref we're working
+       # on would be included in the "--not --all" output; and as our $newrev
+       # would be an ancestor of that commit, it would exclude all of our
+       # commits.  What we really want is to exclude the current value of
+       # $refname from the --not list, rather than N itself.  So:
+       #
+       #  git-rev-parse --not --all | grep -v $(git-rev-parse $refname)
+       #
+       # Get's us to something pretty safe (apart from the small time between
+       # refname being read, and git-rev-parse running - for that, I give up)
+       #
+       #
+       # Next problem, consider this:
+       #   * --- B --- * --- O ($oldrev)
+       #          \
+       #           * --- X --- * --- N ($newrev)
+       #
+       # That is to say, there is no guarantee that oldrev is a strict subset of
+       # newrev (it would have required a --force, but that's allowed).  So, we
+       # can't simply say rev-list $oldrev..$newrev.  Instead we find the common
+       # base of the two revs and list from there.
+       #
+       # As above, we need to take into account the presence of X; if another
+       # branch is already in the repository and points at some of the revisions
+       # that we are about to output - we don't want them.  The solution is as
+       # before: git-rev-parse output filtered.
+       #
+       # Finally, tags:
+       #   1 --- 2 --- O --- T --- 3 --- 4 --- N
+       #
+       # Tags pushed into the repository generate nice shortlog emails that
+       # summarise the commits between them and the previous tag.  However,
+       # those emails don't include the full commit messages that we output
+       # for a branch update.  Therefore we still want to output revisions
+       # that have been output on a tag email.
+       #
+       # Luckily, git-rev-parse includes just the tool.  Instead of using "--all"
+       # we use "--branches"; this has the added benefit that "remotes/" will
+       # be ignored as well.
+
+       # List all of the revisions that were removed by this update, in a fast forward
+       # update, this list will be empty, because rev-list O ^N is empty.  For a non
+       # fast forward, O ^N is the list of removed revisions
+       fast_forward=""
+       rev=""
+       for rev in $(git rev-list $newrev..$oldrev)
+       do
+               revtype=$(git cat-file -t "$rev")
+               echo "  discards  $rev ($revtype)"
+       done
+       if [ -z "$rev" ]; then
+               fast_forward=1
+       fi
+
+       # List all the revisions from baserev to newrev in a kind of
+       # "table-of-contents"; note this list can include revisions that have
+       # already had notification emails and is present to show the full detail
+       # of the change from rolling back the old revision to the base revision and
+       # then forward to the new revision
+       for rev in $(git rev-list $oldrev..$newrev)
+       do
+               revtype=$(git cat-file -t "$rev")
+               echo "       via  $rev ($revtype)"
+       done
+
+       if [ -z "$fastforward" ]; then
+               echo "      from  $oldrev ($oldrev_type)"
+       else
+               #  1. Existing revisions were removed.  In this case newrev is a
+               #     subset of oldrev - this is the reverse of a fast-forward,
+               #     a rewind
+               #  2. New revisions were added on top of an old revision, this is
+               #     a rewind and addition.
+
+               # (1) certainly happened, (2) possibly.  When (2) hasn't happened,
+               # we set a flag to indicate that no log printout is required.
+
+               echo ""
+
+               # Find the common ancestor of the old and new revisions and compare
+               # it with newrev
+               baserev=$(git merge-base $oldrev $newrev)
+               rewind_only=""
+               if [ "$baserev" = "$newrev" ]; then
+                       echo "This update discarded existing revisions and left the branch pointing at"
+                       echo "a previous point in the repository history."
+                       echo ""
+                       echo " * -- * -- N ($newrev)"
+                       echo "            \\"
+                       echo "             O -- O -- O ($oldrev)"
+                       echo ""
+                       echo "The removed revisions are not necessarilly gone - if another reference"
+                       echo "still refers to them they will stay in the repository."
+                       rewind_only=1
+               else
+                       echo "This update added new revisions after undoing existing revisions.  That is"
+                       echo "to say, the old revision is not a strict subset of the new revision.  This"
+                       echo "situation occurs when you --force push a change and generate a repository"
+                       echo "containing something like this:"
+                       echo ""
+                       echo " * -- * -- B -- O -- O -- O ($oldrev)"
+                       echo "            \\"
+                       echo "             N -- N -- N ($newrev)"
+                       echo ""
+                       echo "When this happens we assume that you've already had alert emails for all"
+                       echo "of the O revisions, and so we here report only the revisions in the N"
+                       echo "branch from the common base, B."
+               fi
+       fi
+
+       echo ""
+       if [ -z "$rewind_only" ]; then
+               echo "Revisions details."
+               echo ""
+               echo $LOGBEGIN
+               git rev-parse --not --branches | grep -v $(git rev-parse $refname) |
+               git rev-list --pretty --stdin $oldrev..$newrev
+
+               # XXX: Need a way of detecting whether git rev-list actually outputted
+               # anything, so that we can issue a "no new revisions added by this
+               # update" message
+
+               echo $LOGEND
+       else
+               echo "No new revisions were added by this update."
+       fi
+
+       # The diffstat is shown from the old revision to the new revision.  This
+       # is to show the truth of what happened in this change.  There's no point
+       # showing the stat from the base to the new revision because the base
+       # is effectively a random revision at this point - the user will be
+       # interested in what this revision changed - including the undoing of
+       # previous revisions in the case of non-fast forward updates.
+       echo ""
+       echo "Summary of changes:"
+       git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev
+}
+
+#
+# Called for the deletion of a branch
+#
+generate_delete_branch_email()
+{
+       echo "       was  $oldrev"
+       echo ""
+       echo $LOGEND
+       git show -s --pretty=oneline $oldrev
+       echo $LOGEND
+}
+
+# --------------- Annotated tags
+
+#
+# Called for the creation of an annotated tag
+#
+generate_create_atag_email()
+{
+       echo "        at  $newrev ($newrev_type)"
+
+       generate_atag_email
+}
+
+#
+# Called for the update of an annotated tag (this is probably a rare event
+# and may not even be allowed)
+#
+generate_update_atag_email()
+{
+       echo "        to  $newrev ($newrev_type)"
+       echo "      from  $oldrev (which is now obsolete)"
+
+       generate_atag_email
+}
+
+#
+# Called when an annotated tag is created or changed
+#
+generate_atag_email()
+{
+       # Use git-for-each-ref to pull out the individual fields from the tag
+       eval $(git for-each-ref --shell --format='
+       tagobject=%(*objectname)
+       tagtype=%(*objecttype)
+       tagger=%(taggername)
+       tagged=%(taggerdate)' $refname
+       )
+
+       echo "   tagging  $tagobject ($tagtype)"
+       case "$tagtype" in
+       commit)
+               # If the tagged object is a commit, then we assume this is a
+               # release, and so we calculate which tag this tag is replacing
+               prevtag=$(git describe --abbrev=0 $newrev^ 2>/dev/null)
+
+               if [ -n "$prevtag" ]; then
+                       echo "  replaces  $prevtag"
+               fi
+               ;;
+       *)
+               echo "    length  $(git cat-file -s $tagobject) bytes"
+               ;;
+       esac
+       echo " tagged by  $tagger"
+       echo "        on  $tagged"
+
+       echo ""
+       echo $LOGBEGIN
+
+       # Show the content of the tag message; this might contain a change log
+       # or release notes so is worth displaying.
+       git cat-file tag $newrev | sed -e '1,/^$/d'
+
+       echo ""
+       case "$tagtype" in
+       commit)
+               # Only commit tags make sense to have rev-list operations performed
+               # on them
+               if [ -n "$prevtag" ]; then
+                       # Show changes since the previous release
+                       git rev-list --pretty=short "$prevtag..$newrev" | git shortlog
+               else
+                       # No previous tag, show all the changes since time began
+                       git rev-list --pretty=short $newrev | git shortlog
+               fi
+               ;;
+       *)
+               # XXX: Is there anything useful we can do for non-commit objects?
+               ;;
+       esac
+
+       echo $LOGEND
+}
+
+#
+# Called for the deletion of an annotated tag
+#
+generate_delete_atag_email()
+{
+       echo "       was  $oldrev"
+       echo ""
+       echo $LOGEND
+       git show -s --pretty=oneline $oldrev
+       echo $LOGEND
+}
+
+# --------------- General references
+
+#
+# Called when any other type of reference is created (most likely a
+# non-annotated tag)
+#
+generate_create_general_email()
+{
+       echo "        at  $newrev ($newrev_type)"
+
+       generate_general_email
+}
+
+#
+# Called when any other type of reference is updated (most likely a
+# non-annotated tag)
+#
+generate_update_general_email()
+{
+       echo "        to  $newrev ($newrev_type)"
+       echo "      from  $oldrev"
+
+       generate_general_email
+}
+
+#
+# Called for creation or update of any other type of reference
+#
+generate_general_email()
+{
+       # Unannotated tags are more about marking a point than releasing a version;
+       # therefore we don't do the shortlog summary that we do for annotated tags
+       # above - we simply show that the point has been marked, and print the log
+       # message for the marked point for reference purposes
+       #
+       # Note this section also catches any other reference type (although there
+       # aren't any) and deals with them in the same way.
+
+       echo ""
+       if [ "$newrev_type" = "commit" ]; then
+               echo $LOGBEGIN
+               git show --no-color --root -s $newrev
+               echo $LOGEND
+       else
+               # What can we do here?  The tag marks an object that is not a commit,
+               # so there is no log for us to display.  It's probably not wise to
+               # output git-cat-file as it could be a binary blob.  We'll just say how
+               # big it is
+               echo "$newrev is a $newrev_type, and is $(git cat-file -s $newrev) bytes long."
+       fi
+}
+
+#
+# Called for the deletion of any other type of reference
+#
+generate_delete_general_email()
+{
+       echo "       was  $oldrev"
+       echo ""
+       echo $LOGEND
+       git show -s --pretty=oneline $oldrev
+       echo $LOGEND
+}
+
+# ---------------------------- main()
+
+# --- Constants
+EMAILPREFIX="[GIT] "
+LOGBEGIN="- Log -----------------------------------------------------------------"
+LOGEND="-----------------------------------------------------------------------"
+
+# --- Config
+# Set GIT_DIR either from the working directory, or from the environment
+# variable.
+GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
+if [ -z "$GIT_DIR" ]; then
+       echo >&2 "fatal: post-receive: GIT_DIR not set"
+       exit 1
+fi
+
+projectdesc=$(sed -ne '1p' "$GIT_DIR/description")
+# Check if the description is unchanged from it's default, and shorten it to a
+# more manageable length if it is
+if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null
+then
+       projectdesc="UNNAMED PROJECT"
+fi
+
+recipients=$(git repo-config hooks.mailinglist)
+announcerecipients=$(git repo-config hooks.announcelist)
+envelopesender=$(git-repo-config hooks.envelopesender)
+
+# --- Main loop
+# Allow dual mode: run from the command line just like the update hook, or if
+# no arguments are given then run as a hook script
+if [ -n "$1" -a -n "$2" -a -n "$3" ]; then
+       # Output to the terminal in command line mode - if someone wanted to
+       # resend an email; they could redirect the output to sendmail themselves
+       PAGER= generate_email $2 $3 $1
+else
+       if [ -n "$envelopesender" ]; then
+               envelopesender="-f '$envelopesender'"
+       fi
+
+       while read oldrev newrev refname
+       do
+               generate_email $oldrev $newrev $refname |
+               /usr/sbin/sendmail -t $envelopesender
+       done
+fi
diff --git a/import.names b/import.names
deleted file mode 100644 (file)
index f871975..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-heikki=Heikki Levanto <heikki@indexdata.dk>
-adam=Adam Dickmeiss <adam@indexdata.dk>
-perhans=Per M. Hansen <perhans@indexdata.dk>
-quinn=Sebastian Hammer <quinn@indexdata.com>
-sondberg=Anders S. Mortensen <sondberg@indexdata.dk>
-marc=Marc Cromme <marc@indexdata.dk>
-jakub=Jakub Skoczen <jakub@indexdata.dk>
-mike=Mike Taylor <mike@indexdata.com>
diff --git a/post-receive-email-id b/post-receive-email-id
deleted file mode 100644 (file)
index 6f87ac7..0000000
+++ /dev/null
@@ -1,617 +0,0 @@
-#!/bin/sh
-#
-# Based on /usr/share/doc/git-core/contrib/hooks/post-receive-email
-#
-# Copyright (c) 2007 Andy Parkins
-#
-# An example hook script to mail out commit update information.  This hook sends emails
-# listing new revisions to the repository introduced by the change being reported.  The
-# rule is that (for branch updates) each commit will appear on one email and one email
-# only.
-#
-# This hook is stored in the contrib/hooks directory.  Your distribution will have put
-# this somewhere standard.  You should make this script executable then link to it in
-# the repository you would like to use it in.  For example, on debian the hook is stored
-# in /usr/share/doc/git-core/contrib/hooks/post-receive-email:
-#
-#  chmod a+x post-receive-email
-#  cd /path/to/your/repository.git
-#  ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive
-#
-# This hook script assumes it is enabled on the central repository of a project, with
-# all users pushing only to it and not between each other.  It will still work if you
-# don't operate in that style, but it would become possible for the email to be from
-# someone other than the person doing the push.
-#
-# Config
-# ------
-# hooks.mailinglist
-#   This is the list that all pushes will go to; leave it blank to not send
-#   emails for every ref update.
-# hooks.announcelist
-#   This is the list that all pushes of annotated tags will go to.  Leave it
-#   blank to default to the mailinglist field.  The announce emails lists the
-#   short log summary of the changes since the last annotated tag.
-# hook.envelopesender
-#   If set then the -f option is passed to sendmail to allow the envelope sender
-#   address to be set
-#
-# Notes
-# -----
-# All emails have their subjects prefixed with "[SCM]" to aid filtering.
-# All emails include the headers "X-Git-Refname", "X-Git-Oldrev",
-# "X-Git-Newrev", and "X-Git-Reftype" to enable fine tuned filtering and
-# give information for debugging.
-#
-
-# ---------------------------- Functions
-
-#
-# Top level email generation function.  This decides what type of update
-# this is and calls the appropriate body-generation routine after outputting
-# the common header
-#
-# Note this function doesn't actually generate any email output, that is taken
-# care of by the functions it calls:
-#  - generate_email_header
-#  - generate_create_XXXX_email
-#  - generate_update_XXXX_email
-#  - generate_delete_XXXX_email
-#  - generate_email_footer
-#
-generate_email()
-{
-       # --- Arguments
-       oldrev=$(git rev-parse $1)
-       newrev=$(git rev-parse $2)
-       refname="$3"
-
-       # --- Interpret
-       # 0000->1234 (create)
-       # 1234->2345 (update)
-       # 2345->0000 (delete)
-       if expr "$oldrev" : '0*$' >/dev/null
-       then
-               change_type="create"
-       else
-               if expr "$newrev" : '0*$' >/dev/null
-               then
-                       change_type="delete"
-               else
-                       change_type="update"
-               fi
-       fi
-
-       # --- Get the revision types
-       newrev_type=$(git cat-file -t $newrev 2> /dev/null)
-       oldrev_type=$(git cat-file -t "$oldrev" 2> /dev/null)
-       case "$change_type" in
-       create|update)
-               rev="$newrev"
-               rev_type="$newrev_type"
-               ;;
-       delete)
-               rev="$oldrev"
-               rev_type="$oldrev_type"
-               ;;
-       esac
-
-       # The revision type tells us what type the commit is, combined with
-       # the location of the ref we can decide between
-       #  - working branch
-       #  - tracking branch
-       #  - unannoted tag
-       #  - annotated tag
-       case "$refname","$rev_type" in
-               refs/tags/*,commit)
-                       # un-annotated tag
-                       refname_type="tag"
-                       short_refname=${refname##refs/tags/}
-                       ;;
-               refs/tags/*,tag)
-                       # annotated tag
-                       refname_type="annotated tag"
-                       short_refname=${refname##refs/tags/}
-                       # change recipients
-                       if [ -n "$announcerecipients" ]; then
-                               recipients="$announcerecipients"
-                       fi
-                       ;;
-               refs/heads/*,commit)
-                       # branch
-                       refname_type="branch"
-                       short_refname=${refname##refs/heads/}
-                       ;;
-               refs/remotes/*,commit)
-                       # tracking branch
-                       refname_type="tracking branch"
-                       short_refname=${refname##refs/remotes/}
-                       echo >&2 "*** Push-update of tracking branch, $refname"
-                       echo >&2 "***  - no email generated."
-                       exit 0
-                       ;;
-               *)
-                       # Anything else (is there anything else?)
-                       echo >&2 "*** Unknown type of update to $refname ($rev_type)"
-                       echo >&2 "***  - no email generated"
-                       exit 1
-                       ;;
-       esac
-
-       # Check if we've got anyone to send to
-       if [ -z "$recipients" ]; then
-               echo >&2 "*** hooks.recipients is not set so no email will be sent"
-               echo >&2 "*** for $refname update $oldrev->$newrev"
-               exit 0
-       fi
-
-       # Email parameters
-       # The committer will be obtained from the latest existing rev; so
-       # for a deletion it will be the oldrev, for the others, then newrev
-       committer=$(git show --pretty=full -s $rev | sed -ne "s/^Commit: //p" |
-               sed -ne 's/\(.*\) </"\1" </p')
-       # The email subject will contain the best description of the ref
-       # that we can build from the parameters
-       describe=$(git describe $rev 2>/dev/null)
-       if [ -z "$describe" ]; then
-               describe=$rev
-       fi
-
-       generate_email_header
-
-       # Call the correct body generation function
-       fn_name=general
-       case "$refname_type" in
-       "tracking branch"|branch)
-               fn_name=branch
-               ;;
-       "annotated tag")
-               fn_name=atag
-               ;;
-       esac
-       generate_${change_type}_${fn_name}_email
-
-       generate_email_footer
-}
-
-generate_email_header()
-{
-       # --- Email (all stdout will be the email)
-       # Generate header
-       dir=`pwd`
-       cat <<-EOF
-       From: $committer
-       To: $recipients
-       Subject: ${EMAILPREFIX}$dir $refname_type, $short_refname, ${change_type}d. $describe
-       X-Git-Refname: $refname
-       X-Git-Reftype: $refname_type
-       X-Git-Oldrev: $oldrev
-       X-Git-Newrev: $newrev
-
-       $dir : "$projectdesc".
-
-       The $refname_type, $short_refname has been ${change_type}d
-       EOF
-}
-
-generate_email_footer()
-{
-       cat <<-EOF
-
-
-       hooks/post-receive
-       --
-       $projectdesc
-       EOF
-}
-
-# --------------- Branches
-
-#
-# Called for the creation of a branch
-#
-generate_create_branch_email()
-{
-       # This is a new branch and so oldrev is not valid
-       echo "        at  $newrev ($newrev_type)"
-       echo ""
-
-       echo $LOGBEGIN
-       # This shows all log entries that are not already covered by
-       # another ref - i.e. commits that are now accessible from this
-       # ref that were previously not accessible (see generate_update_branch_email
-       # for the explanation of this command)
-       git rev-parse --not --branches | grep -v $(git rev-parse $refname) |
-       git rev-list --pretty --stdin $newrev
-       echo $LOGEND
-}
-
-#
-# Called for the change of a pre-existing branch
-#
-generate_update_branch_email()
-{
-       # Consider this:
-       #   1 --- 2 --- O --- X --- 3 --- 4 --- N
-       #
-       # O is $oldrev for $refname
-       # N is $newrev for $refname
-       # X is a revision pointed to by some other ref, for which we may
-       #   assume that an email has already been generated.
-       # In this case we want to issue an email containing only revisions
-       # 3, 4, and N.  Given (almost) by
-       #
-       #  git-rev-list N ^O --not --all
-       #
-       # The reason for the "almost", is that the "--not --all" will take
-       # precedence over the "N", and effectively will translate to
-       #
-       #  git-rev-list N ^O ^X ^N
-       #
-       # So, we need to build up the list more carefully.  git-rev-parse will
-       # generate a list of revs that may be fed into git-rev-list.  We can get
-       # it to make the "--not --all" part and then filter out the "^N" with:
-       #
-       #  git-rev-parse --not --all | grep -v N
-       #
-       # Then, using the --stdin switch to git-rev-list we have effectively
-       # manufactured
-       #
-       #  git-rev-list N ^O ^X
-       #
-       # This leaves a problem when someone else updates the repository
-       # while this script is running.  Their new value of the ref we're working
-       # on would be included in the "--not --all" output; and as our $newrev
-       # would be an ancestor of that commit, it would exclude all of our
-       # commits.  What we really want is to exclude the current value of
-       # $refname from the --not list, rather than N itself.  So:
-       #
-       #  git-rev-parse --not --all | grep -v $(git-rev-parse $refname)
-       #
-       # Get's us to something pretty safe (apart from the small time between
-       # refname being read, and git-rev-parse running - for that, I give up)
-       #
-       #
-       # Next problem, consider this:
-       #   * --- B --- * --- O ($oldrev)
-       #          \
-       #           * --- X --- * --- N ($newrev)
-       #
-       # That is to say, there is no guarantee that oldrev is a strict subset of
-       # newrev (it would have required a --force, but that's allowed).  So, we
-       # can't simply say rev-list $oldrev..$newrev.  Instead we find the common
-       # base of the two revs and list from there.
-       #
-       # As above, we need to take into account the presence of X; if another
-       # branch is already in the repository and points at some of the revisions
-       # that we are about to output - we don't want them.  The solution is as
-       # before: git-rev-parse output filtered.
-       #
-       # Finally, tags:
-       #   1 --- 2 --- O --- T --- 3 --- 4 --- N
-       #
-       # Tags pushed into the repository generate nice shortlog emails that
-       # summarise the commits between them and the previous tag.  However,
-       # those emails don't include the full commit messages that we output
-       # for a branch update.  Therefore we still want to output revisions
-       # that have been output on a tag email.
-       #
-       # Luckily, git-rev-parse includes just the tool.  Instead of using "--all"
-       # we use "--branches"; this has the added benefit that "remotes/" will
-       # be ignored as well.
-
-       # List all of the revisions that were removed by this update, in a fast forward
-       # update, this list will be empty, because rev-list O ^N is empty.  For a non
-       # fast forward, O ^N is the list of removed revisions
-       fast_forward=""
-       rev=""
-       for rev in $(git rev-list $newrev..$oldrev)
-       do
-               revtype=$(git cat-file -t "$rev")
-               echo "  discards  $rev ($revtype)"
-       done
-       if [ -z "$rev" ]; then
-               fast_forward=1
-       fi
-
-       # List all the revisions from baserev to newrev in a kind of
-       # "table-of-contents"; note this list can include revisions that have
-       # already had notification emails and is present to show the full detail
-       # of the change from rolling back the old revision to the base revision and
-       # then forward to the new revision
-       for rev in $(git rev-list $oldrev..$newrev)
-       do
-               revtype=$(git cat-file -t "$rev")
-               echo "       via  $rev ($revtype)"
-       done
-
-       if [ -z "$fastforward" ]; then
-               echo "      from  $oldrev ($oldrev_type)"
-       else
-               #  1. Existing revisions were removed.  In this case newrev is a
-               #     subset of oldrev - this is the reverse of a fast-forward,
-               #     a rewind
-               #  2. New revisions were added on top of an old revision, this is
-               #     a rewind and addition.
-
-               # (1) certainly happened, (2) possibly.  When (2) hasn't happened,
-               # we set a flag to indicate that no log printout is required.
-
-               echo ""
-
-               # Find the common ancestor of the old and new revisions and compare
-               # it with newrev
-               baserev=$(git merge-base $oldrev $newrev)
-               rewind_only=""
-               if [ "$baserev" = "$newrev" ]; then
-                       echo "This update discarded existing revisions and left the branch pointing at"
-                       echo "a previous point in the repository history."
-                       echo ""
-                       echo " * -- * -- N ($newrev)"
-                       echo "            \\"
-                       echo "             O -- O -- O ($oldrev)"
-                       echo ""
-                       echo "The removed revisions are not necessarilly gone - if another reference"
-                       echo "still refers to them they will stay in the repository."
-                       rewind_only=1
-               else
-                       echo "This update added new revisions after undoing existing revisions.  That is"
-                       echo "to say, the old revision is not a strict subset of the new revision.  This"
-                       echo "situation occurs when you --force push a change and generate a repository"
-                       echo "containing something like this:"
-                       echo ""
-                       echo " * -- * -- B -- O -- O -- O ($oldrev)"
-                       echo "            \\"
-                       echo "             N -- N -- N ($newrev)"
-                       echo ""
-                       echo "When this happens we assume that you've already had alert emails for all"
-                       echo "of the O revisions, and so we here report only the revisions in the N"
-                       echo "branch from the common base, B."
-               fi
-       fi
-
-       echo ""
-       if [ -z "$rewind_only" ]; then
-               echo "Revisions details."
-               echo ""
-               echo $LOGBEGIN
-               git rev-parse --not --branches | grep -v $(git rev-parse $refname) |
-               git rev-list --pretty --stdin $oldrev..$newrev
-
-               # XXX: Need a way of detecting whether git rev-list actually outputted
-               # anything, so that we can issue a "no new revisions added by this
-               # update" message
-
-               echo $LOGEND
-       else
-               echo "No new revisions were added by this update."
-       fi
-
-       # The diffstat is shown from the old revision to the new revision.  This
-       # is to show the truth of what happened in this change.  There's no point
-       # showing the stat from the base to the new revision because the base
-       # is effectively a random revision at this point - the user will be
-       # interested in what this revision changed - including the undoing of
-       # previous revisions in the case of non-fast forward updates.
-       echo ""
-       echo "Summary of changes:"
-       git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev
-}
-
-#
-# Called for the deletion of a branch
-#
-generate_delete_branch_email()
-{
-       echo "       was  $oldrev"
-       echo ""
-       echo $LOGEND
-       git show -s --pretty=oneline $oldrev
-       echo $LOGEND
-}
-
-# --------------- Annotated tags
-
-#
-# Called for the creation of an annotated tag
-#
-generate_create_atag_email()
-{
-       echo "        at  $newrev ($newrev_type)"
-
-       generate_atag_email
-}
-
-#
-# Called for the update of an annotated tag (this is probably a rare event
-# and may not even be allowed)
-#
-generate_update_atag_email()
-{
-       echo "        to  $newrev ($newrev_type)"
-       echo "      from  $oldrev (which is now obsolete)"
-
-       generate_atag_email
-}
-
-#
-# Called when an annotated tag is created or changed
-#
-generate_atag_email()
-{
-       # Use git-for-each-ref to pull out the individual fields from the tag
-       eval $(git for-each-ref --shell --format='
-       tagobject=%(*objectname)
-       tagtype=%(*objecttype)
-       tagger=%(taggername)
-       tagged=%(taggerdate)' $refname
-       )
-
-       echo "   tagging  $tagobject ($tagtype)"
-       case "$tagtype" in
-       commit)
-               # If the tagged object is a commit, then we assume this is a
-               # release, and so we calculate which tag this tag is replacing
-               prevtag=$(git describe --abbrev=0 $newrev^ 2>/dev/null)
-
-               if [ -n "$prevtag" ]; then
-                       echo "  replaces  $prevtag"
-               fi
-               ;;
-       *)
-               echo "    length  $(git cat-file -s $tagobject) bytes"
-               ;;
-       esac
-       echo " tagged by  $tagger"
-       echo "        on  $tagged"
-
-       echo ""
-       echo $LOGBEGIN
-
-       # Show the content of the tag message; this might contain a change log
-       # or release notes so is worth displaying.
-       git cat-file tag $newrev | sed -e '1,/^$/d'
-
-       echo ""
-       case "$tagtype" in
-       commit)
-               # Only commit tags make sense to have rev-list operations performed
-               # on them
-               if [ -n "$prevtag" ]; then
-                       # Show changes since the previous release
-                       git rev-list --pretty=short "$prevtag..$newrev" | git shortlog
-               else
-                       # No previous tag, show all the changes since time began
-                       git rev-list --pretty=short $newrev | git shortlog
-               fi
-               ;;
-       *)
-               # XXX: Is there anything useful we can do for non-commit objects?
-               ;;
-       esac
-
-       echo $LOGEND
-}
-
-#
-# Called for the deletion of an annotated tag
-#
-generate_delete_atag_email()
-{
-       echo "       was  $oldrev"
-       echo ""
-       echo $LOGEND
-       git show -s --pretty=oneline $oldrev
-       echo $LOGEND
-}
-
-# --------------- General references
-
-#
-# Called when any other type of reference is created (most likely a
-# non-annotated tag)
-#
-generate_create_general_email()
-{
-       echo "        at  $newrev ($newrev_type)"
-
-       generate_general_email
-}
-
-#
-# Called when any other type of reference is updated (most likely a
-# non-annotated tag)
-#
-generate_update_general_email()
-{
-       echo "        to  $newrev ($newrev_type)"
-       echo "      from  $oldrev"
-
-       generate_general_email
-}
-
-#
-# Called for creation or update of any other type of reference
-#
-generate_general_email()
-{
-       # Unannotated tags are more about marking a point than releasing a version;
-       # therefore we don't do the shortlog summary that we do for annotated tags
-       # above - we simply show that the point has been marked, and print the log
-       # message for the marked point for reference purposes
-       #
-       # Note this section also catches any other reference type (although there
-       # aren't any) and deals with them in the same way.
-
-       echo ""
-       if [ "$newrev_type" = "commit" ]; then
-               echo $LOGBEGIN
-               git show --no-color --root -s $newrev
-               echo $LOGEND
-       else
-               # What can we do here?  The tag marks an object that is not a commit,
-               # so there is no log for us to display.  It's probably not wise to
-               # output git-cat-file as it could be a binary blob.  We'll just say how
-               # big it is
-               echo "$newrev is a $newrev_type, and is $(git cat-file -s $newrev) bytes long."
-       fi
-}
-
-#
-# Called for the deletion of any other type of reference
-#
-generate_delete_general_email()
-{
-       echo "       was  $oldrev"
-       echo ""
-       echo $LOGEND
-       git show -s --pretty=oneline $oldrev
-       echo $LOGEND
-}
-
-# ---------------------------- main()
-
-# --- Constants
-EMAILPREFIX="[GIT] "
-LOGBEGIN="- Log -----------------------------------------------------------------"
-LOGEND="-----------------------------------------------------------------------"
-
-# --- Config
-# Set GIT_DIR either from the working directory, or from the environment
-# variable.
-GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
-if [ -z "$GIT_DIR" ]; then
-       echo >&2 "fatal: post-receive: GIT_DIR not set"
-       exit 1
-fi
-
-projectdesc=$(sed -ne '1p' "$GIT_DIR/description")
-# Check if the description is unchanged from it's default, and shorten it to a
-# more manageable length if it is
-if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null
-then
-       projectdesc="UNNAMED PROJECT"
-fi
-
-recipients=$(git repo-config hooks.mailinglist)
-announcerecipients=$(git repo-config hooks.announcelist)
-envelopesender=$(git-repo-config hooks.envelopesender)
-
-# --- Main loop
-# Allow dual mode: run from the command line just like the update hook, or if
-# no arguments are given then run as a hook script
-if [ -n "$1" -a -n "$2" -a -n "$3" ]; then
-       # Output to the terminal in command line mode - if someone wanted to
-       # resend an email; they could redirect the output to sendmail themselves
-       PAGER= generate_email $2 $3 $1
-else
-       if [ -n "$envelopesender" ]; then
-               envelopesender="-f '$envelopesender'"
-       fi
-
-       while read oldrev newrev refname
-       do
-               generate_email $oldrev $newrev $refname |
-               /usr/sbin/sendmail -t $envelopesender
-       done
-fi
diff --git a/update-archive/README b/update-archive/README
new file mode 100644 (file)
index 0000000..73a8937
--- /dev/null
@@ -0,0 +1,12 @@
+Debian users can add the following two lines in /etc/apt/sources.list
+and use Debians own package management tools, apt-get, aptitude, or dselect.
+Replace sarge with etch or lenny if you are using these versions of Debian.
+As of August 2007, sarge is old stable, etch is stable, lenny is
+testing.
+
+deb http://ftp.indexdata.dk/debian etch main
+deb-src http://ftp.indexdata.dk/debian etch main
+
+These packages are signed with a key you can install as follows:
+ wget http://ftp.indexdata.dk/debian/indexdata.asc
+ sudo apt-key add indexdata.asc
diff --git a/update-archive/apt-ftparchive.conf.in b/update-archive/apt-ftparchive.conf.in
new file mode 100644 (file)
index 0000000..2042d57
--- /dev/null
@@ -0,0 +1,34 @@
+// $Id: apt-ftparchive.conf.in,v 1.1.1.1 2006-06-15 11:53:00 adam Exp $
+// This config is for us with the pool-structure for the packages, thus we
+// don't use a Tree Section in here
+
+// The debian archive should be in the current working dir
+Dir {
+       ArchiveDir ".";
+       CacheDir ".";
+};
+
+// Create Packages, Packages.gz and Packages.bz2, remove what you don't need
+Default {
+       Packages::Compress ". gzip bzip2";
+       Sources::Compress ". gzip bzip2";
+       Contents::Compress ". gzip bzip2";
+};
+
+// Includes the main section. You can structure the directory tree under
+// ./pool/main any way you like, apt-ftparchive will take any deb (and
+// source package) it can find. This creates a Packages a Sources and a
+// Contents file for these in the main section of the sid release
+BinDirectory "pool/@dist@" {
+       Packages "dists/@dist@/main/binary-i386/Packages";
+       Sources "dists/@dist@/main/source/Sources";
+       Contents "dists/@dist@/Contents-i386";
+}
+
+// By default all Packages should have the extension ".deb"
+Default {
+       Packages {
+               Extensions ".deb";
+       };
+};
+
diff --git a/update-archive/apt-release.conf.in b/update-archive/apt-release.conf.in
new file mode 100644 (file)
index 0000000..50857c4
--- /dev/null
@@ -0,0 +1,7 @@
+APT::FTPArchive::Release::Origin "Indexdata";
+APT::FTPArchive::Release::Label "Indexdata";
+APT::FTPArchive::Release::Suite "@dist@";
+APT::FTPArchive::Release::Codename "@dist@";
+APT::FTPArchive::Release::Architectures "i386";
+APT::FTPArchive::Release::Components "main";
+APT::FTPArchive::Release::Description "Index Data Debian packages";
diff --git a/update-archive/symclean.sh b/update-archive/symclean.sh
new file mode 100755 (executable)
index 0000000..8e6e1ff
--- /dev/null
@@ -0,0 +1,39 @@
+#!/bin/bash
+# Get a list of package files that can be moved out
+
+echo "Now in `pwd` going to $1"
+cd $1
+echo "Landed in  `pwd` "
+echo "File count:"
+ls *.deb | wc -l
+# exit 9
+
+
+KEEPGEN=4   # how many generations to keep of each package
+
+KEEP="/tmp/packs.keep"
+MOVE="/tmp/packs.move"
+rm -f $KEEP
+rm -f $MOVE
+
+PRODS=`ls *.deb| cut -d'_' -f1 | sort -u`
+for P in $PRODS
+do
+   for V in `ls -rt ${P}_*.deb | tail -$KEEPGEN  | cut -d'_' -f2 `
+   do
+       echo ${P}_${V} >> $KEEP
+   done
+done
+
+ls *.deb | cut -d'_' -f1-2 | grep -v -f $KEEP > $MOVE
+
+for M in `cat $MOVE`
+do
+    echo "Removing"
+    ls ${M}_*
+    rm ${M}_*
+    # FIXME - instead of ls, move the files away
+done
+
+# rm -f $KEEP
+#rm -f $MOVE
diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
new file mode 100755 (executable)
index 0000000..03d3fe8
--- /dev/null
@@ -0,0 +1,97 @@
+#!/bin/sh
+# $Id: update-archive.sh,v 1.12 2007-11-11 19:47:15 adam Exp $
+if test ! -f apt-ftparchive.conf.in; then
+       echo "$0: apt-ftparchive.conf.in must be located in current directory"
+       exit 1
+fi
+
+if test ! -x /usr/bin/apt-ftparchive; then
+       echo "$0: /usr/bin/apt-ftparchive missing. Install apt-utils"
+       exit 1
+fi
+
+if test -z "$1"; then
+       debiandir=/home/ftp/pub/debian
+else
+       debiandir=$1
+fi
+
+if test ! -d "$debiandir"; then
+       echo "$0: The specified '$debiandir' is not a directory"
+       exit 1
+fi
+
+
+# gpg -a -d -o Release.gpg Release
+
+confdir=`pwd`
+cd $debiandir
+
+for dist in lenny etch sarge woody; do
+       # Make symlinks from the regular FTP archive
+       d=pool/$dist
+       if test ! -d $d; then mkdir -p $d; fi
+       for l in $d/*; do
+               if test -L $l; then
+                       if test -f $l; then
+                               :
+                       else
+                               rm $l
+                       fi
+               fi
+       done
+       ln -sf /home/ftp/pub/*/debian/$dist/* $d
+
+       # ${confdir}/symclean.sh $d
+
+       d=dists/$dist/main/binary-i386
+       if test ! -d $d; then mkdir -p $d; fi
+        echo "Archive: $dist" >$d/Release
+        echo 'Component: main' >>$d/Release
+        echo 'Origin: Indexdata' >>$d/Release
+        echo 'Architecture: i386' >>$d/Release
+
+       d=dists/$dist/main/source
+       if test ! -d $d; then mkdir -p $d; fi
+        echo "Archive: $dist" >$d/Release
+        echo 'Component: main' >>$d/Release
+        echo 'Origin: Indexdata' >>$d/Release
+        echo 'Architecture: source' >>$d/Release
+
+       # generate
+       F=apt-ftparchive.conf
+       sed "s/@dist@/$dist/g" <${confdir}/${F}.in >$F
+       # Don't know if clean is needed!
+       # apt-ftparchive clean apt-ftparchive.conf
+       apt-ftparchive generate apt-ftparchive.conf
+
+       # release
+       r=dists/$dist/Release
+       F=apt-release.conf
+       sed "s/@dist@/$dist/g" <${confdir}/${F}.in >$F
+       # Move Release file away while calling using release 
+       rm $r
+       apt-ftparchive -c $F release dists/$dist >tmp_Release
+       mv tmp_Release $r
+
+       # sign
+       r=dists/$dist/Release
+       rm -f ${r}.gpg
+       gpg --sign -u "Index Data" -ba -o ${r}.gpg dists/$dist/Release
+
+       # Make symlinks to make old sources list work (makedeb.sh compat)
+       F=dists/indexdata/$dist
+       if test ! -d $F; then
+               mkdir -p $F
+       fi
+       F=dists/indexdata/$dist/released
+       if test ! -d $F; then
+               ln -s /home/ftp/pub/debian/dists/$dist/main $F 
+       fi
+done
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 8
+# End:
+