[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6671 - in gnuradio/branches/releases/3.1: . config de
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r6671 - in gnuradio/branches/releases/3.1: . config debian |
|
Date: |
Mon, 22 Oct 2007 12:15:10 -0600 (MDT) |
Author: jcorgan
Date: 2007-10-22 12:15:09 -0600 (Mon, 22 Oct 2007)
New Revision: 6671
Added:
gnuradio/branches/releases/3.1/config/gr_subversion.m4
gnuradio/branches/releases/3.1/debian/changelog
gnuradio/branches/releases/3.1/debian/changelog.in
Removed:
gnuradio/branches/releases/3.1/debian/changelog
Modified:
gnuradio/branches/releases/3.1/config/Makefile.am
gnuradio/branches/releases/3.1/configure.ac
gnuradio/branches/releases/3.1/debian/build-all.sh
gnuradio/branches/releases/3.1/debian/build-bin.sh
gnuradio/branches/releases/3.1/debian/build-src.sh
gnuradio/branches/releases/3.1/debian/control
Log:
Applied changeset r6660 and r6670 on trunk to release branch, but needs slight
cleanup.
Modified: gnuradio/branches/releases/3.1/config/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/config/Makefile.am 2007-10-22 17:44:26 UTC
(rev 6670)
+++ gnuradio/branches/releases/3.1/config/Makefile.am 2007-10-22 18:15:09 UTC
(rev 6671)
@@ -65,6 +65,7 @@
gr_require_mc4020.m4 \
gr_scripting.m4 \
gr_set_md_cpu.m4 \
+ gr_subversion.m4 \
gr_swig.m4 \
gr_sysv_shm.m4 \
gr_x86_64.m4 \
Copied: gnuradio/branches/releases/3.1/config/gr_subversion.m4 (from rev 6660,
gnuradio/trunk/config/gr_subversion.m4)
===================================================================
--- gnuradio/branches/releases/3.1/config/gr_subversion.m4
(rev 0)
+++ gnuradio/branches/releases/3.1/config/gr_subversion.m4 2007-10-22
18:15:09 UTC (rev 6671)
@@ -0,0 +1,36 @@
+dnl
+dnl Copyright 2007 Free Software Foundation, Inc.
+dnl
+dnl This file is part of GNU Radio
+dnl
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING. If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+dnl
+
+# GR_SUBVERSION()
+#
+# Test for presence of subversion, and create variables for
+# current repository version and last changed date.
+
+AC_DEFUN([GR_SUBVERSION],[
+ AC_CHECK_PROG([SVN],[svn],[`which svn`])
+ if ! test -z $SVN ; then
+ SVNVERSION=`$SVN info . | grep '^Revision' | cut -f 2- -d ' '`
+ SVNDATE=`$SVN info . | grep 'Last Changed Date' | cut -f 4-6 -d ' '`
+ fi
+
+ AC_SUBST([SVNVERSION],[$SVNVERSION])
+ AC_SUBST([SVNDATE],[$SVNDATE])
+])
Modified: gnuradio/branches/releases/3.1/configure.ac
===================================================================
--- gnuradio/branches/releases/3.1/configure.ac 2007-10-22 17:44:26 UTC (rev
6670)
+++ gnuradio/branches/releases/3.1/configure.ac 2007-10-22 18:15:09 UTC (rev
6671)
@@ -186,6 +186,9 @@
dnl defines BOOST_CFLAGS
GR_REQUIRE_BOOST_INCLUDES
+# If this is being done from a subversion tree, create variables
+GR_SUBVERSION
+
dnl Component specific configuration
dnl The order of the GR_ macros determines the order of compilation
AC_ARG_ENABLE(
Modified: gnuradio/branches/releases/3.1/debian/build-all.sh
===================================================================
--- gnuradio/branches/releases/3.1/debian/build-all.sh 2007-10-22 17:44:26 UTC
(rev 6670)
+++ gnuradio/branches/releases/3.1/debian/build-all.sh 2007-10-22 18:15:09 UTC
(rev 6671)
@@ -3,10 +3,5 @@
cd ..
svn-buildpackage \
--svn-ignore-new \
- -uc \
- -us \
-rfakeroot
-cd ../build-area
-dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
-
Modified: gnuradio/branches/releases/3.1/debian/build-bin.sh
===================================================================
--- gnuradio/branches/releases/3.1/debian/build-bin.sh 2007-10-22 17:44:26 UTC
(rev 6670)
+++ gnuradio/branches/releases/3.1/debian/build-bin.sh 2007-10-22 18:15:09 UTC
(rev 6671)
@@ -6,8 +6,6 @@
--svn-dont-clean \
--svn-dont-purge \
--svn-reuse \
- -uc \
- -us \
-nc \
-rfakeroot
Modified: gnuradio/branches/releases/3.1/debian/build-src.sh
===================================================================
--- gnuradio/branches/releases/3.1/debian/build-src.sh 2007-10-22 17:44:26 UTC
(rev 6670)
+++ gnuradio/branches/releases/3.1/debian/build-src.sh 2007-10-22 18:15:09 UTC
(rev 6671)
@@ -4,8 +4,6 @@
svn-buildpackage \
--svn-ignore-new \
-S \
- -uc \
- -us \
-rfakeroot
Deleted: gnuradio/branches/releases/3.1/debian/changelog
Copied: gnuradio/branches/releases/3.1/debian/changelog (from rev 6670,
gnuradio/trunk/debian/changelog)
===================================================================
--- gnuradio/branches/releases/3.1/debian/changelog
(rev 0)
+++ gnuradio/branches/releases/3.1/debian/changelog 2007-10-22 18:15:09 UTC
(rev 6671)
@@ -0,0 +1,84 @@
+gnuradio (3.1.svn) unstable; urgency=low
+
+ * post release 3.1 trunk repository packages
+
+ -- Johnathan Corgan <address@hidden> Mon, 22 Oct 2007 10:37:00 -0800
+
+gnuradio (3.0.svn) unstable; urgency=low
+
+ * add/split packages to cover entire GNU Radio distribution
+ * fix build failure with gcc-4.3 by adding a #include, closes: #420896
+ * update copyright assertion on the debian/ contents, since I have
+ assigned my copyright to the FSF and now have upstream commit rights
+ * merge debian/ into upstream SVN repository
+ * add --disable-gr-qtgui (at least until we figure out qwt build deps!)
+ * add build dep on python-numpy
+ * conditionalize configure and clean targets to handle build from SVN
+
+ -- Bdale Garbee <address@hidden> Thu, 26 Jul 2007 18:07:52 -0600
+
+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 <address@hidden> 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
+ this would be a silly bug to release etch with if we can avoid it.
+
+ -- Bdale Garbee <address@hidden> Mon, 4 Dec 2006 15:35:53 -0700
+
+gnuradio (3.0.2-1) unstable; urgency=high
+
+ * new upstream version, fixes FTBFS issues
+
+ -- Bdale Garbee <address@hidden> Sun, 12 Nov 2006 14:52:33 -0800
+
+gnuradio (3.0-3) unstable; urgency=high
+
+ * put python-all-dev back in the build-depends list, closes: #398246
+ * move gr-wxgui conflicts/depends to python-gnuradio, closes: #396302
+ * fix up sections in control to match overrides
+
+ -- Bdale Garbee <address@hidden> Sun, 12 Nov 2006 10:59:58 -0800
+
+gnuradio (3.0-2) unstable; urgency=high
+
+ * reworked package dependencies so that the 'gnuradio' binary package no
+ longer depends on the pieces in contrib. instead, the 'usrp' binary
+ package in contrib now depends on all the USRP-related pieces. A user
+ who doesn't have a USRP board can just install 'gnuradio' and get all
+ the relevant pieces, a USRP user needs to install both 'gnuradio' and
+ 'usrp'. Closes: #394533
+ * improve consistency of references to 'GNU Radio' as upstream project name
+ * make the gnuradio package dependencies on python-gnuradio and python-usrp
+ be version specific on suggestion from Ramakrishnan Muthukrishnan
+
+ -- Bdale Garbee <address@hidden> Fri, 10 Nov 2006 00:39:38 -0800
+
+gnuradio (3.0-1) unstable; urgency=low
+
+ * new maintainer, new upstream version
+ * Restructuring source and binary packages to follow upstream changes, more
+ or less repackaging from scratch taking ideas from the previous packaging
+ by Ramakrishnan Muthukrishnan and Steinar H. Gunderson. This single
+ source package replaces all of:
+ gnuradio-core
+ gnuradio-examples
+ gr-audio-alsa
+ gr-audio-jack
+ gr-audio-oss
+ gr-usrp
+ gr-wxgui
+ usrp
+ In addition, the 'gnuradio' binary package is a new meta-package that
+ conveniently depends on everything gnuradio related to ease installation.
+
+ -- Bdale Garbee <address@hidden> Sun, 8 Oct 2006 13:28:21 -0600
+
Copied: gnuradio/branches/releases/3.1/debian/changelog.in (from rev 6660,
gnuradio/trunk/debian/changelog.in)
===================================================================
--- gnuradio/branches/releases/3.1/debian/changelog.in
(rev 0)
+++ gnuradio/branches/releases/3.1/debian/changelog.in 2007-10-22 18:15:09 UTC
(rev 6671)
@@ -0,0 +1,84 @@
+gnuradio (address@hidden@) unstable; urgency=low
+
+ * post release 3.1 trunk repository packages
+
+ -- Johnathan Corgan <address@hidden> @SVNDATE@
+
+gnuradio (3.0.svn) unstable; urgency=low
+
+ * add/split packages to cover entire GNU Radio distribution
+ * fix build failure with gcc-4.3 by adding a #include, closes: #420896
+ * update copyright assertion on the debian/ contents, since I have
+ assigned my copyright to the FSF and now have upstream commit rights
+ * merge debian/ into upstream SVN repository
+ * add --disable-gr-qtgui (at least until we figure out qwt build deps!)
+ * add build dep on python-numpy
+ * conditionalize configure and clean targets to handle build from SVN
+
+ -- Bdale Garbee <address@hidden> Thu, 26 Jul 2007 18:07:52 -0600
+
+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 <address@hidden> 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
+ this would be a silly bug to release etch with if we can avoid it.
+
+ -- Bdale Garbee <address@hidden> Mon, 4 Dec 2006 15:35:53 -0700
+
+gnuradio (3.0.2-1) unstable; urgency=high
+
+ * new upstream version, fixes FTBFS issues
+
+ -- Bdale Garbee <address@hidden> Sun, 12 Nov 2006 14:52:33 -0800
+
+gnuradio (3.0-3) unstable; urgency=high
+
+ * put python-all-dev back in the build-depends list, closes: #398246
+ * move gr-wxgui conflicts/depends to python-gnuradio, closes: #396302
+ * fix up sections in control to match overrides
+
+ -- Bdale Garbee <address@hidden> Sun, 12 Nov 2006 10:59:58 -0800
+
+gnuradio (3.0-2) unstable; urgency=high
+
+ * reworked package dependencies so that the 'gnuradio' binary package no
+ longer depends on the pieces in contrib. instead, the 'usrp' binary
+ package in contrib now depends on all the USRP-related pieces. A user
+ who doesn't have a USRP board can just install 'gnuradio' and get all
+ the relevant pieces, a USRP user needs to install both 'gnuradio' and
+ 'usrp'. Closes: #394533
+ * improve consistency of references to 'GNU Radio' as upstream project name
+ * make the gnuradio package dependencies on python-gnuradio and python-usrp
+ be version specific on suggestion from Ramakrishnan Muthukrishnan
+
+ -- Bdale Garbee <address@hidden> Fri, 10 Nov 2006 00:39:38 -0800
+
+gnuradio (3.0-1) unstable; urgency=low
+
+ * new maintainer, new upstream version
+ * Restructuring source and binary packages to follow upstream changes, more
+ or less repackaging from scratch taking ideas from the previous packaging
+ by Ramakrishnan Muthukrishnan and Steinar H. Gunderson. This single
+ source package replaces all of:
+ gnuradio-core
+ gnuradio-examples
+ gr-audio-alsa
+ gr-audio-jack
+ gr-audio-oss
+ gr-usrp
+ gr-wxgui
+ usrp
+ In addition, the 'gnuradio' binary package is a new meta-package that
+ conveniently depends on everything gnuradio related to ease installation.
+
+ -- Bdale Garbee <address@hidden> Sun, 8 Oct 2006 13:28:21 -0600
+
Modified: gnuradio/branches/releases/3.1/debian/control
===================================================================
--- gnuradio/branches/releases/3.1/debian/control 2007-10-22 17:44:26 UTC
(rev 6670)
+++ gnuradio/branches/releases/3.1/debian/control 2007-10-22 18:15:09 UTC
(rev 6671)
@@ -1,7 +1,7 @@
Source: gnuradio
Section: comm
Priority: optional
-Maintainer: Bdale Garbee <address@hidden>
+Maintainer: Johnathan Corgan <address@hidden>
Build-Conflicts: automake1.8, automake1.9
Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, doxygen, fftw3-dev |
libfftw3-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-numpy, python-wxgtk2.6, sdcc,
swig, xmlto
Standards-Version: 3.7.2
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6671 - in gnuradio/branches/releases/3.1: . config debian,
jcorgan <=