Fix Linux installer for demo-debug versions (amend 4bc8939)

tools/linux_packaging/ardour.sh.in

@@ -48,5 +48,5 @@ if [ "T" = "$DEBUG" ]; then
 	export ARDOUR_INSIDE_GDB=1
 	exec gdb $INSTALL_DIR/bin/%EXENAME%-%VER%
 else
-	exec %WINE% $INSTALL_DIR/bin/%EXENAME%-%VER% "$@"
+	exec $INSTALL_DIR/bin/%EXENAME%-%VER% "$@"
 fi

tools/linux_packaging/build

@@ -29,7 +29,6 @@ WITH_NLS=
 EXTERNAL_JACK=
 VENDOR=Ardour ;
 EXENAME=ardour
-WINEEXE=
 BUILDTYPE=""
 NOSTRIP="libsuil|libserd|libsord|liblilv|libsratom|liblrdf|libardour|libpbd|libevoral"
 

tools/linux_packaging/stage2.run.in

@@ -449,7 +449,7 @@ fi
 # Setup derived variables
 ################################
 PGM_VERSION=$(echo ${BUNDLE_DIR} | cut -d- -f2)
-PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f3)
+PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f3-)
 
 if [ -z ${PGM_BUILDTYPE} ];
 then