Bug#985977: unblock: dlt-viewer/2.21.2+dfsg-1

2021-04-04 Thread Gianfranco Costamagna 
On Thu, 1 Apr 2021 22:06:35 +0200 Paul Gevers  wrote:
> Hi Gianfranco,
> 
> On Mon, 29 Mar 2021 10:49:38 +0200 Sebastian Ramacher
>  wrote:
> > Seems fine without the compat bump.
> 
> Please revert.
> 
> https://release.debian.org/bullseye/FAQ.html (last section).
> 
> Paul
> 
> 
> 

done thanks!

G.

Bug#985977: unblock: dlt-viewer/2.21.2+dfsg-1

2021-04-01 Thread Paul Gevers 
Hi Gianfranco,

On Mon, 29 Mar 2021 10:49:38 +0200 Sebastian Ramacher
 wrote:
> Seems fine without the compat bump.

Please revert.

https://release.debian.org/bullseye/FAQ.html (last section).

Paul





OpenPGP_signature
Description: OpenPGP digital signature

Bug#985977: unblock: dlt-viewer/2.21.2+dfsg-1

2021-03-29 Thread Sebastian Ramacher 
Control: tags -1 moreinfo confirmed

On 2021-03-27 10:32:44, Gianfranco Costamagna wrote:
> Package: release.debian.org
> User: release.debian@packages.debian.org
> Usertags: unblock
> Severity: normal
> 
> Please unblock package dlt-viewer
> 
> [ Reason ]
> There is a bug in current dlt-viewer UDP reception code, due to a swap
> of two assigments into the main function.
> 
> [ Impact ]
> They might have that disabled.
> 
> [ Tests ]
> I did manual testing with the dlt I use everyday
> 
> [ Risks ]
> The new upstream release is about yaml files and windows only affected
> changes, except for this bugfix.
> When bumping compat level to 13, I also found that some png images were
> not installed, but mentioned in rc file, so I added them to the shared
> directory.

Seems fine without the compat bump.

Cheers


> 
> [ Checklist ]
>   [x] all changes are documented in the d/changelog
>   [x] I reviewed all changes and I approve them
>   [x] attach debdiff against the package in testing
> 
> [ Other info ]
> This is a leaf package, but I hope the new release can go into stable.
> The diff looks a little bit big, but the only change in the code that
> affects linux systems is here:
> https://github.com/GENIVI/dlt-viewer/commit/6b336eed42c61f9589e4211ca4c020e706cc026a.patch
> 
> unblock dlt-viewer/2.21.2+dfsg-1

> diff -Nru dlt-viewer-2.21.1+dfsg/appveyor.yml 
> dlt-viewer-2.21.2+dfsg/appveyor.yml
> --- dlt-viewer-2.21.1+dfsg/appveyor.yml   2021-01-18 11:14:23.0 
> +0100
> +++ dlt-viewer-2.21.2+dfsg/appveyor.yml   1970-01-01 01:00:00.0 
> +0100
> @@ -1,15 +0,0 @@
> -version: 2.19.0.{build}
> -image: Visual Studio 2017
> -install:
> -  - set QTDIR=C:\Qt\5.12\msvc2017_64
> -  - set MSVC_DIR=C:\Program Files (x86)\Microsoft Visual 
> Studio\2017\Community\VC\Auxiliary\Build
> -  - set PATH=%PATH%;%QTDIR%\bin;%MSVC_DIR%
> -  - set ARCHITECTURE=x86_amd64
> -build_script:
> -  - call vcvarsall.bat %ARCHITECTURE%
> -  - dir
> -  - mkdir build
> -  - cd build
> -  - qmake ../BuildDltViewer.pro
> -  - nmake
> -test: off
> diff -Nru dlt-viewer-2.21.1+dfsg/build_parser_windows_qt5_MSVC.bat 
> dlt-viewer-2.21.2+dfsg/build_parser_windows_qt5_MSVC.bat
> --- dlt-viewer-2.21.1+dfsg/build_parser_windows_qt5_MSVC.bat  2021-01-18 
> 11:14:23.0 +0100
> +++ dlt-viewer-2.21.2+dfsg/build_parser_windows_qt5_MSVC.bat  2021-03-25 
> 08:41:04.0 +0100
> @@ -46,12 +46,22 @@
>  set PATH=%QTDIR%\bin;%MSVC_DIR%;%MSVC_DIR%\bin;%PATH%
>  set QTSDK=%QTDIR%
>  
> -IF "%DLT_PARSER_DIR%"=="" (
> +if '%WORKSPACE%'=='' (
> +if '%DLT_PARSER_DIR%'=='' (
>  set DLT_PARSER_DIR=c:\DltParser
> +)
> +
> +set SOURCE_DIR=%CD%
> +set BUILD_DIR=%CD%\build\release
> +) else (
> +if '%DLT_PARSER_DIR%'=='' (
> +set DLT_PARSER_DIR=%WORKSPACE%\build\dist\DltParser
> +)
> +
> +set SOURCE_DIR=%WORKSPACE%
> +set BUILD_DIR=%WORKSPACE%\build\release
>  )
>  
> -set SOURCE_DIR=%CD%
> -set BUILD_DIR=%CD%\build\release
>  
>  echo 
>  echo * QTDIR = %QTDIR%
> @@ -118,24 +128,6 @@
>  IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
>  
>  echo *** Copy files ***
> -rem copy %QTDIR%\bin\icuin54.dll %DLT_PARSER_DIR%
> -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
> -
> -rem copy %QTDIR%\bin\icuuc54.dll %DLT_PARSER_DIR%
> -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
> -
> -rem copy %QTDIR%\bin\icudt54.dll %DLT_PARSER_DIR%
> -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
> -
> -rem copy %QTDIR%\bin\libwinpthread-1.dll %DLT_PARSER_DIR%
> -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
> -rem 
> -rem copy %QTDIR%\bin\libgcc_s_dw2-1.dll %DLT_PARSER_DIR%
> -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
> -rem 
> -rem copy "%QTDIR%\bin\libstdc++-6.dll" %DLT_PARSER_DIR%
> -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
> -
>  copy %QTDIR%\bin\Qt5Core.dll %DLT_PARSER_DIR%
>  IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
>  
> diff -Nru dlt-viewer-2.21.1+dfsg/build_qwt_windows_qt5_MSVC.bat 
> dlt-viewer-2.21.2+dfsg/build_qwt_windows_qt5_MSVC.bat
> --- dlt-viewer-2.21.1+dfsg/build_qwt_windows_qt5_MSVC.bat 2021-01-18 
> 11:14:23.0 +0100
> +++ dlt-viewer-2.21.2+dfsg/build_qwt_windows_qt5_MSVC.bat 2021-03-25 
> 08:41:04.0 +0100
> @@ -6,7 +6,6 @@
>  REM 4.7.19   1.1   Alexander Wenzel  Update to Qt 5.12.4, Qwt 6.1.4 
> and Visual Studio 2015
>  REM 25.11.20 1.2   Alexander Wenzel  Update to Qt 5.12.10
>  
> -
>  echo 
>  echo ***Build QWT Library ***
>  echo 
> @@ -15,7 +14,6 @@
>  echo *** Configuration***
>  echo 
>  
> -
>  if "%MSVC_VERSION%"=="" (
> echo "Set default MSVCS ""
> set MSVC_VERSION=2015
> @@ -44,12 +42,11 @@
>  
>  echo *** Setting up environment  ***
>  
> -echo Set QT path for %QTVER%
> -
>  IF "%QTVER%"=="" (
>  set QTVER=5.12.10
>  )
>  
> +echo Set QT path for %QTVER%
>

Bug#985977: unblock: dlt-viewer/2.21.2+dfsg-1

2021-03-27 Thread Gianfranco Costamagna 
Package: release.debian.org
User: release.debian@packages.debian.org
Usertags: unblock
Severity: normal

Please unblock package dlt-viewer

[ Reason ]
There is a bug in current dlt-viewer UDP reception code, due to a swap
of two assigments into the main function.

[ Impact ]
They might have that disabled.

[ Tests ]
I did manual testing with the dlt I use everyday

[ Risks ]
The new upstream release is about yaml files and windows only affected
changes, except for this bugfix.
When bumping compat level to 13, I also found that some png images were
not installed, but mentioned in rc file, so I added them to the shared
directory.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
This is a leaf package, but I hope the new release can go into stable.
The diff looks a little bit big, but the only change in the code that
affects linux systems is here:
https://github.com/GENIVI/dlt-viewer/commit/6b336eed42c61f9589e4211ca4c020e706cc026a.patch

unblock dlt-viewer/2.21.2+dfsg-1
diff -Nru dlt-viewer-2.21.1+dfsg/appveyor.yml 
dlt-viewer-2.21.2+dfsg/appveyor.yml
--- dlt-viewer-2.21.1+dfsg/appveyor.yml 2021-01-18 11:14:23.0 +0100
+++ dlt-viewer-2.21.2+dfsg/appveyor.yml 1970-01-01 01:00:00.0 +0100
@@ -1,15 +0,0 @@
-version: 2.19.0.{build}
-image: Visual Studio 2017
-install:
-  - set QTDIR=C:\Qt\5.12\msvc2017_64
-  - set MSVC_DIR=C:\Program Files (x86)\Microsoft Visual 
Studio\2017\Community\VC\Auxiliary\Build
-  - set PATH=%PATH%;%QTDIR%\bin;%MSVC_DIR%
-  - set ARCHITECTURE=x86_amd64
-build_script:
-  - call vcvarsall.bat %ARCHITECTURE%
-  - dir
-  - mkdir build
-  - cd build
-  - qmake ../BuildDltViewer.pro
-  - nmake
-test: off
diff -Nru dlt-viewer-2.21.1+dfsg/build_parser_windows_qt5_MSVC.bat 
dlt-viewer-2.21.2+dfsg/build_parser_windows_qt5_MSVC.bat
--- dlt-viewer-2.21.1+dfsg/build_parser_windows_qt5_MSVC.bat2021-01-18 
11:14:23.0 +0100
+++ dlt-viewer-2.21.2+dfsg/build_parser_windows_qt5_MSVC.bat2021-03-25 
08:41:04.0 +0100
@@ -46,12 +46,22 @@
 set PATH=%QTDIR%\bin;%MSVC_DIR%;%MSVC_DIR%\bin;%PATH%
 set QTSDK=%QTDIR%
 
-IF "%DLT_PARSER_DIR%"=="" (
+if '%WORKSPACE%'=='' (
+if '%DLT_PARSER_DIR%'=='' (
 set DLT_PARSER_DIR=c:\DltParser
+)
+
+set SOURCE_DIR=%CD%
+set BUILD_DIR=%CD%\build\release
+) else (
+if '%DLT_PARSER_DIR%'=='' (
+set DLT_PARSER_DIR=%WORKSPACE%\build\dist\DltParser
+)
+
+set SOURCE_DIR=%WORKSPACE%
+set BUILD_DIR=%WORKSPACE%\build\release
 )
 
-set SOURCE_DIR=%CD%
-set BUILD_DIR=%CD%\build\release
 
 echo 
 echo * QTDIR = %QTDIR%
@@ -118,24 +128,6 @@
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
 
 echo *** Copy files ***
-rem copy %QTDIR%\bin\icuin54.dll %DLT_PARSER_DIR%
-rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
-
-rem copy %QTDIR%\bin\icuuc54.dll %DLT_PARSER_DIR%
-rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
-
-rem copy %QTDIR%\bin\icudt54.dll %DLT_PARSER_DIR%
-rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
-
-rem copy %QTDIR%\bin\libwinpthread-1.dll %DLT_PARSER_DIR%
-rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
-rem 
-rem copy %QTDIR%\bin\libgcc_s_dw2-1.dll %DLT_PARSER_DIR%
-rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
-rem 
-rem copy "%QTDIR%\bin\libstdc++-6.dll" %DLT_PARSER_DIR%
-rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
-
 copy %QTDIR%\bin\Qt5Core.dll %DLT_PARSER_DIR%
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
 
diff -Nru dlt-viewer-2.21.1+dfsg/build_qwt_windows_qt5_MSVC.bat 
dlt-viewer-2.21.2+dfsg/build_qwt_windows_qt5_MSVC.bat
--- dlt-viewer-2.21.1+dfsg/build_qwt_windows_qt5_MSVC.bat   2021-01-18 
11:14:23.0 +0100
+++ dlt-viewer-2.21.2+dfsg/build_qwt_windows_qt5_MSVC.bat   2021-03-25 
08:41:04.0 +0100
@@ -6,7 +6,6 @@
 REM 4.7.19   1.1   Alexander Wenzel  Update to Qt 5.12.4, Qwt 6.1.4 
and Visual Studio 2015
 REM 25.11.20 1.2   Alexander Wenzel  Update to Qt 5.12.10
 
-
 echo 
 echo ***Build QWT Library ***
 echo 
@@ -15,7 +14,6 @@
 echo *** Configuration***
 echo 
 
-
 if "%MSVC_VERSION%"=="" (
echo "Set default MSVCS ""
set MSVC_VERSION=2015
@@ -44,12 +42,11 @@
 
 echo *** Setting up environment  ***
 
-echo Set QT path for %QTVER%
-
 IF "%QTVER%"=="" (
 set QTVER=5.12.10
 )
 
+echo Set QT path for %QTVER%
 echo Set QT diretory for %ARCHITECTURE%
 
 if "%QTDIR%"=="" (
@@ -71,13 +68,19 @@
 set QWT=6.1.4
 )
 
-set QWT_DIR=C:\Qwt-%QWT%_%MSVC_VERSION%_%QTVER%%DIR_POSTFIX%
-
 set PATH=%QTDIR%\bin;%MSVC_DIR%;%MSVC_DIR%\bin;%PATH%
 
-IF "%WORKSPACE%" == "" (
+if '%WORKSPACE%'=='' (
+IF "%QWT_DIR%"=="" (
+set QWT_DIR=C:\Qwt-%QWT%_%MSVC_VERSION%_%QTVER%%DIR_POSTFIX%
+)
+
 set SOURCE_DIR=%CD%\qwt-%QWT%
-) ELSE (
+) else (
+if