From: Stephen R. van den Berg <srb@cuci.nl>
Date: Sat, 9 Jul 2011 10:38:32 +0000 (+0200)
Subject: Update debian packaging for v3
X-Git-Tag: release_3_0_0_beta0~712
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41cfb60055af69b82854a9fd3430a48d77be9b30;p=thirdparty%2Ffreeradius-server.git

Update debian packaging for v3
---

diff --git a/debian/control b/debian/control
index 8c8ed39ca47..dc3ccbc7a96 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Homepage: http://www.freeradius.org/
 
 Package: freeradius
 Architecture: any
-Depends: lsb-base (>= 3.1-23.2), ${shlibs:Depends}, freeradius-common, libfreeradius2 (= ${binary:Version}), ssl-cert, adduser
+Depends: lsb-base (>= 3.1-23.2), ${shlibs:Depends}, freeradius-common, libfreeradius3 (= ${binary:Version}), ssl-cert, adduser
 Provides: radius-server
 Recommends: freeradius-utils
 Suggests: freeradius-ldap, freeradius-postgresql, freeradius-mysql, freeradius-krb5
@@ -54,7 +54,7 @@ Package: freeradius-utils
 Architecture: any
 Replaces: freeradius (<< 2.0)
 Conflicts: radiusd-livingston, yardradius
-Depends: ${shlibs:Depends}, freeradius-common, libfreeradius2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, freeradius-common, libfreeradius3 (= ${binary:Version})
 Recommends: libdbi-perl
 Description: FreeRADIUS client utilities
  This package contains various client programs and utilities from
@@ -72,7 +72,7 @@ Description: FreeRADIUS client utilities
   - rlm_ippool_tool
   - smbencrypt
 
-Package: libfreeradius2
+Package: libfreeradius3
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: FreeRADIUS shared library
@@ -82,7 +82,7 @@ Description: FreeRADIUS shared library
 Package: libfreeradius-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, libfreeradius2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libfreeradius3 (= ${binary:Version})
 Description: FreeRADIUS shared library development files
  The FreeRADIUS projects' libfreeradius-radius and libfreeradius-eap, used by
  the FreeRADIUS server and some of the utilities.
diff --git a/debian/freeradius-utils.install b/debian/freeradius-utils.install
index 9bc0d62ccd7..ba915038f55 100644
--- a/debian/freeradius-utils.install
+++ b/debian/freeradius-utils.install
@@ -1,6 +1,5 @@
 usr/bin/rlm_dbm_cat
 usr/bin/rlm_dbm_parser
-usr/bin/radeapclient
 usr/bin/rlm_ippool_tool
 usr/bin/smbencrypt
 usr/bin/radclient
diff --git a/debian/rules b/debian/rules
index 10b7b75378f..8c25de47f5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,14 +152,14 @@ install-arch: build-arch-stamp
 	dh_testroot
 	dh_installdirs -s
 	test -d $(freeradius_dir)/usr/lib/freeradius || mkdir -p $(freeradius_dir)/usr/lib/freeradius
-	ln -s rlm_sql.so $(freeradius_dir)/usr/lib/freeradius/librlm_sql.so
+	ln -fs rlm_sql.so $(freeradius_dir)/usr/lib/freeradius/librlm_sql.so
 	$(MAKE) install R=$(freeradius_dir)
 	
 	# rename radius binary to play nicely with others
 	mv $(freeradius_dir)/usr/sbin/radiusd $(freeradius_dir)/usr/sbin/$(package)
 	mv $(freeradius_dir)/$(mandir)/man8/radiusd.8 $(freeradius_dir)/$(mandir)/man8/$(package).8
 	
-	dh_install --sourcedir=$(freeradius_dir) -p libfreeradius2
+	dh_install --sourcedir=$(freeradius_dir) -p libfreeradius3
 	dh_install --sourcedir=$(freeradius_dir) -p libfreeradius-dev
 
 	for mod in ${modulelist}; do \