New upstream version 1.3.4

PKG-INFO

 Metadata-Version: 1.0
 Name: pidp.tools
-Version: 1.3.3
+Version: 1.3.4
 Summary: PETRA III Debian Package Tools
 Home-page: https://stash.desy.de/projects/JMK/repos/pidptools/browse/
 Author: Jan Kotanski

pidpbuild

@@ -66,7 +66,7 @@ if [[ ! -z $HELP ]] && [[ -z $PACKAGE ]] ; then
     echo "Error: PACKAGE variable is not defined"
 fi
 if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] ; then
-    echo "pidpbuild version 1.3.3"
+    echo "pidpbuild version 1.3.4"
     echo ""
     echo "usage: pidpbuild [<TARBALL>] [-v=<VERSION>] [-ns|--no-signature]"
     echo "                 [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv]"
@@ -186,10 +186,18 @@ else
 	    fi
 	    git clean -f -d
 	    if [[ -f $TARBALL ]] ; then
-		if [[ -z $MERGE ]] ; then
-		    gbp import-orig "$TARBALL" --merge-mode=replace
-		else
+		GBPV=$(gbp --version)
+		IFS=' ' read -r GBPNAME GBPVERSION <<< $GBPV
+		IFS='.' read -r VMAJ VMIN  VPATCH <<< $GBPVERSION
+		
+		if [[ "$VMAJ" -eq "0" ]] && [[ "$VMIN" -lt "8" ]] ; then
 		    gbp import-orig "$TARBALL"
+		else
+		    if [[ -z $MERGE ]] ; then
+			gbp import-orig "$TARBALL" --merge-mode=replace
+		    else
+			gbp import-orig "$TARBALL" --merge-mode=merge
+		    fi
 		fi
 	    else
 		echo "Error: $TARBALL cannot be found" ; exit 1

pidpclone

@@ -59,7 +59,7 @@ if [[ ! -z $HELP ]] && [[ -z $PACKAGE ]] ; then
     echo "Error: PACKAGE variable is not defined"
 fi
 if [[ ! -z $HELP ]] || [[ -z $PACKAGE  ]] ; then
-    echo "pidpclone version 1.3.3"
+    echo "pidpclone version 1.3.4"
     echo ""
     echo "usage: pidpclone <DEB-PACKAGE-NAME> [-p|--patch] [-u=<USER>] [-h|--help]"
     echo "                  [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv] "

pidpcreate

@@ -70,7 +70,7 @@ if [[ ! -z $HELP ]] && [[ -z $TARBALL ]] ; then
     echo "Error: TARBALL variable is not defined"
 fi
 if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] || [[ -z $TARBALL ]] ; then
-    echo "pidpbuild version 1.3.3"
+    echo "pidpbuild version 1.3.4"
     echo ""
     echo "usage: pidpcreate <DEB-PACKAGE-NAME> <TARBALL> [-v=<SRCVERSION>] [-ns|--no-signature]"
     echo "                 [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv]"

pidppush

@@ -45,7 +45,7 @@ if [[ ! -z $HELP ]] && [[ -z $DEBPACKAGE ]] ; then
     echo "Error: DEB-PACKAGE-NAME argument is not defined"
 fi
 if [[ ! -z $HELP ]] || [[ -z $DEBPACKAGE  ]] ; then
-    echo "pidppush version 1.3.3"
+    echo "pidppush version 1.3.4"
     echo ""
     echo "usage: pidppush <DEB-PACKAGE-NAME> "
     echo ""

setup.py

@@ -30,7 +30,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 #: (:obj:`str`) full release number
-release = '1.3.3'
+release = '1.3.4'
 
 #: (:obj:`dict` <:obj:`str` , any >`) metadata for distutils
 SETUPDATA = dict(