Merge conflicts.

diff --git a/packages/dipendenze_pacchetti b/packages/dipendenze_pacchetti
index 9dda9304ba7e710f6f3e5229da7513fdfa5f8356..5295ae5eac3a56e7f3bb9ad622995282d39a45b3 100644 (file)
--- a/packages/dipendenze_pacchetti
+++ b/packages/dipendenze_pacchetti
@@ -51,6 +51,8 @@
 
 - libzakautho (develop)
 
+- libzakauthogui (develop)
+
 - libzakgtkdecoder (develop)
 
 - libzakformgtkdecoder (master)
@@ -62,6 +64,11 @@
   - libzakform
   - libzakutils
 
+- libzakformhashtable (master)
+  - libzakform
+
+- libzakaudit (gtk3)
+
 - territorio (develop)
   - libgdaex
   - libgdaexgrid

diff --git a/tools/autobuilder/debian_tobeupdated.sh b/tools/autobuilder/debian_tobeupdated.sh
index 1cec85a9604d0fd98715b1c4e0814af0acdead1c..e211c2d9455b1d95f53d67b87994c76f8e4bfdad 100755 (executable)
--- a/tools/autobuilder/debian_tobeupdated.sh
+++ b/tools/autobuilder/debian_tobeupdated.sh
@@ -15,10 +15,15 @@ UPSTREAM_BRANCH=`sed -n -e 's/^\s*upstream-branch\s*=\s*//p' debian/gbp.conf`
 
 echo "Upstream branch: "$UPSTREAM_BRANCH
 
+# update current branch
+git pull -r --autostash
+
 # update upstream branch
+git stash save
 git checkout $UPSTREAM_BRANCH
 git pull
 git checkout $CURRENT_BRANCH
+git stash pop
 
 # not empty if there's at least one commit be merged
 TO_BE_MERGED=`git log --pretty=oneline --graph ..$UPSTREAM_BRANCH | head -n 1 | sed -n -e 's/\* //p'`