[hamradio-commits] [soapybladerf] 01/08: New upstream version 0.3.3

[Andreas E. Bombe]

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

aeb pushed a commit to branch master
in repository soapybladerf.

commit 303792fb448870e04de4414e08e73ca055aedbdb
Author: Andreas Bombe <aeb at debian.org>
Date:   Sun Aug 6 14:54:55 2017 -0400

    New upstream version 0.3.3
---
 Changelog.txt                             |  6 ++++++
 bladeRF_Registation.cpp                   | 19 +++++++++++--------
 debian/changelog                          |  6 ++++++
 debian/control                            | 18 ++++++++++++------
 debian/rules                              |  4 ----
 debian/soapysdr0.6-module-bladerf.install |  1 +
 6 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index b63384c..f3b8980 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,9 @@
+Release 0.3.3 (2017-04-29)
+==========================
+
+- Added label convention to bladerf discovery routine
+- Update debian files for SoapySDR module ABI format
+
 Release 0.3.2 (2016-05-20)
 ==========================
 
diff --git a/bladeRF_Registation.cpp b/bladeRF_Registation.cpp
index 598d230..9d62857 100644
--- a/bladeRF_Registation.cpp
+++ b/bladeRF_Registation.cpp
@@ -2,7 +2,7 @@
  * This file is part of the bladeRF project:
  *   http://www.github.com/nuand/bladeRF
  *
- * Copyright (C) 2015-2016 Josh Blum
+ * Copyright (C) 2015-2017 Josh Blum
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,16 +31,19 @@ static SoapySDR::Kwargs devinfo_to_kwargs(const bladerf_devinfo &info)
     SoapySDR::Kwargs args;
 
     args["backend"] = bladerf_backend_str(info.backend);
+    args["serial"] = std::string(info.serial);
 
-    char deviceStr[100];
-    sprintf(deviceStr, "0x%02X:0x%02X", int(info.usb_bus), int(info.usb_addr));
-    args["device"] = deviceStr;
+    char buff[100];
+    int r = std::sprintf(buff, "0x%02X:0x%02X", int(info.usb_bus), int(info.usb_addr));
+    if (r > 0) args["device"] = std::string(buff, r);
 
-    char instanceStr[100];
-    sprintf(instanceStr, "%u", info.instance);
-    args["instance"] = instanceStr;
+    r = std::sprintf(buff, "%u", info.instance);
+    if (r > 0) args["instance"] = std::string(buff, r);
+
+    std::string shortSerial(std::string(info.serial));
+    shortSerial.replace(8, 16, "..");
+    args["label"] = "BladeRF #" + args["instance"] + " [" + shortSerial + "]";
 
-    args["serial"] = std::string(info.serial);
     return args;
 }
 
diff --git a/debian/changelog b/debian/changelog
index 17b4c6c..d4b573e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+soapybladerf (0.3.3-1) unstable; urgency=low
+
+  * Release 0.3.3 (2017-04-29)
+
+ -- Josh Blum <josh at pothosware.com>  Sat, 29 Apr 2017 15:10:52 -0000
+
 soapybladerf (0.3.2) unstable; urgency=low
 
   * Release 0.3.2 (2016-05-20)
diff --git a/debian/control b/debian/control
index 2eaf775..5f8a51e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,17 +7,23 @@ Build-Depends:
     cmake,
     libbladerf-dev,
     libsoapysdr-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 Homepage: https://github.com/pothosware/SoapyBladeRF/wiki
 Vcs-Git: https://github.com/pothosware/SoapyBladeRF.git
 Vcs-Browser: https://github.com/pothosware/SoapyBladeRF
 
-Package: soapysdr-bladerf
-Section: libs
+Package: soapysdr0.6-module-bladerf
 Architecture: any
-Conflicts: soapyosmo-bladerf
-Replaces: soapyosmo-bladerf
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Soapy BladeRF - BladeRF device support for Soapy SDR.
  A Soapy module that supports BladeRF devices within the Soapy API.
+
+Package: soapysdr-module-bladerf
+Architecture: all
+Depends: soapysdr0.6-module-bladerf, ${misc:Depends}
+Description: Soapy BladeRF - BladeRF device support for Soapy SDR.
+ A Soapy module that supports BladeRF devices within the Soapy API.
+ .
+ This is an empty dependency package that pulls in the BladeRF module
+ for the default version of libsoapysdr.
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index f7d5e49..6eb429c
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,6 @@ export DEB_HOST_MULTIARCH
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-
 %:
 	dh $@ --buildsystem=cmake --parallel
 
diff --git a/debian/soapysdr0.6-module-bladerf.install b/debian/soapysdr0.6-module-bladerf.install
new file mode 100644
index 0000000..f1d0181
--- /dev/null
+++ b/debian/soapysdr0.6-module-bladerf.install
@@ -0,0 +1 @@
+usr/lib/*

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