浏览代码

Merge pull request #3100 from Pro/merge_10

Merge 1.0
Julius Pfrommer 5 年之前
父节点
当前提交
6ad780da53
共有 3 个文件被更改,包括 7 次插入3 次删除
  1. 2 2
      debian/changelog
  2. 1 0
      debian/rules-template
  3. 4 1
      tools/prepare_packaging.py

+ 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

+ 1 - 0
debian/rules-template

@@ -2,6 +2,7 @@
 
 export DH_VERBOSE = 1
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 export DEB_BUILD_OPTIONS=parallel=4
 
 override_dh_auto_configure:

+ 4 - 1
tools/prepare_packaging.py

@@ -38,12 +38,15 @@ changelog_file = os.path.join(debian_path, "changelog")
 
 # remove leading 'v'
 changelog_version = git_describe_version[1:] if git_describe_version[0] == 'v' else git_describe_version
+# replace all '-' with '~' in version
+changelog_version = changelog_version.replace('-', '~')
 
 with open(changelog_file, 'r') as original: data = original.read()
 with open(changelog_file, 'w') as modified:
     new_entry = """open62541 ({version}) {distribution}; urgency=medium
 
-  * Full changelog is available here: https://github.com/open62541/open62541/blob/master/CHANGELOG
+  * Full changelog is available here: 
+    https://github.com/open62541/open62541/blob/master/CHANGELOG
 
  -- open62541 Team <open62541-core@googlegroups.com>  {time}
 """.format(version=changelog_version, time=formatdate(), distribution = debian_distribution)