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

5 files changed, 6 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..60fb7a6b6
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+ Please look at the git log.
+ If this is a tarball the git log can be found online at https://git.gnunet.org/gnunet.git/log/.
diff --git a/contrib/conf/commit-msg b/contrib/conf/commit-msg
index f6e73d5cc..cc532921c 100755
--- a/contrib/conf/commit-msg
+++ b/contrib/conf/commit-msg
@@ -15,7 +15,7 @@ do
  if echo $f | grep \src\/include\/.\*\.h\$  > /dev/null
  then
    RET=1
-   # Check if it has a ChangeLog line
+   # Check if it has a NEWS line
    if cat $COMMIT_MSG_FILE | grep -i "^NEWS:\s[-,a-zA-Z][a-zA-Z]*" > /dev/null
    then
        RET=0
@@ -24,10 +24,10 @@ do
  fi
 done
 
-# If no ChangeLog line found, abort
+# If no NEWS line found, abort
 if [ $RET = 1 ];
 then
-  echo "Your commit includes staged changes that indicate an API change which requires a ChangeLog line."
+  echo "Your commit includes staged changes that indicate an API change which requires a NEWS line."
 else
   echo "Your commit does not include API changes"
 fi
diff --git a/contrib/conf/prepare-commit-msg b/contrib/conf/prepare-commit-msg
index 0266f5558..8acca9e38 100755
--- a/contrib/conf/prepare-commit-msg
+++ b/contrib/conf/prepare-commit-msg
@@ -27,12 +27,10 @@ done
 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"
+    echo -e "# Your commit includes staged changes that indicate an API change which requires a NEWS line." >> "$COMMIT_MSG_FILE"
   fi
   echo "$hint" >> "$COMMIT_MSG_FILE"
 fi
diff --git a/contrib/gana b/contrib/gana
-Subproject 79163ab6ea6f6cfe7f4311f91fb45c747b8c33d
+Subproject 66228b8a4306f028d843d78fbfcca54260539ff
diff --git a/contrib/sphinx b/contrib/sphinx
-Subproject 4f40b5deca02c8dc64ff6c73e6602e6abdd1bae
+Subproject 9c5b9d9040d21542eff792e26624cf9669b127a