[hamradio-commits] [soapysdr] 09/11: Fix CMake warning in version-string patch

Andreas E. Bombe aeb at moszumanska.debian.org
Tue Jun 27 01:09:00 UTC 2017


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

aeb pushed a commit to branch master
in repository soapysdr.

commit d216e132a16f2cf137b9411581c7cb2f1fba0f1c
Author: Andreas Bombe <aeb at debian.org>
Date:   Tue Jun 27 02:47:03 2017 +0200

    Fix CMake warning in version-string patch
---
 debian/changelog              | 2 ++
 debian/patches/version-string | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a1d658..3ea2ce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ soapysdr (0.6.0-1) UNRELEASED; urgency=medium
   * Add soapysdr0.6-module-osmosdr dependency to the soapysdr0.6-module-all
     metapackage
   * Bump Standards-Version to 4.0.0, no changes required
+  * Fix CMake warning for mismatched logical block arguments in version-string
+    patch
 
  -- Andreas Bombe <aeb at debian.org>  Tue, 27 Jun 2017 01:15:14 +0200
 
diff --git a/debian/patches/version-string b/debian/patches/version-string
index f811f53..76589f2 100644
--- a/debian/patches/version-string
+++ b/debian/patches/version-string
@@ -38,9 +38,9 @@ Author: Andreas Bombe <aeb at debian.org>
  
 -set(SOAPY_SDR_VERSION "${SOAPY_SDR_LIBVER}-${SOAPY_SDR_EXTVER}")
 +    set(SOAPY_SDR_VERSION "${SOAPY_SDR_LIBVER}-${SOAPY_SDR_EXTVER}")
-+else (OVERRIDE_SOAPY_SDR_VERSION)
++else (NOT OVERRIDE_SOAPY_SDR_VERSION)
 +    set(SOAPY_SDR_VERSION "${OVERRIDE_SOAPY_SDR_VERSION}")
-+endif (OVERRIDE_SOAPY_SDR_VERSION)
++endif (NOT OVERRIDE_SOAPY_SDR_VERSION)
  
  #SOAPY_SDR_ROOT is compiled into the library to locate the install base.
  #By default, the SOAPY_SDR_ROOT is set to the CMAKE_INSTALL_PREFIX.

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



More information about the pkg-hamradio-commits mailing list