debian: moving to non-US, to keep postgresql.

diff --git a/debian/changelog b/debian/changelog
index 40edffb..fdc9b1d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 radiusd-freeradius (0.1-2) unstable; urgency=low
 
-  * Corrected spelling mistake of Kerberos configure setting.
+  * Moved package to non-US to allow in Kerberos and PostgreSQL.
   * Set Suggests of modules to main package.
 
  -- Chad Miller <cmiller@debian.org>  [TBA]

diff --git a/debian/control b/debian/control
index b58cf83..e63eb11 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,16 @@
 Source: radiusd-freeradius
-Build-Depends: debhelper, libltdl0-dev, libpam0g-dev, postgresql-dev, libmysqlclient6-dev, libgdbmg1-dev, libldap2-dev, libsasl-dev, libsnmp4.2-dev, libiodbc2-dev
-Section: net
+Build-Depends: debhelper, 
+       libltdl0-dev, 
+       libpam0g-dev, 
+       postgresql-dev, 
+       libmysqlclient6-dev, 
+       libgdbmg1-dev, 
+       libldap2-dev, 
+       libsasl-dev, 
+       libsnmp4.2-dev, 
+       libiodbc2-dev, 
+       libkrb5-dev
+Section: non-US/main/net
 Priority: optional
 Maintainer: Chad Miller <cmiller@debian.org>
 Standards-Version: 3.2.1
@@ -9,18 +19,28 @@ Package: radiusd-freeradius
 Architecture: any
 Depends: ${shlibs:Depends}
 Provides: radiusd
-Suggests: radiusd-freeradius-ldap, radiusd-freeradius-postgresql, radiusd-freeradius-mysql
+Suggests: radiusd-freeradius-ldap, 
+       radiusd-freeradius-postgresql, 
+       radiusd-freeradius-mysql,
+       radiusd-freeradius-krb5
 Conflicts: radiusd, radiusd-livingston, radiusd-cistron
 Description: A high-performance and highly configurable RADIUS server
  A high-performance RADIUS server derived from Cistron's server, and
  generally similar to Livingston's 2.0 server, with support for...
   - many vendor-specific attributes
   - proxying and replicating requests by any criteria
-  - authentication on system passwd, SQL, LDAP, users file, or PAM
+  - authentication on system passwd, SQL, Kerberos, LDAP, users file, or PAM
   - multiple DEFAULT configurations
   - regexp matching in string attributes
  and lots more.
 
+Package: radiusd-freeradius-krb5
+Architecture: any
+Depends: radiusd-freeradius, ${shlibs:Depends}
+Description: Kerberos module for FreeRADIUS server.
+ The FreeRADIUS server can use Kerberos to authenticate users, and this module
+ is necessary for that.
+
 Package: radiusd-freeradius-ldap
 Architecture: any
 Depends: radiusd-freeradius, ${shlibs:Depends}

diff --git a/debian/rules b/debian/rules
index a72f9ef..f011893 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ build:
 # Builds the binary package.
        dh_testdir
        # dh_testroot
-       ./configure --prefix=$(prefix) --exec-prefix=$(exec_prefix) --libdir=$(libdir) --mandir=$(mandir) --with-logdir=$(logdir) --with-thread-pool --enable-ltdl-install=no --enable-strict-dependencies --without-rlm_krb5
+       ./configure --prefix=$(prefix) --exec-prefix=$(exec_prefix) --libdir=$(libdir) --mandir=$(mandir) --with-logdir=$(logdir) --with-thread-pool --enable-ltdl-install=no --enable-strict-dependencies
        make
        touch build
 
@@ -38,7 +38,7 @@ binary-arch: build
        rmdir $(tmp)/$(execprefix)/include
        rm $(tmp)/$(execprefix)/usr/sbin/rc.radiusd
        # split out inconvenient/controversal modules to other places
-       for modname in ldap mysql postgresql; do \
+       for modname in krb5 ldap mysql postgresql; do \
                mkdir -p $(debiandir)/radiusd-freeradius-$$modname/$(libdir); \
                mv $(tmp)/$(libdir)/rlm*_$${modname}.* $(debiandir)/radiusd-freeradius-$$modname/$(libdir)/; \
        done
@@ -78,7 +78,7 @@ clean:
        rm -f build debian/{files,substvars} debian/*.debhelper
        [ -f Make.inc ] && make distclean || true
        dh_clean
-       rm -rf $(tmp) radiusd-freeradius-{ldap,postgresql,mysql}{,.substvars}
+       rm -rf $(tmp) radiusd-freeradius-{ldap,postgresql,mysql,krb5}{,.substvars}
 
 binary: binary-indep binary-arch