From 954dad66dea3c5bb1e59187987e77c18f7b593ec Mon Sep 17 00:00:00 2001
From: Antonin Descampe <antonin@gmail.com>
Date: Tue, 21 Jun 2016 16:46:38 +0200
Subject: [PATCH] Automatic upload of ABI report (ctd)

---
 tools/abi-tracker/openjpeg.json | 14 +-------------
 tools/travis-ci/abi-check.sh    |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/tools/abi-tracker/openjpeg.json b/tools/abi-tracker/openjpeg.json
index 2cfa4438..7d817605 100644
--- a/tools/abi-tracker/openjpeg.json
+++ b/tools/abi-tracker/openjpeg.json
@@ -51,7 +51,7 @@
     "Source":         "src/openjpeg/2.0/version.2.0.tar.gz",
     "Changelog":      "NEWS",
     "HeadersDiff":    "On",
-    "PkgDiff":        "On",
+    "PkgDiff":        "Off",
     "ABIView":        "Off",
     "ABIDiff":        "Off",
     "PublicSymbols":  "public_symbols/openjpeg/2.0/list",
@@ -105,18 +105,6 @@
     "PublicSymbols":  "public_symbols/openjpeg/1.4/list",
     "PublicTypes":    "public_types/openjpeg/1.4/list"
   },
-  {
-    "Number":         "1.3",
-    "Installed":      "installed/openjpeg/1.3",
-    "Source":         "src/openjpeg/1.3/version.1.3.tar.gz",
-    "Changelog":      "ChangeLog",
-    "HeadersDiff":    "On",
-    "PkgDiff":        "Off",
-    "ABIView":        "Off",
-    "ABIDiff":        "Off",
-    "PublicSymbols":  "public_symbols/openjpeg/1.3/list",
-    "PublicTypes":    "public_types/openjpeg/1.3/list"
-  },
   {
     "Number":         "1.2",
     "Installed":      "installed/openjpeg/1.2",
diff --git a/tools/travis-ci/abi-check.sh b/tools/travis-ci/abi-check.sh
index 5bab1250..1c4311eb 100755
--- a/tools/travis-ci/abi-check.sh
+++ b/tools/travis-ci/abi-check.sh
@@ -105,7 +105,7 @@ if [ ${OPJ_UPLOAD_ABI_REPORT} -eq 1 ]; then
 	git commit -m "Update ABI/API compatibility reports after commit ${TRAVIS_COMMIT:-}"
 
 	# Get the deploy key by using Travis's stored variables to decrypt travis_rsa.enc
-	openssl aes-256-cbc -K $encrypted_99d63218f67a_key -iv $encrypted_99d63218f67a_iv -in travis_rsa.enc -out travis_rsa -d
+	openssl aes-256-cbc -K $encrypted_99d63218f67a_key -iv $encrypted_99d63218f67a_iv -in ${OPJ_SOURCE_DIR}/tools/travis-ci/travis_rsa.enc -out travis_rsa -d
 	chmod 600 travis_rsa
 	eval `ssh-agent -s`
 	ssh-add travis_rsa