Merge branch 'master' of github.com:connortechnology/ZoneMinder

utils/do_debian_package.sh

@@ -30,6 +30,10 @@ case $i in
     INTERACTIVE="${i#*=}"
     shift # past argument=value
     ;;
+    -p=*|--ppa=*)
+    PPA="${i#*=}"
+    shift # past argument=value
+    ;;
     -r=*|--release=*)
     RELEASE="${i#*=}"
     shift
@@ -120,7 +124,7 @@ else
   fi;
 fi
 
-PPA="";
+if [ "$PPA" == "" ]; then
   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"
@@ -136,6 +140,7 @@ else
       PPA="ppa:iconnor/zoneminder-$BRANCH";
     fi;
   fi;
+fi;
 
 # Instead of cloning from github each time, if we have a fork lying around, update it and pull from there instead.
 if [ ! -d "${GITHUB_FORK}_zoneminder_release" ]; then 
@@ -327,6 +332,7 @@ EOF
         dput $PPA $SC
       fi;
     else
+      echo "dputting to $PPA";
       dput $PPA $SC
     fi;
   fi;
@@ -339,5 +345,3 @@ if [ "$INTERACTIVE" != "no" ]; then
 else 
   rm -fr "$DIRECTORY.orig"; echo "The checked out copy has been deleted";
 fi
-
-