From 3dfdb4be27138fa1b85e6d33b40fd0dd2cdb3a4e Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sun, 11 Mar 2007 23:55:32 -0600 Subject: [PATCH] Imported Debian patch 3.0.3-1 --- debian/changelog | 10 ++++++++++ debian/control | 12 ++++++++++-- debian/gnuradio-doc.dirs | 1 - debian/gnuradio-doc.install | 4 ++-- debian/usrp-doc.install | 2 ++ usrp/doc/Makefile.am | 2 +- usrp/doc/Makefile.in | 2 +- 7 files changed, 26 insertions(+), 7 deletions(-) delete mode 100644 debian/gnuradio-doc.dirs create mode 100644 debian/usrp-doc.install diff --git a/debian/changelog b/debian/changelog index 5c9ba74a..ca781ab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gnuradio (3.0.3-1) unstable; urgency=low + + * new upstream version + * tweak gnuradio-doc package to eliminate spurious subdirectory level + * add a usrp-doc binary package, recommended by the usrp package, and + include xmlto in build dependencies so usrp_guide.html gets generated, + closes: #407368 + + -- Bdale Garbee Sun, 11 Mar 2007 23:55:32 -0600 + gnuradio (3.0.2-2) unstable; urgency=high * add run-time dependency on python-wxgtk2.6. leaving urgency high since diff --git a/debian/control b/debian/control index 76082378..187645ac 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: comm Priority: optional Maintainer: Bdale Garbee Build-Conflicts: automake1.8, automake1.9 -Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, doxygen, fftw3-dev, libasound2-dev, libboost-dev, libcppunit-dev, libjack0.100.0-dev, libsdl1.2-dev, portaudio19-dev, libtool, libusb-dev, pkg-config, python, python-all-dev, python-central (>= 0.5), python-numeric, python-wxgtk2.6, sdcc, swig +Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, doxygen, fftw3-dev, libasound2-dev, libboost-dev, libcppunit-dev, libjack0.100.0-dev, libsdl1.2-dev, portaudio19-dev, libtool, libusb-dev, pkg-config, python, python-all-dev, python-central (>= 0.5), python-numeric, python-wxgtk2.6, sdcc, swig, xmlto Build-Depends-Indep: python-all-dev Standards-Version: 3.7.2 XS-Python-Version: >= 2.3 @@ -67,7 +67,7 @@ Package: usrp Section: contrib/comm Architecture: any Depends: ${shlibs:Depends}, python, libusrp0-dev, libusrp0c2a-dbg, python-usrp (= ${Source-Version}) -Recommends: gnuradio, hotplug, usrp-firmware +Recommends: gnuradio, hotplug, usrp-doc, usrp-firmware XB-Python-Version: ${python:Versions} Description: control applications and firmware for the USRP The Universal Software Radio Peripheral (USRP) is an USB-connected, @@ -85,6 +85,14 @@ Description: control applications and firmware for the USRP so that installing this package will pull in all the pieces you might want or need to successfully use the USRP with GNU Radio. +Package: usrp-doc +Section: doc +Architecture: all +Depends: ${shlibs:Depends} +Description: Software Defined Radio with USRP + This package contains the documentation for the USRP support that is + part of the GNU Radio software defined radio system. + Package: usrp-firmware Section: contrib/comm Architecture: all diff --git a/debian/gnuradio-doc.dirs b/debian/gnuradio-doc.dirs deleted file mode 100644 index 89b0e6f5..00000000 --- a/debian/gnuradio-doc.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/gnuradio-doc/html diff --git a/debian/gnuradio-doc.install b/debian/gnuradio-doc.install index 32d9c699..08f1e5de 100644 --- a/debian/gnuradio-doc.install +++ b/debian/gnuradio-doc.install @@ -1,2 +1,2 @@ -usr/share/doc/gnuradio*/html usr/share/doc/gnuradio-doc/html -usr/share/doc/gnuradio*/README /usr/share/doc/gnuradio-doc/README +usr/share/doc/gnuradio*/html usr/share/doc/gnuradio-doc +usr/share/doc/gnuradio*/README /usr/share/doc/gnuradio-doc diff --git a/debian/usrp-doc.install b/debian/usrp-doc.install new file mode 100644 index 00000000..9a2cb477 --- /dev/null +++ b/debian/usrp-doc.install @@ -0,0 +1,2 @@ +usr/share/doc/gnuradio*/usrp/html usr/share/doc/usrp-doc +usr/share/doc/gnuradio*/usrp/README /usr/share/doc/usrp-doc diff --git a/usrp/doc/Makefile.am b/usrp/doc/Makefile.am index 85f02f32..978d4a09 100644 --- a/usrp/doc/Makefile.am +++ b/usrp/doc/Makefile.am @@ -25,7 +25,7 @@ include $(top_srcdir)/Makefile.common SUBDIRS = other man3dir = $(mandir)/man3 -docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@ +docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@/usrp EXTRA_DIST = \ Doxyfile.in \ diff --git a/usrp/doc/Makefile.in b/usrp/doc/Makefile.in index 8e8c8b37..21192b41 100644 --- a/usrp/doc/Makefile.in +++ b/usrp/doc/Makefile.in @@ -307,7 +307,7 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ datarootdir = @datarootdir@ -docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@ +docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@/usrp dvidir = @dvidir@ enable_dot = @enable_dot@ enable_html_docs = @enable_html_docs@ -- 2.30.2