ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

This commit is contained in:
Isaac Connor 2019-06-24 12:00:19 -04:00
parent 148a48a861
commit 8cf7563ce4
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
utils/do_debian_package.sh
View File

@ -124,7 +124,6 @@ else
fi; fi;
fi fi
<<<<<<< HEAD
if [ "$PPA" == "" ]; then if [ "$PPA" == "" ]; then
if [ "$RELEASE" != "" ]; then if [ "$RELEASE" != "" ]; then
# We need to use our official tarball for the original source, so grab it and overwrite our generated one. # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
@ -140,22 +139,6 @@ if [ "$PPA" == "" ]; then
else else
PPA="ppa:iconnor/zoneminder-$BRANCH"; PPA="ppa:iconnor/zoneminder-$BRANCH";
fi; fi;
=======
PPA="";
if [ "$RELEASE" != "" ]; then
# We need to use our official tarball for the original source, so grab it and overwrite our generated one.
IFS='.' read -r -a VERSION <<< "$RELEASE"
if [ "${VERSION[0]}.${VERSION[1]}" == "1.30" ]; then
PPA="ppa:iconnor/zoneminder-stable"
else
PPA="ppa:iconnor/zoneminder-${VERSION[0]}.${VERSION[1]}"
fi;
else
if [ "$BRANCH" == "" ]; then
PPA="ppa:iconnor/zoneminder-master";
else
PPA="ppa:iconnor/zoneminder-$BRANCH";
>>>>>>> acb95709e6cd8fdb9e76b3d58bc6f546fc6b1447
fi; fi;
fi; fi;
@ -349,10 +332,7 @@ EOF
dput $PPA $SC dput $PPA $SC
fi; fi;
else else
<<<<<<< HEAD
echo "dputting to $PPA"; echo "dputting to $PPA";
=======
>>>>>>> acb95709e6cd8fdb9e76b3d58bc6f546fc6b1447
dput $PPA $SC dput $PPA $SC
fi; fi;
fi; fi;
@ -365,5 +345,3 @@ if [ "$INTERACTIVE" != "no" ]; then
else else
rm -fr "$DIRECTORY.orig"; echo "The checked out copy has been deleted"; rm -fr "$DIRECTORY.orig"; echo "The checked out copy has been deleted";
fi fi