Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 0 insertions, 120 deletions

diff --git a/SQLiteStudio3/create_win32_portable.bat b/SQLiteStudio3/create_win32_portable.bat
deleted file mode 100644
index 6d48245..0000000
--- a/SQLiteStudio3/create_win32_portable.bat
+++ /dev/null
@@ -1,120 +0,0 @@
-@echo off

-

-set QT_DIR=C:\Qt\5.6\mingw49_32\bin

-set ZIP="c:\Program Files\7-Zip\7z.exe"

-

-set QMAKE=%QT_DIR%\qmake.exe

-set OLDDIR=%CD%

-

-rem Find Qt

-if exist %QMAKE% (

-	echo Qt found at %QT_DIR%

-) else (

-	echo Cannot find Qt

-	GOTO:EOF

-)

-

-rem Find 7zip

-if exist %ZIP% (

-	echo 7zip found at %ZIP%

-) else (

-	echo Cannot find 7zip

-	GOTO:EOF

-)

-

-cd %OLDDIR%

-

-rem Clean up

-echo Cleaning up...

-cd ..\output

-rmdir /s /q portable

-

-rem Create a copy

-echo Creating a portable distribution

-mkdir portable\SQLiteStudio

-xcopy SQLiteStudio portable\SQLiteStudio /s /e /q > nul

-

-rem Remove .a files from app dir

-cd portable\SQLiteStudio

-del /q *.a

-set PORTABLE=%CD%

-

-rem Remove .a files from plugins dir

-cd plugins

-del /q *.a

-rem Copy Qt files

-cd %QT_DIR%

-set QT_LIB_LIST=Qt5Core Qt5Gui Qt5Network Qt5PrintSupport Qt5Script Qt5Svg Qt5Widgets Qt5Xml icudt53 icuin53 icuuc53 libgcc_s_dw2-1 libstdc++-6 libwinpthread-1

-for %%i in (%QT_LIB_LIST%) do (

-	copy "%%i.dll" %PORTABLE% > nul

-)

-copy qt.conf %PORTABLE% > nul

-

-mkdir %PORTABLE%\iconengines %PORTABLE%\imageformats %PORTABLE%\platforms %PORTABLE%\printsupport

-cd %QT_DIR%\..\plugins

-

-copy iconengines\qsvgicon.dll %PORTABLE%\iconengines > nul

-copy platforms\qwindows.dll %PORTABLE%\platforms > nul

-copy printsupport\windowsprintersupport.dll %PORTABLE%\printsupport > nul

-for %%i in (qdds qgif qicns qico qjpeg qsvg qtga qtiff qwbmp) do (

-	copy imageformats\%%i.dll %PORTABLE%\imageformats > nul

-)

-

-rem Copy app-specific deps

-cd %OLDDIR%\..\..\lib

-copy *.dll %PORTABLE% > nul

-

-call:getAppVersion

-cd %PORTABLE%\..

-%ZIP% a -r sqlitestudio-%APP_VERSION%.zip SQLiteStudio > nul

-

-rem Incremental package

-echo Creating incremental update package

-cd %PORTABLE%\..

-mkdir incremental\SQLiteStudio

-xcopy SQLiteStudio incremental\SQLiteStudio /s /e /q > nul

-cd incremental\SQLiteStudio

-del /q Qt5*.dll

-del /q icu*.dll

-del /q libgcc* libstdc* libwinpthread*

-rmdir /s /q iconengines imageformats platforms printsupport plugins

-

-cd %PORTABLE%\..\incremental

-%ZIP% a -r sqlitestudio-%APP_VERSION%.zip SQLiteStudio > nul

-

-rem Plugin packages

-echo Creating plugin updates

-cd %PORTABLE%\..

-for /f "delims=" %%p in ('SQLiteStudio\SQLiteStudio.exe --list-plugins') do (

-	call:preparePlugin %%p

-)

-

-cd %OLDDIR%

-GOTO:EOF

-

-:preparePlugin

-	set plugin=%~1

-	set plugin_ver=%~2

-	if exist SQLiteStudio\plugins\%plugin%.dll (

-		echo Creating plugin update: %plugin%

-		mkdir plugins\%plugin%\SQLiteStudio\plugins

-		copy SQLiteStudio\plugins\%plugin%.dll plugins\%plugin%\SQLiteStudio\plugins > nul

-

-		cd plugins\%plugin%

-		%ZIP% a -r ..\%plugin%-%plugin_ver%.zip SQLiteStudio > nul

-		cd ..\..

-	)

-GOTO:EOF

-

-:getAppVersion

-	pushd

-	cd %PORTABLE%

-	for /f "delims=" %%v in ('sqlitestudiocli --version') do (

-		call:getAppVersionFromSecondArgument %%v

-	)

-	popd

-GOTO:EOF

-

-:getAppVersionFromSecondArgument

-	set APP_VERSION=%~2

-GOTO:EOF