Merge branch 'master' of ssh://git.gnunet.org/gnunet

9 files changed, 95 insertions, 29 deletions

diff --git a/contrib/conf/commit-msg b/contrib/conf/commit-msg
new file mode 100755
index 000000000..f6e73d5cc
--- /dev/null
+++ b/contrib/conf/commit-msg
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# use as .git/hooks/commit-msg
+
+COMMIT_MSG_FILE=$1
+
+exec 1>&2
+
+RET=0
+changed=$(git diff --cached --name-only)
+
+for f in $changed;
+do
+ # Only headers in include
+ if echo $f | grep \src\/include\/.\*\.h\$  > /dev/null
+ then
+   RET=1
+   # Check if it has a ChangeLog line
+   if cat $COMMIT_MSG_FILE | grep -i "^NEWS:\s[-,a-zA-Z][a-zA-Z]*" > /dev/null
+   then
+       RET=0
+       break
+   fi
+ fi
+done
+
+# If no ChangeLog line found, abort
+if [ $RET = 1 ];
+then
+  echo "Your commit includes staged changes that indicate an API change which requires a ChangeLog line."
+else
+  echo "Your commit does not include API changes"
+fi
+exit $RET
diff --git a/contrib/conf/prepare-commit-msg b/contrib/conf/prepare-commit-msg
new file mode 100755
index 000000000..0266f5558
--- /dev/null
+++ b/contrib/conf/prepare-commit-msg
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# use as .git/hooks/pre-commit
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+exec 1>&2
+
+RET=0
+changed=$(git diff --cached --name-only)
+
+for f in $changed;
+do
+ # Only headers in include
+ if echo $f | grep \src\/include\/.\*\.h\$  > /dev/null
+ then
+    RET=1
+ fi
+done
+
+# Only add custom message when there is no commit source
+# ($COMMIT_SOURCE is empty). Otherwise, keep the default message
+# proposed by Git. Possible commit source: message, template,
+# merge, squash or commit.
+if [ -z "$COMMIT_SOURCE" ];
+then
+  hint=$(cat "$COMMIT_MSG_FILE")
+  echo ": Fixes #" > "$COMMIT_MSG_FILE"
+  echo -e "# Our commit subject format policy is:\n# <subsystem>: <description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will automatically update/resolve issue #1234 in mantis." >> "$COMMIT_MSG_FILE"
+  if [ $RET = 1 ];
+  then
+    echo -e "\n# Your commit includes staged changes that indicate an API change which requires a ChangeLog line." >> "$COMMIT_MSG_FILE"
+    echo "NEWS: " >> "$COMMIT_MSG_FILE"
+  fi
+  echo "$hint" >> "$COMMIT_MSG_FILE"
+fi
+exit 0
diff --git a/contrib/gana b/contrib/gana
-Subproject ab275183e41a202848788bcd5c3a33c64aa6d06
+Subproject 79163ab6ea6f6cfe7f4311f91fb45c747b8c33d
diff --git a/contrib/get_version.sh b/contrib/get_version.sh
index 7366c6bf6..6e3ab5141 100755
--- a/contrib/get_version.sh
+++ b/contrib/get_version.sh
@@ -5,7 +5,7 @@ if test -f ".version"
 then
   VERSION=$(cat .version)
 fi
-if test -d "./.git"
+if [ -e ./.git ]
 then
   VERSION=$(git describe --tags)
   VERSION=${VERSION#v}
diff --git a/contrib/scripts/changelog_delta.sh b/contrib/scripts/changelog_delta.sh
deleted file mode 100755
index 988434903..000000000
--- a/contrib/scripts/changelog_delta.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-if [ $2 == "plain" ]; then
-  FORMAT="  - %s%n%b"
-  echo "Changes since $1:"
-elif [ $2 == "html" ]; then
-  FORMAT="  <li>%s<br>%b</li>"
-  echo "<ul>"
-elif [ $2 == "changelog" ]; then
-  FORMAT="%aD (%h)%n%s%n%b%nby: %cN%n"
-fi
-
-git --no-pager log --grep="^[a-zA-Z]*: " --no-merges --no-color --format="$FORMAT" $1..HEAD
-
-if [ $2 == "html" ]; then
-  echo "</ul>"
-fi
-
-
diff --git a/contrib/scripts/news_delta.sh b/contrib/scripts/news_delta.sh
new file mode 100755
index 000000000..20fb98649
--- /dev/null
+++ b/contrib/scripts/news_delta.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+OLDVERSION=$1
+
+git --no-pager log --grep="^NEWS: " -i --no-merges --no-color --format="%s%n%b" $1..HEAD | grep -i "^NEWS:\s[a-zA-Z][a-zA-Z]*" | sed 's/NEWS:/  -/i'
+echo ""
diff --git a/contrib/scripts/update_changelog.sh b/contrib/scripts/update_changelog.sh
deleted file mode 100644
index 988ca6490..000000000
--- a/contrib/scripts/update_changelog.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-DELTA_SH="contrib/scripts/changelog_delta.sh"
-LASTHASH=$(head -n1 ChangeLog | cut -d " " -f 7 | tr -d \( | tr -d \))
-
-$DELTA_SH $LASTHASH changelog > ChangeLog.delta || exit 1
-cp ChangeLog ChangeLog.bak || exit 1
-cat ChangeLog.delta > ChangeLog || exit 1
-cat ChangeLog.bak >> ChangeLog || exit 1
-rm ChangeLog.bak ChangeLog.delta
-
diff --git a/contrib/scripts/update_news.sh b/contrib/scripts/update_news.sh
new file mode 100644
index 000000000..2ee5fa3dc
--- /dev/null
+++ b/contrib/scripts/update_news.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+NEW_VERSION=$1
+if [ -z $NEW_VERSION ]; then
+    NEW_VERSION="Unreleased"
+fi
+DELTA_SH="contrib/scripts/news_delta.sh"
+LASTHASH=$(head -n1 NEWS | cut -d " " -f 2 | tr -d \( | tr -d \) | tr -d :)
+
+echo "$NEW_VERSION ($(git rev-parse --short HEAD)):" > NEWS.delta || exit 1
+$DELTA_SH $LASTHASH >> NEWS.delta || exit 1
+cp NEWS NEWS.bak || exit 1
+cat NEWS.delta > NEWS || exit 1
+cat NEWS.bak >> NEWS || exit 1
+rm NEWS.bak NEWS.delta
+
diff --git a/contrib/sphinx b/contrib/sphinx
-Subproject 378f616d277a6064653175c11dc318263069fb8
+Subproject 4f40b5deca02c8dc64ff6c73e6602e6abdd1bae