[hamradio-commits] [soapysdr] 03/03: Add DEP3 header to version-string patch

[Andreas E. Bombe]

This is an automated email from the git hooks/post-receive script.

aeb pushed a commit to branch master
in repository soapysdr.

commit 18861e037fcca0d55b488ed7f0d3a0efdd342a8b
Author: Andreas Bombe <aeb at debian.org>
Date:   Sun Aug 14 22:54:09 2016 +0200

    Add DEP3 header to version-string patch
---
 debian/changelog              |  7 +++++++
 debian/patches/version-string | 12 +++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 096cd79..0fcb02e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+soapysdr (0.5.1-1) UNRELEASED; urgency=medium
+
+  * New upstream version 0.5.1
+  * Add DEP3 header to version-string patch
+
+ -- Andreas Bombe <aeb at debian.org>  Sun, 14 Aug 2016 22:23:53 +0200
+
 soapysdr (0.4.3+git20160605-2) unstable; urgency=medium
 
   * Remove symbols file again, too much work for a C++ library for now
diff --git a/debian/patches/version-string b/debian/patches/version-string
index 01978cb..6ca01fe 100644
--- a/debian/patches/version-string
+++ b/debian/patches/version-string
@@ -1,8 +1,18 @@
+Description: Allow overriding version string
+ Add an override option for the version string in CMakeLists.txt. The
+ original tries to combine its own string and EXTVER, so to make this
+ the Debian package version we would have to filter out the version
+ number from the changelog version.
+ .
+ Using the override we can simply pass the whole Debian version in
+ without using complex sed or awk filtering.
+Author: Andreas Bombe <aeb at debian.org>
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -12,18 +12,22 @@
  ########################################################################
- set(SOAPY_SDR_LIBVER "0.5.0")
+ set(SOAPY_SDR_LIBVER "0.5.1")
  
 -if (NOT SOAPY_SDR_EXTVER)
 -    include(${PROJECT_SOURCE_DIR}/cmake/GetGitRevisionDescription.cmake)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/soapysdr.git