Rolling version 1.4

Changelog

@@ -1,3 +1,10 @@
+1.4
+Released: 11/08/19
+[email protected]
+- Update Windows installer script to include libbz2
+- Add Harmony 665 and 950 to remote_info struct
+- Update README.md to document new X-Frame-Options workaround
+
 1.3
 Released: 06/08/18
 [email protected]

concordance/concordance.c

@@ -89,7 +89,7 @@ int set_canon(int flag)
 #define DEFAULT_FW_FILENAME_BIN "firmware.bin"
 #define DEFAULT_SAFE_FILENAME "safe.bin"
 
-const char * const VERSION = "1.3";
+const char * const VERSION = "1.4";
 
 struct options_t {
     int binary;

concordance/configure.ac

@@ -1,11 +1,11 @@
-AC_INIT([concordance], [1.3], [[email protected]])
+AC_INIT([concordance], [1.4], [[email protected]])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AM_PROG_CC_C_O
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LIBTOOL
 AC_PROG_CXX
 AC_CANONICAL_HOST
-LIBCONCORD_VERSION="4"
+LIBCONCORD_VERSION="5"
 case $host_os in
   darwin*)
     LIBCONCORD_LDFLAGS="-lconcord.$LIBCONCORD_VERSION"

concordance/win/concordance.nsi

@@ -43,7 +43,7 @@ Section "Concordance"
   File "$%LIBZIP_LIB_PATH%/libzip-5.dll"
   File "$%ZLIB_LIB_PATH%/zlib1.dll"
   File "$%HIDAPI_LIB_PATH%/libhidapi-0.dll"
-  File "../../libconcord/.libs/libconcord-4.dll"
+  File "../../libconcord/.libs/libconcord-5.dll"
   File "../.libs/concordance.exe"
   File "$%MINGW_SYSROOT_DEVLIB%/libwinpthread-1.dll"
   File "$%MINGW_SYSROOT_BIN%/libbz2-1.dll"

libconcord/Makefile.am

@@ -7,7 +7,7 @@ libconcord_la_SOURCES = remote.cpp remote_z.cpp libconcord.cpp binaryfile.cpp \
 	operationfile.cpp remote_mh.cpp libusbhid.cpp libhidapi.cpp
 include_HEADERS = libconcord.h
 libconcord_la_CPPFLAGS = -Wall
-libconcord_la_LDFLAGS = -version-info 4:0:0 $(LIBCONCORD_LDFLAGS) -lzip
+libconcord_la_LDFLAGS = -version-info 5:0:0 $(LIBCONCORD_LDFLAGS) -lzip
 libconcord_la_CXXFLAGS = $(ZIP_CFLAGS)
 UDEVROOT ?= /
 UDEVLIBDIR ?= $(UDEVROOT)/lib

libconcord/bindings/python/libconcord.py

@@ -32,7 +32,7 @@
 # Define the libconcord ABI this libconcord.py corresponds to
 # Bump this when the .so file version gets bumped
 
-ABI_VERSION = 4
+ABI_VERSION = 5
 
 # Load the DLL
 

libconcord/bindings/python/setup.py

@@ -21,7 +21,7 @@
 
 setup(
     name='libconcord',
-    version='1.3',
+    version='1.4',
     py_modules=['libconcord'],
 )
 

libconcord/configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libconcord], [1.3], [[email protected]])
+AC_INIT([libconcord], [1.4], [[email protected]])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_MACRO_DIR([m4])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])