Merge lp:~marcustomlinson/unity-scopes-api/fix-changelog into lp:unity-scopes-api

[Marcus Tomlinson]

Fix version number in changelog.

[lp:~marcustomlinson/unity-scopes-api/fix-changelog]

366. By Marcus Tomlinson on 2016-04-11

Clean up RELEASE_NOTES.md

367. By Marcus Tomlinson on 2016-04-11

Removed "Fixed incorrect library soname for vivid."

[Paweł Stołowski (stolowski)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:366
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/653/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-xenial-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-xenial-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-xenial-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-xenial-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/653/rebuild

review: Approve (continuous-integration)

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2015-08-25 23:38:15 +0000
+++ RELEASE_NOTES.md	2016-04-11 07:59:08 +0000
@@ -1,6 +1,46 @@
 Release notes
 =============
 
+Changes in version 1.0.5
+========================
+  - Simplify debian/control munging.
+  - Look for clang-format as opposed to clang-format-3.x.
+  - Added missing initializations to TypedScopeFixture (Bug #1542906).
+  - Allow clients to specify authentication parameters (Bug #1554040).
+  - Fixed incorrect generation of Replaces: and Conflicts: entries in debian/control for xenial.
+
+Changes in version 1.0.4
+========================
+  - New RangeInputFilter.
+  - Changed ABI compliance testing to use abigail.
+
+Changes in version 1.0.3
+========================
+  - No-change rebuild for zeromq3 transition.
+
+Changes in version 1.0.2
+========================
+  - Changed version number generation to use a common script.
+  - Removed symbols files because we are now using abi-compliance-checker.
+  - Replaced global dummy loggers for testing with heap-allocated instances to avoid crash due to
+    global destructor ordering (LP: #1472755).
+  - Store scopes package version in /var/lib/.../version file for fast retrieval from the shell
+    plugin.
+  - Loop through each argument of the custom scope runner command and ensure that all path
+    arguments are absolute.
+  - Protect all JsonCppNode::get_node() methods with a "if (!root_) throw;" check (Bug #1494796).
+
+Changes in version 1.0.1
+========================
+  - Consolidate debian packaging for Vivid and Wily, so we don't need to keep to separate series
+    for the gcc 5 ABI break.
+  - Add docs for the table widget
+  - Added support for preview widget updates via ActivationResponse.
+
+Changes in version 1.0.0
+========================
+  - Changed package name and soname for toolchain update to gcc 5.0.
+
 Changes in version 0.6.20
 =========================
   - Support preview widget updates via ActivationResponse.

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-02 03:24:17 +0000
+++ debian/changelog	2016-04-11 07:59:08 +0000
@@ -1,3 +1,9 @@
+unity-scopes-api (1.0.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Fix version number in changelog.
+
+ -- Marcus Tomlinson <[e-mail]>  Mon, 11 Apr 2016 09:19:34 +0200
+
 unity-scopes-api (1.0.4+16.04.20160402.4-0ubuntu1) xenial; urgency=medium
 
   [ Marcus Tomlinson ]
@@ -8,7 +14,7 @@
 
   [ Michi Henning ]
   * Fixed incorrect generation of Replaces: and Conflicts: entries in
-    debian/control for xenial. Fixed incorrect library soname for vivid.
+    debian/control for xenial.
 
  -- Marcus Tomlinson <[e-mail]>  Sat, 02 Apr 2016 03:24:17 +0000