build separate krb4 and krb5 packages

git-svn-id: svn://svn.1ts.org/debian/branches/zephyr-reloaded@358 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/debian/control b/zephyr/debian/control
index df8502e3347cd1c40649ff5883b84307a3c5de84..c7c8aeaf26e462f0709f88cf49e55873f585998a 100644 (file)
--- a/zephyr/debian/control
+++ b/zephyr/debian/control
@@ -10,7 +10,7 @@ Package: libzephyr3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libzephyr3-krb
+Conflicts: libzephyr3-krb, libzephyr4-krb5
 Description: The original "Instant Message" system libraries without Kerberos
  This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
  Zephyr allows users to send messages to other users or to groups of
@@ -20,8 +20,8 @@ Description: The original "Instant Message" system libraries without Kerberos
 Package: libzephyr3-krb
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, krb5-config
-Conflicts: libzephyr3
+Depends: ${shlibs:Depends}, krb4-config
+Conflicts: libzephyr3, libzephyr3-krb5
 Provides: libzephyr3
 Description: The original "Instant Message" system libraries with Kerberos 
  This version of the library uses Kerberos for message authentication.
@@ -31,6 +31,20 @@ Description: The original "Instant Message" system libraries with Kerberos
  users.  Users can view incoming Zephyr messages as windowgrams
  (transient X windows) or as text on a terminal.
 
+Package: libzephyr3-krb5
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, krb5-config
+Conflicts: libzephyr3, libzephyr3-krb
+Provides: libzephyr3
+Description: The original "Instant Message" system libraries with Kerberos 5
+ This version of the library uses Kerberos for message authentication.
+ .
+ This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
+ Zephyr allows users to send messages to other users or to groups of
+ users.  Users can view incoming Zephyr messages as windowgrams
+ (transient X windows) or as text on a terminal.
+
 Package: zephyr-clients
 Section: net
 Replaces: zephyr-client
@@ -48,7 +62,7 @@ Package: zephyr-server
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0
-Conflicts: zephyr-server-krb
+Conflicts: zephyr-server-krb, zephyr-server-krb5
 Description: The original "Instant Message" system-server without Kerberos
  You probably only need one server for a group of clients.
  This can be a memory-intensive server, especially for very large sites.
@@ -66,7 +80,7 @@ Package: zephyr-server-krb
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb
-Conflicts: zephyr-server
+Conflicts: zephyr-server, zephyr-server-krb5
 Description: The original "Instant Message" system-server with Kerberos
  You probably only need one server for a group of clients.
  This can be a memory-intensive server, especially for very large sites.
@@ -82,6 +96,26 @@ Description: The original "Instant Message" system-server with Kerberos
  users.  Users can view incoming Zephyr messages as windowgrams
  (transient X windows) or as text on a terminal.
 
+Package: zephyr-server-krb5
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb
+Conflicts: zephyr-server, zephyr-server-krb
+Description: The original "Instant Message" system-server with Kerberos 5
+ You probably only need one server for a group of clients.
+ This can be a memory-intensive server, especially for very large sites.
+ .
+ The server maintains a location and subscription database for all the
+ receiving clients. All zephyrgrams are sent to the server to be routed
+ to the intended recipient.
+ .
+ This version of the server uses Kerberos for message authentication.
+ .
+ This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
+ Zephyr allows users to send messages to other users or to groups of
+ users.  Users can view incoming Zephyr messages as windowgrams
+ (transient X windows) or as text on a terminal.
+
 Package: libzephyr-dev
 Section: libdevel
 Architecture: any

diff --git a/zephyr/debian/rules b/zephyr/debian/rules
index 47f6af068568a7f71e8727b4d3d47ae89aa93d5a..757f3ead306e6837e7f5aa3cd89eba40975bdd4f 100755 (executable)
--- a/zephyr/debian/rules
+++ b/zephyr/debian/rules
@@ -50,10 +50,12 @@ configure: configure-stamp autotools
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
-       -mkdir krb
-       cd krb&& CFLAGS="-g -Wall" ../configure --with-krb4=/usr --with-krb5=/usr $(CONFIGURE_ROOT)
+       -mkdir krb4
+       cd krb4 && CFLAGS="-g -Wall" ../configure --with-krb4=/usr $(CONFIGURE_ROOT)
+       -mkdir krb5
+       cd krb5 && CFLAGS="-g -Wall" ../configure --with-krb4=/usr --with-krb5=/usr $(CONFIGURE_ROOT)
        -mkdir no-krb
-       cd no-krb&& CFLAGS=-g ../configure $(CONFIGURE_ROOT)
+       cd no-krb && CFLAGS="-g -Wall" ../configure $(CONFIGURE_ROOT)
        touch configure-stamp
 
 build: configure-stamp build-stamp
@@ -62,7 +64,7 @@ build-stamp:
 
        # Add here commands to compile the package.
        set -e; \
-       for dir in krb no-krb ; do  \
+       for dir in krb4 krb5 no-krb ; do  \
                cd $$dir; \
        rm -f lib/*.o || true; \
                $(MAKE) -C lib                  \
@@ -82,11 +84,12 @@ clean:
        -rm -f build-stamp configure-stamp
 
        # Add here commands to clean up after the build process.
-       -rm -rf krb no-krb debian/tmp-krb
+       -rm -rf krb krb4 krb5 no-krb debian/tmp-krb*
        -rm debian/zephyr-server-krb.files
        -rm debian/zephyr-server-krb.templates
        -rm debian/zephyr-server-krb.config
        -rm debian/zephyr-server-krb.postinst
+       -rm debian/zephyr-server-krb5.*
        -rm debian/libzephyr3-krb.files
 
        dh_clean
@@ -96,17 +99,19 @@ install: build
        dh_testdir
        dh_testroot
        dh_clean -k
-       -rm -rf debian/tmp-krb
+       -rm -rf debian/tmp-krb*
        dh_installdirs
 
        # Add here commands to install the package into debian/tmp.
-       cd no-krb&&$(MAKE) install DESTDIR=`pwd`/../debian/tmp
-       cd krb&&$(MAKE)  DESTDIR=`pwd`/../debian/tmp-krb install
+       cd no-krb &&$(MAKE) install DESTDIR=`pwd`/../debian/tmp
+       cd krb4 &&$(MAKE)  DESTDIR=`pwd`/../debian/tmp-krb4 install
+       cd krb5 &&$(MAKE)  DESTDIR=`pwd`/../debian/tmp-krb5 install
        mkdir -p debian/tmp/etc/zephyr/acl
        set -x; for i in debian/acl/*; do install -c -m 644 -o root $$i debian/tmp/etc/zephyr/acl; done; set +x
        install -c -m 644 debian/zephyr.vars debian/tmp/etc/zephyr
        install -c -m 644 debian/default.subscriptions debian/tmp/etc/zephyr
-       cp -pr debian/tmp/etc/zephyr/acl debian/tmp-krb/etc/zephyr
+       cp -rp debian/tmp/etc/zephyr/acl debian/tmp-krb4/etc/zephyr
+       cp -rp debian/tmp/etc/zephyr/acl debian/tmp-krb5/etc/zephyr
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.
@@ -118,17 +123,24 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        set -e; \
-       for file  in  files templates config postinst docs; do \
+       for file in files templates config postinst docs; do \
                cp debian/zephyr-server.$$file debian/zephyr-server-krb.$$file; \
+               cp debian/zephyr-server.$$file debian/zephyr-server-krb5.$$file; \
                done
+       for file in README.Debian docs init postrm; do \
+               cp debian/zephyr-server-krb.$$file debian/zephyr-server-krb5.$$file; \
+       done
        cp debian/libzephyr3.files debian/libzephyr3-krb.files
+       cp debian/libzephyr3.files debian/libzephyr3-krb5.files
        dh_movefiles  -plibzephyr3 -pzephyr-clients -pzephyr-server -plibzephyr-dev
-       dh_movefiles --sourcedir=debian/tmp-krb -plibzephyr3-krb -pzephyr-server-krb
+       dh_movefiles --sourcedir=debian/tmp-krb4 -plibzephyr3-krb -pzephyr-server-krb
+       dh_movefiles --sourcedir=debian/tmp-krb5 -plibzephyr3-krb5 -pzephyr-server-krb5
        dh_installdebconf 
        dh_installdocs
        dh_installinit -pzephyr-clients --init-script=zhm --no-start
-       dh_installinit -pzephyr-server-krb --init-script=zephyrd
        dh_installinit -pzephyr-server --init-script=zephyrd
+       dh_installinit -pzephyr-server-krb --init-script=zephyrd
+       dh_installinit -pzephyr-server-krb5 --init-script=zephyrd
        dh_installchangelogs 
        dh_strip
        dh_compress
@@ -137,6 +149,7 @@ binary-arch: build install
        dh_makeshlibs
        # sigh
        cp debian/libzephyr3/DEBIAN/shlibs debian/libzephyr3-krb/DEBIAN/shlibs
+       cp debian/libzephyr3/DEBIAN/shlibs debian/libzephyr3-krb5/DEBIAN/shlibs
        dh_shlibdeps
        dh_installdeb
        dh_gencontrol