apertis-pkg-merge-local: Support different types of release commits

Depending on the type of changes, upstream or donwstream, it is better to
use different settings while generation the changelog, in order to provide
or not the full set of changes.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

tools/apertis-pkg-merge-local

@@ -83,7 +83,6 @@ commit-whitelist() {
 }
 
 release() {
-    dch --force-distribution --distribution apertis --local +apertis --upstream Rebase on top of $UPSTREAM_BRANCH
     git add debian/changelog
     git diff --cached
     DIR=`pwd`
@@ -93,6 +92,16 @@ release() {
     git commit -sm "Release $PACKAGE version $VERSION"
 }
 
+release-down() {
+    GBP_CONF_FILES=/dev/null gbp dch --release --force-distribution -D apertis --local +apertis --ignore-branch --dch-opt=--upstream --full
+    release
+}
+
+release-up() {
+    dch --force-distribution --distribution apertis --local +apertis --upstream Merge changes from $UPSTREAM_BRANCH
+    release
+}
+
 COMMAND=$1
 shift
 EXTRA_ARGS=$@
@@ -113,11 +122,14 @@ scan)
 commit-whitelist)
     commit-whitelist
     ;;
-release)
-    release
+release-down)
+    release-down
+    ;;
+release-up)
+    release-up
     ;;
 *)
     echo Unknown command
-    echo Usage `basename $0` '[merge|diff|diff_old|scan|commit-whitelist|release]'
+    echo Usage `basename $0` '[merge|diff|diff_old|scan|commit-whitelist|release-down|release-up]'
     ;;
 esac