build: change changelog scripts to NEWS.

5 files changed, 18 insertions, 24 deletions

diff --git a/NEWS b/NEWS
index 898a3dab3..746ec2884 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +1,2 @@
-See ChangeLog.
+v0.19.2 (e9bc4c898):
+  - New changelog format origin
\ No newline at end of file
diff --git a/contrib/conf/commit-msg b/contrib/conf/commit-msg
index 7e6ec65ee..f6e73d5cc 100755
--- a/contrib/conf/commit-msg
+++ b/contrib/conf/commit-msg
@@ -16,7 +16,7 @@ do
  then
    RET=1
    # Check if it has a ChangeLog line
-   if cat $COMMIT_MSG_FILE | grep "^ChangeLog:\s*[-,a-zA-Z][a-zA-Z]*" > /dev/null
+   if cat $COMMIT_MSG_FILE | grep -i "^NEWS:\s[-,a-zA-Z][a-zA-Z]*" > /dev/null
    then
        RET=0
        break
diff --git a/contrib/conf/prepare-commit-msg b/contrib/conf/prepare-commit-msg
index 16b4279ad..0266f5558 100755
--- a/contrib/conf/prepare-commit-msg
+++ b/contrib/conf/prepare-commit-msg
@@ -32,7 +32,7 @@ then
   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 "ChangeLog: " >> "$COMMIT_MSG_FILE"
+    echo "NEWS: " >> "$COMMIT_MSG_FILE"
   fi
   echo "$hint" >> "$COMMIT_MSG_FILE"
 fi
diff --git a/contrib/scripts/changelog_delta.sh b/contrib/scripts/changelog_delta.sh
index 988434903..20fb98649 100755
--- a/contrib/scripts/changelog_delta.sh
+++ b/contrib/scripts/changelog_delta.sh
@@ -1,18 +1,6 @@
 #!/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
 
+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
index 988ca6490..a28a32290 100644
--- a/contrib/scripts/update_changelog.sh
+++ b/contrib/scripts/update_changelog.sh
@@ -1,10 +1,15 @@
 #!/bin/bash
+NEW_VERSION=$1
+if [ -z $NEW_VERSION ]; then
+    NEW_VERSION="Unreleased"
+fi
 DELTA_SH="contrib/scripts/changelog_delta.sh"
-LASTHASH=$(head -n1 ChangeLog | cut -d " " -f 7 | tr -d \( | tr -d \))
+LASTHASH=$(head -n1 NEWS | cut -d " " -f 2 | tr -d \( | 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
+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