Pull from CVS head: Build-dependancies due to new libtool 1.5

Pull from CVS head: Merge sed statements into single sed statement
Pull from CVS head: Renamed binary manpage to match freeradius binary
Pull from CVS head: Install SQL database examples into examples directory

diff --git a/debian/changelog b/debian/changelog
index 32ae4a1..792e43c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 freeradius (0.9.1~pre0-0) unstable; urgency=low
 
   * Unreleased 0.9.1 update to 0.9.0
+  * Renamed radiusd(8) to freeradius(8) to match binary
+  * Build-Depend on libtool1.4 | libtool (< 1.5) due to
+    new libtool 1.5 package.
+  * Merged multiple sed calls into a single sed call in debian/rules
+  * Installed SQL database examples into /usr/share/doc/freeradius/examples
 
- -- Paul Hampson <Paul.Hampson@anu.edu.au>  Thu, 24 Jul 2003 01:07:29 +1000
+ -- Paul Hampson <Paul.Hampson@anu.edu.au>  Tue, 26 Aug 2003 03:59:10 +1000
 
 freeradius (0.9.0-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index a601c6c..a9883a4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: freeradius
-Build-Depends: debhelper (>= 3.4.4), libltdl3-dev, libpam0g-dev, postgresql-dev, libmysqlclient10-dev | libmysqlclient-dev, libgdbm-dev | libgdbmg1-dev, libldap2-dev, libsasl2-dev, libsnmp4.2-dev, libiodbc2-dev, libkrb5-dev, libssl-dev, libtool, snmp, autoconf2.13, autotools-dev
+Build-Depends: debhelper (>= 3.4.4), libltdl3-dev, libpam0g-dev, postgresql-dev, libmysqlclient10-dev | libmysqlclient-dev, libgdbm-dev | libgdbmg1-dev, libldap2-dev, libsasl2-dev, libsnmp4.2-dev, libiodbc2-dev, libkrb5-dev, libssl-dev, libtool1.4 | libtool (< 1.5), snmp, autoconf2.13, autotools-dev
 Section: net
 Priority: optional
 Maintainer: Chad Miller <cmiller@debian.org>

diff --git a/debian/rules b/debian/rules
index b543392..2525be1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -92,8 +92,10 @@ binary-arch: stamp-build
        # man pages & docs
        install -g root -m 644 CREDITS $(freeradius_dir)/$(pkgdocdir)/credits
        dh_installdocs -XChangeLog -X00-OLD -XCVS -XMakefile doc/*
-       dh_installdocs `find src/modules/rlm_sql/drivers -type f -name \*.sql`
+       dh_installexamples `find src/modules/rlm_sql/drivers -type f -name \*.sql`
        dh_installchangelogs doc/ChangeLog
+       #Rename manpage to go with binary
+       mv $(freeradius_dir)/$(mandir)/man8/radiusd.8 $(freeradius_dir)/$(mandir)/man8/$(package).8
 
        # SNMP mibs
        install -g root -m 644 mibs/*.txt $(freeradius_dir)/usr/share/snmp/mibs
@@ -104,12 +106,12 @@ binary-arch: stamp-build
        cp $(freeradius_dir)/$(raddbdir)/radiusd.conf $$TEMPFILE; \
        cat $$TEMPFILE \
                | sed -e 's/        /   /g' \
-               | sed -e '/^    example {/,/^   }/s/^/#/' \
-               | sed -e 's/#   shadow = /shadow = /' \
-               | sed -e 's/^#\?group = nobody/group = freerad/' \
-               | sed -e 's/^#\?user = nobody/user = freerad/' \
-               | sed -e 's!/run/radiusd!/run/freeradius!' \
-               | sed -e 's!radiusd.pid!freeradius.pid!' \
+                       -e '/^  example {/,/^   }/s/^/#/' \
+                       -e 's/# shadow = /shadow = /' \
+                       -e 's/^#\?group = nobody/group = freerad/' \
+                       -e 's/^#\?user = nobody/user = freerad/' \
+                       -e 's!/run/radiusd!/run/freeradius!' \
+                       -e 's!radiusd.pid!freeradius.pid!' \
                        > $(freeradius_dir)/$(raddbdir)/radiusd.conf; \
        rm $$TEMPFILE