From 4e977bf4440d8c83dbff1e60480268042a8d6eea Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 14 Aug 2007 22:38:32 -0600 Subject: [PATCH] Imported Debian patch 3.0.4-1 --- config.guess | 8 ++++---- config.sub | 12 ++++-------- debian/changelog | 7 +++++++ debian/copyright | 4 ---- gnuradio-core/src/lib/runtime/gr_dispatcher.cc | 1 + 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config.guess b/config.guess index 02ef1910..0f0fe712 100755 --- a/config.guess +++ b/config.guess @@ -4,11 +4,11 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-07-22' +timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -793,7 +793,7 @@ EOF exit ;; *:Interix*:[3456]*) case ${UNAME_MACHINE} in - x86) + x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; EM64T | authenticamd) diff --git a/config.sub b/config.sub index 97a7b086..5defff65 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-06-28' +timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -12,7 +12,7 @@ timestamp='2007-06-28' # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -475,8 +475,8 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) - basic_machine=cr16-unknown + cr16c) + basic_machine=cr16c-unknown os=-elf ;; crds | unos) @@ -683,10 +683,6 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) basic_machine=m68000-convergent ;; diff --git a/debian/changelog b/debian/changelog index ca781ab7..783d4710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnuradio (3.0.4-1) unstable; urgency=low + + * new upstream version + * fix build failure with gcc-4.3 by adding a #include, closes: #420896 + + -- Bdale Garbee Tue, 14 Aug 2007 22:38:32 -0600 + gnuradio (3.0.3-1) unstable; urgency=low * new upstream version diff --git a/debian/copyright b/debian/copyright index e5ec0043..677c8827 100644 --- a/debian/copyright +++ b/debian/copyright @@ -20,7 +20,3 @@ under the GNU General Public License (GPL), a copy of which is available on a Debian system at: /usr/share/common-licenses/GPL - -The Debian packaging is (C) 2006, Bdale Garbee and -is also licensed under the GPL. - diff --git a/gnuradio-core/src/lib/runtime/gr_dispatcher.cc b/gnuradio-core/src/lib/runtime/gr_dispatcher.cc index 1b0a1d7a..e165361f 100644 --- a/gnuradio-core/src/lib/runtime/gr_dispatcher.cc +++ b/gnuradio-core/src/lib/runtime/gr_dispatcher.cc @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef HAVE_SELECT # ifdef HAVE_SYS_SELECT_H -- 2.30.2