Pull from CVS head: Add logrotate file for /var/log/freeradius/radiusd.log

Pull from CVS head: Save config.sub and config.guess so that repeated builds
	don't get confused by the symlinks

diff --git a/debian/changelog b/debian/changelog
index 8c5ea83..1b81fbd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 freeradius (0.9.2-0~pre0) unstable; urgency=low
 
   * Unreleased 0.9.2 update to 0.9.1
+  * Added logrotate script for /var/log/freeradius/radius.log
+  * Don't leave symlinks to config.{guess,sub} lying around to
+    confuse dpkg-source.
 
- -- Paul Hampson <Paul.Hampson@anu.edu.au>  Sat,  6 Sep 2003 04:53:17 +1000
+ -- Paul Hampson <Paul.Hampson@anu.edu.au>  Mon, 13 Oct 2003 22:31:42 +1000
 
 freeradius (0.9.1-0) unstable; urgency=low
 

diff --git a/debian/freeradius.logrotate b/debian/freeradius.logrotate
new file mode 100644 (file)
index 0000000..e0924ff
--- /dev/null
+++ b/debian/freeradius.logrotate
@@ -0,0 +1,6 @@
+/var/log/freeradius/*.log {
+       weekly
+       rotate 52
+       compress
+       notifempty
+}

diff --git a/debian/rules b/debian/rules
index 2589440..e6e3525 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -118,6 +118,7 @@ binary-arch: stamp-build
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        dh_strip
 endif
+       dh_installlogrotate
        # We don't need ldconfig. None of our libraries go in it's paths
        dh_makeshlibs -n
        dh_shlibdeps
@@ -134,6 +135,9 @@ clean:
        [ -f Make.inc ] && make distclean || true
        dh_clean
        rm -rf $(freeradius_dir) $(debiandir)/$(package)-{ldap,postgresql,mysql,krb5}{,.substvars}
+       [ -f config.sub.dist ] && rm config.sub && mv config.sub.dist config.sub || true
+       [ -f config.guess.dist ] && rm config.guess && mv config.guess.dist config.guess || true
+
 
 binary: binary-indep binary-arch
 
@@ -141,7 +145,8 @@ binary: binary-indep binary-arch
 # autotools-dev (for /usr/share/misc/config.*)
 # It's also a .PHONY make target.
 autotools:
-       -rm -f config.sub config.guess
+       if [ -e config.sub.dist ]; then rm config.sub; else mv config.sub config.sub.dist; fi
+       if [ -e config.guess.dist ]; then rm config.guess; else mv config.guess config.guess.dist; fi
        ln -s /usr/share/misc/config.sub config.sub
        ln -s /usr/share/misc/config.guess config.guess