[hamradio-commits] [soapyaudio] 02/02: Add and modify debian/ files based on upstream's
Andreas E. Bombe
aeb at moszumanska.debian.org
Thu Aug 25 01:25:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
aeb pushed a commit to branch master
in repository soapyaudio.
commit a109a35885cb4148354c21541769e359f5c80721
Author: Andreas Bombe <aeb at debian.org>
Date: Thu Aug 25 02:56:49 2016 +0200
Add and modify debian/ files based on upstream's
---
.gitignore | 15 +++++-
debian/changelog | 6 +--
debian/control | 44 +++++++++++-----
debian/copyright | 6 +--
debian/patches/series | 1 +
debian/patches/use-system-rtaudio | 67 ++++++++++++++++++++++++
debian/rules | 10 ++--
debian/{docs => soapysdr0.5-2-module-audio.docs} | 0
debian/soapysdr0.5-2-module-audio.install | 1 +
9 files changed, 124 insertions(+), 26 deletions(-)
diff --git a/.gitignore b/.gitignore
index 378eac2..2727561 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,14 @@
-build
+.*.sw[a-p]
+*~
+
+.pc/
+
+debian/.debhelper
+debian/debhelper-build-stamp
+debian/files
+debian/*.debhelper.log
+debian/*.substvars
+
+debian/tmp/
+debian/soapysdr*-module-audio/
+obj-*/
diff --git a/debian/changelog b/debian/changelog
index f7e4023..e64489b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-soapyaudio (0.0.0) unstable; urgency=low
+soapyaudio (0~git20160607-1) unstable; urgency=medium
- * pending
+ * Initial release (Closes: #834381)
- -- Josh Blum <josh at pothosware.com> Sun, 03 Jan 2016 13:18:35 -0800
+ -- Andreas Bombe <aeb at debian.org> Thu, 25 Aug 2016 02:57:38 +0200
diff --git a/debian/control b/debian/control
index 149e883..9f32aea 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,38 @@
Source: soapyaudio
-Section: libs
+Section: hamradio
Priority: optional
-Maintainer: Charles J. Cliffe <cj at cubicproductions.com>
-Uploaders: Josh Blum <josh at pothosware.com>
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Uploaders: Andreas Bombe <aeb at debian.org>
Build-Depends:
- debhelper (>= 9.0.0),
+ debhelper (>= 9),
cmake,
- libhamlib-dev,
- libsoapysdr-dev
-Standards-Version: 3.9.5
+ libsoapysdr-dev,
+ librtaudio-dev,
+ libhamlib-dev
+Standards-Version: 3.9.8
Homepage: https://github.com/pothosware/SoapyAudio/wiki
-Vcs-Git: https://github.com/pothosware/SoapyAudio.git
-Vcs-Browser: https://github.com/pothosware/SoapyAudio
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/soapyaudio.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/soapyaudio.git
-Package: soapysdr-audio
-Section: libs
+Package: soapysdr0.5-2-module-audio
Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Soapy Audio - Audio device support for Soapy SDR.
- A Soapy module that supports Audio devices within the Soapy API.
+Provides: soapysdr0.5-2-module
+Description: Audio device support for SoapySDR
+ The SoapyAudio project provides a SoapySDR module for using Software
+ Defined Radio devices that are connected through audio interfaces.
+ It uses hamlib to provide control of tuning and other functions where
+ available.
+
+Package: soapysdr-module-audio
+Architecture: any
+Depends: soapysdr0.5-2-module-audio, ${misc:Depends}
+Description: Audio device support for SoapySDR (default version)
+ The SoapyAudio project provides a SoapySDR module for using Software
+ Defined Radio devices that are connected through audio interfaces.
+ It uses hamlib to provide control of tuning and other functions where
+ available.
+ .
+ This is an empty dependency package that pulls in the audio module
+ for the default version of libsoapysdr.
diff --git a/debian/copyright b/debian/copyright
index c561c81..3df304e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: soapyaudio
+Upstream-Name: SoapyAudio
Source: https://github.com/pothosware/SoapyAudio/wiki
Files: *
@@ -24,8 +24,8 @@ License: MIT
THE SOFTWARE.
Files: RtAudio/*
-Copyright: Copyright (c) 2001-2014 Gary P. Scavone
-License: The RtAudio license is similar to the MIT License.
+Copyright: Copyright (c) 2001-2016 Gary P. Scavone
+License: other-MIT
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4d78f52
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-system-rtaudio
diff --git a/debian/patches/use-system-rtaudio b/debian/patches/use-system-rtaudio
new file mode 100644
index 0000000..7d5522c
--- /dev/null
+++ b/debian/patches/use-system-rtaudio
@@ -0,0 +1,67 @@
+Description: Use system librtaudio instead of embedded copy
+ Edit the cmake script to use the system installed librtaudio instead of
+ the embedded copy. Additionally sabotage the embedded copy to make
+ sure it doesn't accidentally end up in the build.
+Author: Andreas Bombe <aeb at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,9 @@
+
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(RTAUDIO REQUIRED rtaudio)
++
+ option(USE_HAMLIB OFF "Support hamlib for radio control functions.")
+
+ if (USE_HAMLIB)
+@@ -33,7 +36,7 @@
+ # list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/RtAudio)
++include_directories(${RTAUDIO_INCLUDE_DIRS})
+
+ #enable c++11 features
+ if(CMAKE_COMPILER_IS_GNUCXX)
+@@ -84,7 +87,8 @@
+ ENDIF(USE_AUDIO_DS)
+ ENDIF (WIN32)
+
+-IF (UNIX AND NOT APPLE)
++# disabled audio library checks for embedded RtAudio copy
++IF (0 AND UNIX AND NOT APPLE)
+ SET(USE_AUDIO_PULSE ON CACHE BOOL "Support Pulse Audio")
+ SET(USE_AUDIO_JACK OFF CACHE BOOL "Support Jack Audio")
+ SET(USE_AUDIO_ALSA OFF CACHE BOOL "Support ALSA Audio")
+@@ -123,7 +127,7 @@
+ -D__LINUX_OSS__
+ )
+ ENDIF(USE_AUDIO_OSS)
+-ENDIF(UNIX AND NOT APPLE)
++ENDIF(0 AND UNIX AND NOT APPLE)
+
+ IF (APPLE)
+ ADD_DEFINITIONS(
+@@ -150,9 +154,8 @@
+ Registation.cpp
+ Settings.cpp
+ Streaming.cpp
+- RtAudio/RtAudio.cpp
+- RtAudio/RtAudio.h
+ ${HAMLIB_SOURCES}
+ LIBRARIES
+ ${AUDIO_LIBS}
++ ${RTAUDIO_LIBRARIES}
+ )
+--- a/RtAudio/RtAudio.h
++++ b/RtAudio/RtAudio.h
+@@ -1,3 +1,6 @@
++#error "Embedded copy of RtAudio is not supposed to be used in Debian build"
++
++
+ /************************************************************************/
+ /*! \class RtAudio
+ \brief Realtime audio i/o C++ classes.
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index a904ad9..411c2c2
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,13 @@
#!/usr/bin/make -f
# -*- makefile -*-
+export DEB_BUILT_MAINT_OPTIONS = hardening=+all
+
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-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
@@ -18,3 +15,6 @@ override_dh_auto_configure:
dh_auto_configure -- \
-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
-DUSE_HAMLIB=ON
+
+override_dh_installdocs:
+ dh_installdocs --link-doc=soapysdr0.5-2-module-audio
diff --git a/debian/docs b/debian/soapysdr0.5-2-module-audio.docs
similarity index 100%
rename from debian/docs
rename to debian/soapysdr0.5-2-module-audio.docs
diff --git a/debian/soapysdr0.5-2-module-audio.install b/debian/soapysdr0.5-2-module-audio.install
new file mode 100644
index 0000000..f1d0181
--- /dev/null
+++ b/debian/soapysdr0.5-2-module-audio.install
@@ -0,0 +1 @@
+usr/lib/*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/soapyaudio.git
More information about the pkg-hamradio-commits
mailing list