Merge pull request #643 from g-maxime/preparing-v18.03.1

Preparing v18.03.1
MediaArea · Mar 26, 2018 · 8ac0e26 · 8ac0e26
2 parents 0c07a23 + a7a54e3
commit 8ac0e26
Show file tree

Hide file tree

Showing 33 changed files with 102 additions and 94 deletions.
diff --git a/History_CLI.txt b/History_CLI.txt
@@ -7,6 +7,10 @@ x Correction
 bug reports and feature request are here :
 https://github.com/MediaArea/MediaConch_SourceCode
 
+Version 18.03.1, 2018-03-26
+ --------------
+x Fix regression on Windows with directory names beginning by n or r.
+
 Version 18.03, 2018-03-19
 --------------
 x I782, FFV1: Golomb Rice parsing was wrong

diff --git a/History_GUI.txt b/History_GUI.txt
@@ -7,6 +7,10 @@ x Correction
 bug reports and feature request are here :
 https://github.com/MediaArea/MediaConch_SourceCode
 
+Version 18.03.1, 2018-03-26
+ --------------
+x Fix regression on Windows with directory names beginning by n or r.
+
 Version 18.03, 2018-03-19
 --------------
 x I782, FFV1: Golomb Rice parsing was wrong

diff --git a/Project/AppImage/Recipe.sh b/Project/AppImage/Recipe.sh
@@ -54,7 +54,7 @@ if ! grep "CentOS release 6\..*" /etc/centos-release ; then
 fi
 
 # Setup evironment
-VERSION=18.03
+VERSION=18.03.1
 
 if [ "$(arch)" == "i386" ] ; then
     ARCH="i686"

diff --git a/Project/GNU/CLI/configure.ac b/Project/GNU/CLI/configure.ac
@@ -5,7 +5,7 @@ dnl #########################################################################
 dnl -------------------------------------------------------------------------
 dnl Name and version
 dnl
-AC_INIT([mediaconch], [18.03.0])
+AC_INIT([mediaconch], [18.03.1])
 
 dnl -------------------------------------------------------------------------
 dnl Test if we are at the good place

diff --git a/Project/GNU/PKGBUILD b/Project/GNU/PKGBUILD
@@ -3,7 +3,7 @@
 # This PKGBUILD is for OBS
 
 pkgname=('mediaconch' 'mediaconch-server' 'mediaconch-gui')
-pkgver=18.03
+pkgver=18.03.1
 pkgrel=1
 pkgdesc="Implementation checker and policy checker for video and audio files"
 url="http://MediaArea.net/MediaConch"
@@ -13,7 +13,7 @@ md5sums=('00000000000000000000000000000000')
 arch=('i686' 'x86_64')
 
 # Buildtime dependencies for all packages need to be listed here
-makedepends=('desktop-file-utils' 'libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.37' 'libmediainfo>=18.03')
+makedepends=('desktop-file-utils' 'libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.37' 'libmediainfo>=18.03.1')
 # OBS don't provide jansson
 #makedepends=(${makedepends[@]} jansson)
 
@@ -49,7 +49,7 @@ build() {
 
 package_mediaconch() {
     pkgdesc="${pkgdesc} (CLI)"
-    depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.37' 'libmediainfo>=18.03')
+    depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.37' 'libmediainfo>=18.03.1')
 
     cd "${srcdir}"/MediaConch/Project/GNU/CLI
     make DESTDIR="${pkgdir}" install-strip
@@ -63,7 +63,7 @@ package_mediaconch() {
 
 package_mediaconch-server() {
     pkgdesc="${pkgdesc} (Server)"
-    depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.37' 'libmediainfo>=18.03')
+    depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.37' 'libmediainfo>=18.03.1')
     backup=('etc/mediaconch/MediaConch.rc')
 
     cd "${srcdir}"/MediaConch/Project/GNU/Server
@@ -82,7 +82,7 @@ package_mediaconch-server() {
 
 package_mediaconch-gui() {
     pkgdesc="${pkgdesc} (GUI)"
-    depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.37' 'libmediainfo>=18.03')
+    depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.37' 'libmediainfo>=18.03.1')
 
     cd "${srcdir}"/MediaConch
     install -D -m 0755 Project/Qt/mediaconch-gui "${pkgdir}"/usr/bin/mediaconch-gui

diff --git a/Project/GNU/Server/configure.ac b/Project/GNU/Server/configure.ac
@@ -5,7 +5,7 @@ dnl #########################################################################
 dnl -------------------------------------------------------------------------
 dnl Name and version
 dnl
-AC_INIT([mediaconchd], [18.03.0])
+AC_INIT([mediaconchd], [18.03.1])
 
 dnl -------------------------------------------------------------------------
 dnl Test if we are at the good place

diff --git a/Project/GNU/mediaconch.dsc b/Project/GNU/mediaconch.dsc
@@ -2,13 +2,13 @@ Format: 3.0 (quilt)
 Source: mediaconch
 Binary: mediaconch, mediaconch-dbg, mediaconch-server, mediaconch-server-dbg, mediaconch-gui, mediaconch-gui-dbg
 Architecture: any
-Version: 18.03-1
+Version: 18.03.1-1
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://MediaArea.net/MediaConch
 Standards-Version: 3.9.6
 Vcs-Git: https://github.com/MediaArea/MediaConch_SourceCode.git
 Vcs-Browser: https://github.com/MediaArea/MediaConch_SourceCode
-Build-Depends: debhelper (>= 9), dh-autoreconf, tofrodos, libmediainfo-dev (>= 18.03), libzen-dev (>= 0.4.37), qt5-qmake, qtbase5-dev, libqt5webkit5-dev, libxml2-dev, libxslt-dev, libsqlite3-dev, libjansson-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool, libcurl4-gnutls-dev, libevent-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, tofrodos, libmediainfo-dev (>= 18.03.1), libzen-dev (>= 0.4.37), qt5-qmake, qtbase5-dev, libqt5webkit5-dev, libxml2-dev, libxslt-dev, libsqlite3-dev, libjansson-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool, libcurl4-gnutls-dev, libevent-dev
 Package-List:
  mediaconch deb utils optional arch=any
  mediaconch-server deb utils optional arch=any
@@ -17,11 +17,11 @@ Package-List:
  mediaconch-server-dbg debug utils extra arch=any
  mediaconch-gui-dbg deb debug extra arch=any
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 mediaconch_18.03.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 mediaconch_18.03-1.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 mediaconch_18.03.1.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 mediaconch_18.03.1-1.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_18.03.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_18.03-1.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_18.03.1.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_18.03.1-1.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 mediaconch_18.03.orig.tar.xz
- 00000000000000000000000000000000 000000 mediaconch_18.03-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 mediaconch_18.03.1.orig.tar.xz
+ 00000000000000000000000000000000 000000 mediaconch_18.03.1-1.debian.tar.xz
diff --git a/Project/GNU/mediaconch.spec b/Project/GNU/mediaconch.spec
@@ -1,5 +1,5 @@
-%define mediaconch_version          18.03
-%define libmediainfo_version        18.03
+%define mediaconch_version          18.03.1
+%define libmediainfo_version        18.03.1
 %define libzen_version              0.4.37
 
 %if 0%{?fedora_version} || 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600

diff --git a/Project/MSVC2013/CLI/MediaConch_CLI.rc b/Project/MSVC2013/CLI/MediaConch_CLI.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,03,0,0
- PRODUCTVERSION 18,03,0,0
+ FILEVERSION 18,03,1,0
+ PRODUCTVERSION 18,03,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "18.03.0.0"
+            VALUE "FileVersion", "18.03.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "18.03.0.0"
+            VALUE "ProductVersion", "18.03.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2013/GUI/MediaConch_GUI.rc b/Project/MSVC2013/GUI/MediaConch_GUI.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,03,0,0
- PRODUCTVERSION 18,03,0,0
+ FILEVERSION 18,03,1,0
+ PRODUCTVERSION 18,03,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "18.03.0.0"
+            VALUE "FileVersion", "18.03.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "18.03.0.0"
+            VALUE "ProductVersion", "18.03.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2013/Server/MediaConch-Server.rc b/Project/MSVC2013/Server/MediaConch-Server.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,03,0,0
- PRODUCTVERSION 18,03,0,0
+ FILEVERSION 18,03,1,0
+ PRODUCTVERSION 18,03,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "18.03.0.0"
+            VALUE "FileVersion", "18.03.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "18.03.0.0"
+            VALUE "ProductVersion", "18.03.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/CLI/MediaConch_CLI.rc b/Project/MSVC2015/CLI/MediaConch_CLI.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,03,0,0
- PRODUCTVERSION 18,03,0,0
+ FILEVERSION 18,03,1,0
+ PRODUCTVERSION 18,03,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "18.03.0.0"
+            VALUE "FileVersion", "18.03.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "18.03.0.0"
+            VALUE "ProductVersion", "18.03.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/GUI/MediaConch_GUI.rc b/Project/MSVC2015/GUI/MediaConch_GUI.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,03,0,0
- PRODUCTVERSION 18,03,0,0
+ FILEVERSION 18,03,1,0
+ PRODUCTVERSION 18,03,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "18.03.0.0"
+            VALUE "FileVersion", "18.03.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "18.03.0.0"
+            VALUE "ProductVersion", "18.03.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/Server/MediaConch-Server.rc b/Project/MSVC2015/Server/MediaConch-Server.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,03,0,0
- PRODUCTVERSION 18,03,0,0
+ FILEVERSION 18,03,1,0
+ PRODUCTVERSION 18,03,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "18.03.0.0"
+            VALUE "FileVersion", "18.03.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "18.03.0.0"
+            VALUE "ProductVersion", "18.03.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/CLI/MediaConch_CLI.rc b/Project/MSVC2017/CLI/MediaConch_CLI.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,03,0,0
- PRODUCTVERSION 18,03,0,0
+ FILEVERSION 18,03,1,0
+ PRODUCTVERSION 18,03,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "18.03.0.0"
+            VALUE "FileVersion", "18.03.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "18.03.0.0"
+            VALUE "ProductVersion", "18.03.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/GUI/MediaConch_GUI.rc b/Project/MSVC2017/GUI/MediaConch_GUI.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,03,0,0
- PRODUCTVERSION 18,03,0,0
+ FILEVERSION 18,03,1,0
+ PRODUCTVERSION 18,03,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "18.03.0.0"
+            VALUE "FileVersion", "18.03.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "18.03.0.0"
+            VALUE "ProductVersion", "18.03.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/Server/MediaConch-Server.rc b/Project/MSVC2017/Server/MediaConch-Server.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,03,0,0
- PRODUCTVERSION 18,03,0,0
+ FILEVERSION 18,03,1,0
+ PRODUCTVERSION 18,03,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
-            VALUE "FileVersion", "18.03.0.0"
+            VALUE "FileVersion", "18.03.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaConch"
-            VALUE "ProductVersion", "18.03.0.0"
+            VALUE "ProductVersion", "18.03.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/Mac/Info.plist b/Project/Mac/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>18.03</string>
+	<string>18.03.1</string>
 	<key>CFBundleVersion</key>
-	<string>18.03</string>
+	<string>18.03.1</string>
 	<key>DTCompiler</key>
 	<string></string>
 	<key>DTPlatformBuild</key>

diff --git a/Project/OBS/deb7.debian/changelog b/Project/OBS/deb7.debian/changelog
@@ -1,4 +1,4 @@
-mediaconch (18.03-1deb7) unstable; urgency=low
+mediaconch (18.03.1-1deb7) unstable; urgency=low
 
   * See History.txt for more info and real dates