From: aland <aland>
Date: Fri, 11 Jan 2008 11:03:19 +0000 (+0000)
Subject: 	Update for 2.0.1-pre
X-Git-Tag: release_2_0_1~21
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=fb9afaf00764c465f8c6dc1c03eb0d50d196a2bd

	Update for 2.0.1-pre

	You can now do "make dist-check", which does some sanity
	check on the build files
---

diff --git a/Makefile b/Makefile
index 6aee904..e0f9d67 100644
--- a/Makefile
+++ b/Makefile
@@ -143,11 +143,26 @@ freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig: freeradius-server-$(RADIUSD_VE
 	gpg --default-key aland@freeradius.org -b $<
 
 # high-level targets
-dist: freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.bz2
+.PHONY: dist-check
+dist-check: redhat/freeradius.spec suse/freeradius.spec debian/changelog
+	@if [ `grep ^Version: redhat/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION)" ]; then \
+		echo redhat/freeradius.spec 'Version' needs to be updated; \
+		exit 1; \
+	fi
+	@if [ `grep ^Version: suse/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION)" ]; then \
+		echo suse/freeradius.spec 'Version' needs to be updated; \
+		exit 1; \
+	fi
+	@if [ `head -n 1 debian/changelog | sed 's/.*(//;s/-0).*//;s/-1).*//;'`  != "$(RADIUSD_VERSION)" ]; then \
+		echo debian/changelog needs to be updated; \
+		exit 1; \
+	fi
+
+dist: dist-check freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.bz2
 
 dist-sign: freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig
 
-publish: freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2 freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig
+dist-publish: freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2 freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig
 	scp $^ freeradius.org@freeradius.org:public_ftp
 
 #
diff --git a/debian/changelog b/debian/changelog
index eb1634a..8b514cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+freeradius (2.0.1-pre-0) unstable; urgency=low
+  * Minor fixes over 2.0.0
+
+ -- Alan DeKok <aland@freeradius.org>  Fri, 11 Jan 2008 11:19:08 +0100
+
 freeradius (2.0.0-0) unstable; urgency=low
 
   * New upstream release.
diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 12e8deb..ab96921 100644
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable RADIUS server
 URL: http://www.freeradius.org/
 Name: freeradius
-Version: 2.0.0
+Version: 2.0.1-pre
 Release: 0
 License: GPL
 Group: Networking/Daemons
diff --git a/suse/freeradius.spec b/suse/freeradius.spec
index 54a9602..e0b1c19 100644
--- a/suse/freeradius.spec
+++ b/suse/freeradius.spec
@@ -3,7 +3,7 @@ License:      GPL, LGPL
 Group:        Productivity/Networking/Radius/Servers
 Provides:     radiusd
 Conflicts:    freeradius
-Version:      2.0.0
+Version:      2.0.1-pre
 Release:      0
 URL:          http://www.freeradius.org/
 Summary:      The world's most popular RADIUS Server