summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdebian/build-bin.sh2
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules5
-rwxr-xr-xusrp2/firmware/configure.gnu1
5 files changed, 5 insertions, 7 deletions
diff --git a/debian/build-bin.sh b/debian/build-bin.sh
index 2ffea9e456..3ed4880234 100755
--- a/debian/build-bin.sh
+++ b/debian/build-bin.sh
@@ -8,5 +8,3 @@ svn-buildpackage \
--svn-reuse \
-nc \
-rfakeroot
-
-
diff --git a/debian/changelog b/debian/changelog
index ccc89b9ce4..2daa23763e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ gnuradio (3.2.svn) unstable; urgency=low
* post release 3.2 trunk repository packages
* see http://gnuradio.org/trac/wiki for stable branch
- -- Johnathan Corgan <jcorgan@corganenterprises.com> Mon, 4 May 2009 18:00:00 -0800
+ -- Johnathan Corgan <jcorgan@corganenterprises.com> Wed, 20 May 2009 18:00:00 -0800
gnuradio (3.0.svn) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6b06462888..695b61045f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Section: comm
Priority: optional
Maintainer: Johnathan Corgan <jcorgan@corganenterprises.com>
Build-Conflicts: automake1.8, automake1.9
-Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool, pkg-config, python-dev, swig, fftw3-dev | libfftw3-dev, libcppunit-dev, libboost1.37-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8, python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev, portaudio19-dev, libsdl1.2-dev, python-cheetah, python-lxml, python-gtk2
+Build-Depends: debhelper (>= 5.0.37.2), build-essential, automake, libtool, pkg-config, python-dev, swig, fftw3-dev | libfftw3-dev, libcppunit-dev, libboost1.37-dev, libgsl0-dev, guile-1.8, libasound2-dev, python-wxgtk2.8, python-numpy, doxygen, xmlto, sdcc-nf, libusb-dev, libjack-dev, portaudio19-dev, libsdl1.2-dev, python-cheetah, python-lxml, python-gtk2, libqt4-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev
Standards-Version: 3.7.2
XS-Python-Version: = 2.6
diff --git a/debian/rules b/debian/rules
index 4a477732c3..fe17823551 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ configure-stamp:
build: build-stamp
build-stamp: configure-stamp
- $(MAKE) -j
+ $(MAKE)
$(MAKE) check
touch $@
@@ -107,8 +107,7 @@ binary-common:
dh_shlibdeps
dh_gencontrol
dh_md5sums
- mkdir -p ../debfiles
- dh_builddeb --destdir=../debfiles
+ dh_builddeb
# Build architecture independant packages using the common target.
binary-indep: build install
diff --git a/usrp2/firmware/configure.gnu b/usrp2/firmware/configure.gnu
index 8a04719955..60d6d2a7ec 100755
--- a/usrp2/firmware/configure.gnu
+++ b/usrp2/firmware/configure.gnu
@@ -21,6 +21,7 @@ do
(RANLIB=*) ;;
(STRIP=*) ;;
(F77=*) ;;
+ (FFLAGS=*) ;;
(CFLAGS=*) ;;
(CXXFLAGS=*) ;;
(CPPFLAGS=*) ;;