Merge pull request #700 from g-maxime/qctools-v1.2

dericed · web-flow · commit 8d179533263c · 2020-12-18T11:35:18.000-05:00
Preparing v1.2
diff --git a/History.txt b/History.txt
@@ -1,4 +1,4 @@
-1.2,
+1.2, 2020-12-18
 === Thanks to TIB – Leibniz Information Centre for Science and Technology for their vision and support on this release ===
 + Adds panel tracks which show timeline-based images that depict audio or video tracks (PR #651). Initial tracks supported are:
   | - Tiled Center Column
diff --git a/License.html b/License.html
@@ -13,7 +13,7 @@
             Copyright ©: 2018-2020, <a href="mailto:dave@dericed.com">RiceCapades</a> &amp; <a href="mailto:Info@MediaArea.net">MediaArea.net SARL</a>. All Rights Reserved.
         </p>
         <p>
-            Version 1.1
+            Version 1.2
         </p>
         <p>
             QCTools is licensed under a GPLv3 License.
diff --git a/Project/GNU/GUI/qctools.desktop b/Project/GNU/GUI/qctools.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=1.1
+Version=1.2
 Name=QCTools
 GenericName=QCTools
 Comment=QCTools
diff --git a/Project/GNU/PKGBUILD b/Project/GNU/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: MediaArea.net SARL <info@mediaarea.net>
 
 pkgname=qctools
-pkgver=1.1
+pkgver=1.2
 pkgrel=1
 pkgdesc="QCTools (Quality Control Tools for Video Preservation)"
 url="http://mediaarea.net"
diff --git a/Project/GNU/qctools.dsc b/Project/GNU/qctools.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: qctools
 Binary: qctools, qctools-dbg
 Architecture: any
-Version: 1.1
+Version: 1.2
 Maintainer: MediaArea.net SARL <info@mediaarea.net>
 Homepage: http://www.bavc.org/qctools
 Standards-Version: 3.7.3
@@ -11,8 +11,8 @@ Package-List:
  qctools deb utils optional arch=any
  qctools-dbg deb debug optional arch=any
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 qctools_1.1.tar.gz
+ 0000000000000000000000000000000000000000 000000 qctools_1.2.tar.gz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 qctools_1.1.tar.gz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 qctools_1.2.tar.gz
 Files:
- 00000000000000000000000000000000 000000 qctools_1.1.tar.gz
+ 00000000000000000000000000000000 000000 qctools_1.2.tar.gz
diff --git a/Project/GNU/qctools.spec b/Project/GNU/qctools.spec
@@ -1,4 +1,4 @@
-%define qctools_version           1.1
+%define qctools_version           1.2
 
 Name:           qctools
 Version:        %{qctools_version}
diff --git a/Project/MSVC2013/GUI/QCTools.rc b/Project/MSVC2013/GUI/QCTools.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 1,0,0,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "QCTools"
-            VALUE "FileVersion", "1.0.0.0"
+            VALUE "FileVersion", "1.2.0.0"
             VALUE "InternalName", "QCTools - GUI - MSVC 2017"
             VALUE "LegalCopyright", "BAVC.org"
             VALUE "OriginalFilename", "QCTools.exe"
             VALUE "ProductName", "QCTools"
-            VALUE "ProductVersion", "1.0.0.0"
+            VALUE "ProductVersion", "1.2.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Project/MSVC2015/GUI/QCTools.rc b/Project/MSVC2015/GUI/QCTools.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "QCTools"
-            VALUE "FileVersion", "1.1.0.0"
+            VALUE "FileVersion", "1.2.0.0"
             VALUE "InternalName", "QCTools - GUI - MSVC 2017"
             VALUE "LegalCopyright", "BAVC.org"
             VALUE "OriginalFilename", "QCTools.exe"
             VALUE "ProductName", "QCTools"
-            VALUE "ProductVersion", "1.1.0.0"
+            VALUE "ProductVersion", "1.2.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Project/Mac/mkdmg b/Project/Mac/mkdmg
@@ -10,7 +10,7 @@ VERSION="$2"
 FILES="$3"
 
 APPNAME="QCTools"
-VERSION="1.1"
+VERSION="1.2"
 SIGNATURE="MediaArea.net"
 
 DMG="tmp-${APPNAME}.dmg"
diff --git a/Project/version.txt b/Project/version.txt
@@ -1 +1 @@
-1.1
+1.2
diff --git a/Source/Core/Core.cpp b/Source/Core/Core.cpp
@@ -11,7 +11,7 @@
 #include <string.h>
 
 //---------------------------------------------------------------------------
-const char* Version="1.1.0";
+const char* Version="1.2.0";
 
 //---------------------------------------------------------------------------
 const struct stream_info PerStreamType    [Type_Max] =
diff --git a/Source/Install/QCTools.nsi b/Source/Install/QCTools.nsi
@@ -5,7 +5,7 @@ RequestExecutionLevel admin
 ; Some defines
 !define PRODUCT_NAME "QCTools"
 !define PRODUCT_PUBLISHER "MediaArea.net"
-!define PRODUCT_VERSION "1.1.0"
+!define PRODUCT_VERSION "1.2.0"
 !define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0"
 !define PRODUCT_WEB_SITE "http://www.bavc.org/qctools"
 !define COMPANY_REGISTRY "Software\MediaArea.net"
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,6 @@
-qctools (1.1.0) stable; urgency=low
+qctools (1.2.0) stable; urgency=low
 
   * See History.txt for more info and real dates
 
- -- MediaArea.net SARL <info@mediaarea.net>  Thu, 5 Mar 2020 08:00:00 +0000
+ -- MediaArea.net SARL <info@mediaarea.net>  Fri, 18 Dec 2020 08:00:00 +0000
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-1.2,`
	`1`	`+1.2, 2020-12-18`
`2`	`2`	`=== Thanks to TIB – Leibniz Information Centre for Science and Technology for their vision and support on this release ===`
`3`	`3`	`+ Adds panel tracks which show timeline-based images that depict audio or video tracks (PR #651). Initial tracks supported are:`
`4`	`4`	`\| - Tiled Center Column`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define qctools_version 1.1`
	`1`	`+%define qctools_version 1.2`
`2`	`2`
`3`	`3`	`Name: qctools`
`4`	`4`	`Version: %{qctools_version}`