Skip to content

Commit 8ac0e26

Browse files
JeromeMartinezJeromeMartinez
authored
Merge pull request #643 from g-maxime/preparing-v18.03.1
Preparing v18.03.1
2 parents 0c07a23 + a7a54e3 commit 8ac0e26

33 files changed

+102
-94
lines changed

‎History_CLI.txt

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ x Correction
77
bug reports and feature request are here :
88
https://github.com/MediaArea/MediaConch_SourceCode
99

10+
Version 18.03.1, 2018-03-26
11+
--------------
12+
x Fix regression on Windows with directory names beginning by n or r.
13+
1014
Version 18.03, 2018-03-19
1115
--------------
1216
x I782, FFV1: Golomb Rice parsing was wrong

‎History_GUI.txt

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ x Correction
77
bug reports and feature request are here :
88
https://github.com/MediaArea/MediaConch_SourceCode
99

10+
Version 18.03.1, 2018-03-26
11+
--------------
12+
x Fix regression on Windows with directory names beginning by n or r.
13+
1014
Version 18.03, 2018-03-19
1115
--------------
1216
x I782, FFV1: Golomb Rice parsing was wrong

‎Project/AppImage/Recipe.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if ! grep "CentOS release 6\..*" /etc/centos-release ; then
5454
fi
5555

5656
# Setup evironment
57-
VERSION=18.03
57+
VERSION=18.03.1
5858

5959
if [ "$(arch)" == "i386" ] ; then
6060
ARCH="i686"

‎Project/GNU/CLI/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dnl #########################################################################
55
dnl -------------------------------------------------------------------------
66
dnl Name and version
77
dnl
8-
AC_INIT([mediaconch], [18.03.0])
8+
AC_INIT([mediaconch], [18.03.1])
99

1010
dnl -------------------------------------------------------------------------
1111
dnl Test if we are at the good place

‎Project/GNU/PKGBUILD

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This PKGBUILD is for OBS
44

55
pkgname=('mediaconch' 'mediaconch-server' 'mediaconch-gui')
6-
pkgver=18.03
6+
pkgver=18.03.1
77
pkgrel=1
88
pkgdesc="Implementation checker and policy checker for video and audio files"
99
url="http://MediaArea.net/MediaConch"
@@ -13,7 +13,7 @@ md5sums=('00000000000000000000000000000000')
1313
arch=('i686' 'x86_64')
1414

1515
# Buildtime dependencies for all packages need to be listed here
16-
makedepends=('desktop-file-utils' 'libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.37' 'libmediainfo>=18.03')
16+
makedepends=('desktop-file-utils' 'libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.37' 'libmediainfo>=18.03.1')
1717
# OBS don't provide jansson
1818
#makedepends=(${makedepends[@]} jansson)
1919

@@ -49,7 +49,7 @@ build() {
4949

5050
package_mediaconch() {
5151
pkgdesc="${pkgdesc} (CLI)"
52-
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.37' 'libmediainfo>=18.03')
52+
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.37' 'libmediainfo>=18.03.1')
5353

5454
cd "${srcdir}"/MediaConch/Project/GNU/CLI
5555
make DESTDIR="${pkgdir}" install-strip
@@ -63,7 +63,7 @@ package_mediaconch() {
6363

6464
package_mediaconch-server() {
6565
pkgdesc="${pkgdesc} (Server)"
66-
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.37' 'libmediainfo>=18.03')
66+
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.37' 'libmediainfo>=18.03.1')
6767
backup=('etc/mediaconch/MediaConch.rc')
6868

6969
cd "${srcdir}"/MediaConch/Project/GNU/Server
@@ -82,7 +82,7 @@ package_mediaconch-server() {
8282

8383
package_mediaconch-gui() {
8484
pkgdesc="${pkgdesc} (GUI)"
85-
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.37' 'libmediainfo>=18.03')
85+
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.37' 'libmediainfo>=18.03.1')
8686

8787
cd "${srcdir}"/MediaConch
8888
install -D -m 0755 Project/Qt/mediaconch-gui "${pkgdir}"/usr/bin/mediaconch-gui

‎Project/GNU/Server/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dnl #########################################################################
55
dnl -------------------------------------------------------------------------
66
dnl Name and version
77
dnl
8-
AC_INIT([mediaconchd], [18.03.0])
8+
AC_INIT([mediaconchd], [18.03.1])
99

1010
dnl -------------------------------------------------------------------------
1111
dnl Test if we are at the good place

‎Project/GNU/mediaconch.dsc

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Format: 3.0 (quilt)
22
Source: mediaconch
33
Binary: mediaconch, mediaconch-dbg, mediaconch-server, mediaconch-server-dbg, mediaconch-gui, mediaconch-gui-dbg
44
Architecture: any
5-
Version: 18.03-1
5+
Version: 18.03.1-1
66
Maintainer: MediaArea.net SARL <[email protected]>
77
Homepage: http://MediaArea.net/MediaConch
88
Standards-Version: 3.9.6
99
Vcs-Git: https://github.com/MediaArea/MediaConch_SourceCode.git
1010
Vcs-Browser: https://github.com/MediaArea/MediaConch_SourceCode
11-
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
11+
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
1212
Package-List:
1313
mediaconch deb utils optional arch=any
1414
mediaconch-server deb utils optional arch=any
@@ -17,11 +17,11 @@ Package-List:
1717
mediaconch-server-dbg debug utils extra arch=any
1818
mediaconch-gui-dbg deb debug extra arch=any
1919
Checksums-Sha1:
20-
0000000000000000000000000000000000000000 000000 mediaconch_18.03.orig.tar.xz
21-
0000000000000000000000000000000000000000 000000 mediaconch_18.03-1.debian.tar.xz
20+
0000000000000000000000000000000000000000 000000 mediaconch_18.03.1.orig.tar.xz
21+
0000000000000000000000000000000000000000 000000 mediaconch_18.03.1-1.debian.tar.xz
2222
Checksums-Sha256:
23-
0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_18.03.orig.tar.xz
24-
0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_18.03-1.debian.tar.xz
23+
0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_18.03.1.orig.tar.xz
24+
0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_18.03.1-1.debian.tar.xz
2525
Files:
26-
00000000000000000000000000000000 000000 mediaconch_18.03.orig.tar.xz
27-
00000000000000000000000000000000 000000 mediaconch_18.03-1.debian.tar.xz
26+
00000000000000000000000000000000 000000 mediaconch_18.03.1.orig.tar.xz
27+
00000000000000000000000000000000 000000 mediaconch_18.03.1-1.debian.tar.xz

‎Project/GNU/mediaconch.spec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
%define mediaconch_version 18.03
2-
%define libmediainfo_version 18.03
1+
%define mediaconch_version 18.03.1
2+
%define libmediainfo_version 18.03.1
33
%define libzen_version 0.4.37
44

55
%if 0%{?fedora_version} || 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600

‎Project/MSVC2013/CLI/MediaConch_CLI.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 18,03,0,0
5-
PRODUCTVERSION 18,03,0,0
4+
FILEVERSION 18,03,1,0
5+
PRODUCTVERSION 18,03,1,0
66
FILEFLAGSMASK 0x3fL
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
22-
VALUE "FileVersion", "18.03.0.0"
22+
VALUE "FileVersion", "18.03.1.0"
2323
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
2424
VALUE "ProductName", "MediaConch"
25-
VALUE "ProductVersion", "18.03.0.0"
25+
VALUE "ProductVersion", "18.03.1.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎Project/MSVC2013/GUI/MediaConch_GUI.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 18,03,0,0
5-
PRODUCTVERSION 18,03,0,0
4+
FILEVERSION 18,03,1,0
5+
PRODUCTVERSION 18,03,1,0
66
FILEFLAGSMASK 0x3fL
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
22-
VALUE "FileVersion", "18.03.0.0"
22+
VALUE "FileVersion", "18.03.1.0"
2323
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
2424
VALUE "ProductName", "MediaConch"
25-
VALUE "ProductVersion", "18.03.0.0"
25+
VALUE "ProductVersion", "18.03.1.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎Project/MSVC2013/Server/MediaConch-Server.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 18,03,0,0
5-
PRODUCTVERSION 18,03,0,0
4+
FILEVERSION 18,03,1,0
5+
PRODUCTVERSION 18,03,1,0
66
FILEFLAGSMASK 0x3fL
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
22-
VALUE "FileVersion", "18.03.0.0"
22+
VALUE "FileVersion", "18.03.1.0"
2323
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
2424
VALUE "ProductName", "MediaConch"
25-
VALUE "ProductVersion", "18.03.0.0"
25+
VALUE "ProductVersion", "18.03.1.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎Project/MSVC2015/CLI/MediaConch_CLI.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 18,03,0,0
5-
PRODUCTVERSION 18,03,0,0
4+
FILEVERSION 18,03,1,0
5+
PRODUCTVERSION 18,03,1,0
66
FILEFLAGSMASK 0x3fL
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
22-
VALUE "FileVersion", "18.03.0.0"
22+
VALUE "FileVersion", "18.03.1.0"
2323
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
2424
VALUE "ProductName", "MediaConch"
25-
VALUE "ProductVersion", "18.03.0.0"
25+
VALUE "ProductVersion", "18.03.1.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎Project/MSVC2015/GUI/MediaConch_GUI.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 18,03,0,0
5-
PRODUCTVERSION 18,03,0,0
4+
FILEVERSION 18,03,1,0
5+
PRODUCTVERSION 18,03,1,0
66
FILEFLAGSMASK 0x3fL
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
22-
VALUE "FileVersion", "18.03.0.0"
22+
VALUE "FileVersion", "18.03.1.0"
2323
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
2424
VALUE "ProductName", "MediaConch"
25-
VALUE "ProductVersion", "18.03.0.0"
25+
VALUE "ProductVersion", "18.03.1.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎Project/MSVC2015/Server/MediaConch-Server.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 18,03,0,0
5-
PRODUCTVERSION 18,03,0,0
4+
FILEVERSION 18,03,1,0
5+
PRODUCTVERSION 18,03,1,0
66
FILEFLAGSMASK 0x3fL
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
22-
VALUE "FileVersion", "18.03.0.0"
22+
VALUE "FileVersion", "18.03.1.0"
2323
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
2424
VALUE "ProductName", "MediaConch"
25-
VALUE "ProductVersion", "18.03.0.0"
25+
VALUE "ProductVersion", "18.03.1.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎Project/MSVC2017/CLI/MediaConch_CLI.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 18,03,0,0
5-
PRODUCTVERSION 18,03,0,0
4+
FILEVERSION 18,03,1,0
5+
PRODUCTVERSION 18,03,1,0
66
FILEFLAGSMASK 0x3fL
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
22-
VALUE "FileVersion", "18.03.0.0"
22+
VALUE "FileVersion", "18.03.1.0"
2323
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
2424
VALUE "ProductName", "MediaConch"
25-
VALUE "ProductVersion", "18.03.0.0"
25+
VALUE "ProductVersion", "18.03.1.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎Project/MSVC2017/GUI/MediaConch_GUI.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 18,03,0,0
5-
PRODUCTVERSION 18,03,0,0
4+
FILEVERSION 18,03,1,0
5+
PRODUCTVERSION 18,03,1,0
66
FILEFLAGSMASK 0x3fL
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
22-
VALUE "FileVersion", "18.03.0.0"
22+
VALUE "FileVersion", "18.03.1.0"
2323
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
2424
VALUE "ProductName", "MediaConch"
25-
VALUE "ProductVersion", "18.03.0.0"
25+
VALUE "ProductVersion", "18.03.1.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎Project/MSVC2017/Server/MediaConch-Server.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 18,03,0,0
5-
PRODUCTVERSION 18,03,0,0
4+
FILEVERSION 18,03,1,0
5+
PRODUCTVERSION 18,03,1,0
66
FILEFLAGSMASK 0x3fL
77
#ifdef _DEBUG
88
FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
1919
BEGIN
2020
VALUE "CompanyName", "MediaArea.net"
2121
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
22-
VALUE "FileVersion", "18.03.0.0"
22+
VALUE "FileVersion", "18.03.1.0"
2323
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
2424
VALUE "ProductName", "MediaConch"
25-
VALUE "ProductVersion", "18.03.0.0"
25+
VALUE "ProductVersion", "18.03.1.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎Project/Mac/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>18.03</string>
22+
<string>18.03.1</string>
2323
<key>CFBundleVersion</key>
24-
<string>18.03</string>
24+
<string>18.03.1</string>
2525
<key>DTCompiler</key>
2626
<string></string>
2727
<key>DTPlatformBuild</key>

‎Project/OBS/deb7.debian/changelog

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mediaconch (18.03-1deb7) unstable; urgency=low
1+
mediaconch (18.03.1-1deb7) unstable; urgency=low
22

33
* See History.txt for more info and real dates
44

0 commit comments

Comments
 (0)