[Commit-gnuradio] r11080 - in gnuradio/trunk: debian usrp2/firmware

[jcorgan]

Author: jcorgan
Date: 2009-05-20 18:28:53 -0600 (Wed, 20 May 2009)
New Revision: 11080

Modified:
   gnuradio/trunk/debian/build-bin.sh
   gnuradio/trunk/debian/changelog
   gnuradio/trunk/debian/control
   gnuradio/trunk/debian/rules
   gnuradio/trunk/usrp2/firmware/configure.gnu
Log:
Tweaks for svn-buildpackage

Modified: gnuradio/trunk/debian/build-bin.sh
===================================================================
--- gnuradio/trunk/debian/build-bin.sh  2009-05-20 22:00:36 UTC (rev 11079)
+++ gnuradio/trunk/debian/build-bin.sh  2009-05-21 00:28:53 UTC (rev 11080)
@@ -8,5 +8,3 @@
     --svn-reuse \
     -nc \
     -rfakeroot
-
-

Modified: gnuradio/trunk/debian/changelog
===================================================================
--- gnuradio/trunk/debian/changelog     2009-05-20 22:00:36 UTC (rev 11079)
+++ gnuradio/trunk/debian/changelog     2009-05-21 00:28:53 UTC (rev 11080)
@@ -3,7 +3,7 @@
   * post release 3.2 trunk repository packages
   * see http://gnuradio.org/trac/wiki for stable branch
 
- -- Johnathan Corgan <address@hidden>  Mon,  4 May 2009 18:00:00 -0800
+ -- Johnathan Corgan <address@hidden>  Wed,  20 May 2009 18:00:00 -0800
 
 gnuradio (3.0.svn) unstable; urgency=low
 

Modified: gnuradio/trunk/debian/control
===================================================================
--- gnuradio/trunk/debian/control       2009-05-20 22:00:36 UTC (rev 11079)
+++ gnuradio/trunk/debian/control       2009-05-21 00:28:53 UTC (rev 11080)
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Johnathan Corgan <address@hidden>
 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
 

Modified: gnuradio/trunk/debian/rules
===================================================================
--- gnuradio/trunk/debian/rules 2009-05-20 22:00:36 UTC (rev 11079)
+++ gnuradio/trunk/debian/rules 2009-05-21 00:28:53 UTC (rev 11080)
@@ -51,7 +51,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 
-       $(MAKE) -j
+       $(MAKE)
        $(MAKE) check
        touch $@
 
@@ -107,8 +107,7 @@
        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

Modified: gnuradio/trunk/usrp2/firmware/configure.gnu
===================================================================
--- gnuradio/trunk/usrp2/firmware/configure.gnu 2009-05-20 22:00:36 UTC (rev 
11079)
+++ gnuradio/trunk/usrp2/firmware/configure.gnu 2009-05-21 00:28:53 UTC (rev 
11080)
@@ -21,6 +21,7 @@
       (RANLIB=*)   ;;
       (STRIP=*)    ;;
       (F77=*)      ;;
+      (FFLAGS=*)   ;;
       (CFLAGS=*)   ;;
       (CXXFLAGS=*) ;;
       (CPPFLAGS=*) ;;