Fix version string to use '+' instead of '-'

Change-Id: I8d520299f2f69aa56000ecc9696728affa204512
Add revision string in deb package

Change-Id: I73c93e97c9fd1d8be3d7945305e7d6e7ce0b4d63
Merge changes from topic 'pkg'

* changes:
  Add revision string in deb package
  Fix version string to use '+' instead of '-'