build a spanning set of packages

2 files changed, 56 insertions, 12 deletions

diff --git a/debian/control b/debian/control
index c7c8aea..cac8350 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Package: libzephyr3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libzephyr3-krb, libzephyr4-krb5
+Conflicts: libzephyr3-krb, libzephyr3-krb5, libzephyr3-krb45
 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
@@ -21,7 +21,7 @@ Package: libzephyr3-krb
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, krb4-config
-Conflicts: libzephyr3, libzephyr3-krb5
+Conflicts: libzephyr3, libzephyr3-krb5, libzephyr3-krb45
 Provides: libzephyr3
 Description: The original "Instant Message" system libraries with Kerberos 
  This version of the library uses Kerberos for message authentication.
@@ -35,7 +35,7 @@ Package: libzephyr3-krb5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, krb5-config
-Conflicts: libzephyr3, libzephyr3-krb
+Conflicts: libzephyr3, libzephyr3-krb, libzephyr3-krb45
 Provides: libzephyr3
 Description: The original "Instant Message" system libraries with Kerberos 5
  This version of the library uses Kerberos for message authentication.
@@ -45,6 +45,20 @@ Description: The original "Instant Message" system libraries with Kerberos 5
  users.  Users can view incoming Zephyr messages as windowgrams
  (transient X windows) or as text on a terminal.
 
+Package: libzephyr3-krb45
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, krb5-config
+Conflicts: libzephyr3, libzephyr3-krb, libzephyr3-krb5
+Provides: libzephyr3
+Description: The original "Instant Message" system libraries with Kerberos 4+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
@@ -62,7 +76,7 @@ Package: zephyr-server
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0
-Conflicts: zephyr-server-krb, zephyr-server-krb5
+Conflicts: zephyr-server-krb, zephyr-server-krb5, zephyr-server-krb45
 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.
@@ -80,7 +94,7 @@ Package: zephyr-server-krb
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb
-Conflicts: zephyr-server, zephyr-server-krb5
+Conflicts: zephyr-server, zephyr-server-krb5, zephyr-server-krb45
 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.
@@ -99,8 +113,8 @@ Description: The original "Instant Message" system-server with Kerberos
 Package: zephyr-server-krb5
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb
-Conflicts: zephyr-server, zephyr-server-krb
+Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb5
+Conflicts: zephyr-server, zephyr-server-krb, zephyr-server-krb45
 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.
@@ -116,6 +130,26 @@ Description: The original "Instant Message" system-server with Kerberos 5
  users.  Users can view incoming Zephyr messages as windowgrams
  (transient X windows) or as text on a terminal.
 
+Package: zephyr-server-krb45
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb45
+Conflicts: zephyr-server, zephyr-server-krb, zephyr-server-krb5
+Description: The original "Instant Message" system-server with Kerberos 4+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/debian/rules b/debian/rules
index ebfd549..b49dd78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,8 +51,9 @@ configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
 	-mkdir krb5
-	cd krb5 && CFLAGS="-g -Wall" ../configure --with-krb4=/usr --with-krb5=/usr $(CONFIGURE_ROOT)
-	#cd krb5 && CFLAGS="-g -Wall" ../configure --with-krb5=/usr $(CONFIGURE_ROOT)
+	cd krb5 && CFLAGS="-g -Wall" ../configure --with-krb5=/usr $(CONFIGURE_ROOT)
+	-mkdir krb45
+	cd krb45 && 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 no-krb
@@ -65,7 +66,7 @@ build-stamp:
 
 	# Add here commands to compile the package.
 	set -e; \
-	for dir in krb5 krb4 no-krb ; do  \
+	for dir in krb5 krb45 krb4 no-krb ; do  \
 		cd $$dir; \
 	rm -f lib/*.o || true; \
 		$(MAKE) -C lib			\
@@ -85,13 +86,14 @@ clean:
 	-rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-rm -rf krb krb4 krb5 no-krb debian/tmp-krb*
+	-rm -rf krb krb4 krb5 krb45 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 debian/libzephyr3-krb5.files
+	-rm debian/zephyr-server-krb45.*
+	-rm debian/libzephyr3-krb.files debian/libzephyr3-krb5.files debian/libzephyr3-krb45.files
 
 	dh_clean
 
@@ -107,12 +109,14 @@ install: build
 	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
+	cd krb45 &&$(MAKE)  DESTDIR=`pwd`/../debian/tmp-krb45 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 -rp debian/tmp/etc/zephyr/acl debian/tmp-krb4/etc/zephyr
 	cp -rp debian/tmp/etc/zephyr/acl debian/tmp-krb5/etc/zephyr
+	cp -rp debian/tmp/etc/zephyr/acl debian/tmp-krb45/etc/zephyr
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.
@@ -127,21 +131,26 @@ binary-arch: build install
 	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; \
+		cp debian/zephyr-server.$$file debian/zephyr-server-krb45.$$file; \
 		done
 	for file in README.Debian docs init postrm; do \
 		cp debian/zephyr-server-krb.$$file debian/zephyr-server-krb5.$$file; \
+		cp debian/zephyr-server-krb.$$file debian/zephyr-server-krb45.$$file; \
 	done
 	cp debian/libzephyr3.files debian/libzephyr3-krb.files
 	cp debian/libzephyr3.files debian/libzephyr3-krb5.files
+	cp debian/libzephyr3.files debian/libzephyr3-krb45.files
 	dh_movefiles  -plibzephyr3 -pzephyr-clients -pzephyr-server -plibzephyr-dev
 	dh_movefiles --sourcedir=debian/tmp-krb4 -plibzephyr3-krb -pzephyr-server-krb
 	dh_movefiles --sourcedir=debian/tmp-krb5 -plibzephyr3-krb5 -pzephyr-server-krb5
+	dh_movefiles --sourcedir=debian/tmp-krb45 -plibzephyr3-krb45 -pzephyr-server-krb45
 	dh_installdebconf 
 	dh_installdocs
 	dh_installinit -pzephyr-clients --init-script=zhm --no-start
 	dh_installinit -pzephyr-server --init-script=zephyrd
 	dh_installinit -pzephyr-server-krb --init-script=zephyrd
 	dh_installinit -pzephyr-server-krb5 --init-script=zephyrd
+	dh_installinit -pzephyr-server-krb45 --init-script=zephyrd
 	dh_installchangelogs 
 	dh_strip
 	dh_compress
@@ -151,6 +160,7 @@ binary-arch: build install
 	# sigh
 	cp debian/libzephyr3/DEBIAN/shlibs debian/libzephyr3-krb/DEBIAN/shlibs
 	cp debian/libzephyr3/DEBIAN/shlibs debian/libzephyr3-krb5/DEBIAN/shlibs
+	cp debian/libzephyr3/DEBIAN/shlibs debian/libzephyr3-krb45/DEBIAN/shlibs
 	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol