Browse Source

Merge branch '1.0'

Stefan Profanter 5 years ago
parent
commit
dc78102071
3 changed files with 4 additions and 5 deletions
  1. 1 2
      .travis.yml
  2. 1 1
      CMakeLists.txt
  3. 2 2
      debian/changelog

+ 1 - 2
.travis.yml

@@ -351,8 +351,7 @@ after_failure: |
 
 deploy:
   provider: releases
-  api_key:
-    secure: PKCoA7MBRtHloIbNF4Qj5LQyCafjekfVeFXlMBd9KmC0ynNuef+D7nn38f/jo25/b0Ii7r+hgslkQPezbKyEqo2zcCB8Pn8TWau2hbzKM/dUCPoN90HVaQcRjUi8P2Y+QkouwyPWSujBL35/X5QiAntRotCSbZx4fkyiN8cU95o=
+  api_key: $GITAUTH
   file:
     - open62541-win32.zip
     - open62541-win64.zip

+ 1 - 1
CMakeLists.txt

@@ -35,7 +35,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 0)
 set(OPEN62541_VER_PATCH 0)
-set(OPEN62541_VER_LABEL "-dev") # Appended to the X.Y.Z version format. For example "-rc1" or an empty string
+set(OPEN62541_VER_LABEL "-rc1") # Appended to the X.Y.Z version format. For example "-rc1" or an empty string
 
 # Set OPEN62541_VER_COMMIT
 if(GIT_FOUND)

+ 2 - 2
debian/changelog

@@ -1,5 +1,5 @@
-open62541 (1.0) UNRELEASED; urgency=low
+open62541 (1.0-rc1) UNRELEASED; urgency=low
 
-  * Initial Release.
+  * Release Candidate 1 for 1.0 Version.
 
  -- open62541 Team <open62541-core@googlegroups.com>  Fri, 19 Jul 2019 10:51:28 +0100