From 62cc4591826f6cd5b8e9581ccddd4910eb598bf4 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Sun, 21 Oct 2007 19:56:42 +0000 Subject: [PATCH] Update Debian packaging to reflect repository version, tweaks git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6660 221aa14e-8319-0410-a670-987f0aec2ac5 --- config/Makefile.am | 1 + config/gr_subversion.m4 | 36 ++++++++++++++++++++++++++++++ configure.ac | 4 ++++ debian/build-all.sh | 5 ----- debian/build-bin.sh | 2 -- debian/build-src.sh | 2 -- debian/{changelog => changelog.in} | 6 ++--- debian/control | 2 +- 8 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 config/gr_subversion.m4 rename debian/{changelog => changelog.in} (96%) diff --git a/config/Makefile.am b/config/Makefile.am index be85ce7c..6c5dd28c 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -67,6 +67,7 @@ m4macros = \ 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 \ diff --git a/config/gr_subversion.m4 b/config/gr_subversion.m4 new file mode 100644 index 00000000..44ae49f1 --- /dev/null +++ b/config/gr_subversion.m4 @@ -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]) +]) diff --git a/configure.ac b/configure.ac index e1a6c4df..3207b4bd 100644 --- a/configure.ac +++ b/configure.ac @@ -186,6 +186,9 @@ dnl Define where to find boost includes 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( @@ -229,6 +232,7 @@ AC_CONFIG_FILES([\ Makefile \ run_tests.sh config/Makefile + debian/changelog ]) dnl run_tests.sh is created from run_tests.in.sh. Make it executable. diff --git a/debian/build-all.sh b/debian/build-all.sh index 0b3ec246..dd03b729 100755 --- a/debian/build-all.sh +++ b/debian/build-all.sh @@ -3,10 +3,5 @@ cd .. svn-buildpackage \ --svn-ignore-new \ - -uc \ - -us \ -rfakeroot -cd ../build-area -dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz - diff --git a/debian/build-bin.sh b/debian/build-bin.sh index a6298da4..2ffea9e4 100755 --- a/debian/build-bin.sh +++ b/debian/build-bin.sh @@ -6,8 +6,6 @@ svn-buildpackage \ --svn-dont-clean \ --svn-dont-purge \ --svn-reuse \ - -uc \ - -us \ -nc \ -rfakeroot diff --git a/debian/build-src.sh b/debian/build-src.sh index adad7c22..1a7c9204 100755 --- a/debian/build-src.sh +++ b/debian/build-src.sh @@ -4,8 +4,6 @@ cd .. svn-buildpackage \ --svn-ignore-new \ -S \ - -uc \ - -us \ -rfakeroot diff --git a/debian/changelog b/debian/changelog.in similarity index 96% rename from debian/changelog rename to debian/changelog.in index 853584c5..092f7b72 100644 --- a/debian/changelog +++ b/debian/changelog.in @@ -1,9 +1,9 @@ -gnuradio (3.1.svn) unstable; urgency=low +gnuradio (3.1.svn-r@SVNVERSION@) unstable; urgency=low * post release 3.1 trunk repository packages - -- Bdale Garbee Sat, 13 Oct 2007 14:50:00 -0600 - + -- Johnathan Corgan @SVNDATE@ + gnuradio (3.0.svn) unstable; urgency=low * add/split packages to cover entire GNU Radio distribution diff --git a/debian/control b/debian/control index 14456dab..0e980a44 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: gnuradio Section: comm Priority: optional -Maintainer: Bdale Garbee +Maintainer: Johnathan Corgan 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 -- 2.47.2