Rollback abortive attempts at debconf warnings for new libraries

git-svn-id: svn://svn.1ts.org/debian/trunk@484 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/debian/libzephyr4-krb5.templates b/zephyr/debian/libzephyr4-krb5.templates
deleted file mode 100644 (file)
index cf97f10..0000000
--- a/zephyr/debian/libzephyr4-krb5.templates
+++ /dev/null
@@ -1,15 +0,0 @@
-Template: libzephyr4-krb5/no-more-krb4
-Type: boolean
-Default: true
-Description: Potentially incompatible upgrade
- You appear to be upgrading from a version of zephyr that uses
- Kerberos version 4 to authenticate.  Kerberos version 4 support has
- been removed from Debian, and accordingly from zephyr.  This version
- of zephyr uses Kerberos 5 to authenticate, and thus your servers must
- have been upgraded for it to be useful.
- .
- A server that authenticates both ways can be built for lenny from the
- zephyr source package, see:
-   /usr/share/doc/libzephyr4-krb5/README.krb4-5
- .
- Continue with the upgrade?

diff --git a/zephyr/debian/rules b/zephyr/debian/rules
index 69580319f4d1e7624603d6f1ae0daa6272635413..1c1feef944f19cdbbbddb1cbb742b1248b5cfaca 100755 (executable)
--- a/zephyr/debian/rules
+++ b/zephyr/debian/rules
@@ -128,16 +128,11 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        set -e; \
-       for file in files templates postinst docs; do \
+       for file in files templates config postinst docs; do \
                for dir in $(VARIETALS); do \
                        cp debian/zephyr-server.$$file debian/zephyr-server-$$dir.$$file; \
                done; \
        done
-       for file in config; do \
-               for dir in $(filter-out krb5,$(VARIETALS)); do \
-                       cp debian/zephyr-server.$$file debian/zephyr-server-$$dir.$$file; \
-               done; \
-       done
        for file in README.Debian docs init postrm; do \
                for dir in $(filter-out krb,$(VARIETALS)); do \
                        cp debian/zephyr-server-krb.$$file debian/zephyr-server-$$dir.$$file; \

diff --git a/zephyr/debian/zephyr-server.templates b/zephyr/debian/zephyr-server.templates
index efca03b384ea6907022826826ff6ed7daf6a0a06..11c9b861e62a1f93c4262b2b3f97a5680e359443 100644 (file)
--- a/zephyr/debian/zephyr-server.templates
+++ b/zephyr/debian/zephyr-server.templates
@@ -16,23 +16,6 @@ _Description: Zephyr servers:
  The list configured on clients can be a subset of the list configured
  on servers.
 
-Template: zephyr-server/no-more-krb4
-Type: boolean
-Default: true
-Description: Incompatible Upgrade
- You appear to be upgrading from a version of the zephyr server that
- uses Kerberos version 4 to authenticate.  Kerberos version 4 support
- has been removed from Debian, and accordingly from the zephyr server.
- This version of the zephyr server uses only Kerberos 5 to
- authenticate, and thus is almost certainly incompatible with any of
- your currently deployed clients.
- .
- A server that authenticates both ways can be built for lenny from the
- zephyr source package, see:
-   /usr/share/doc/libzephyr4-krb5/README.krb4-5
- .
- Continue with the upgrade?
-
 Template: zephyr-server/read_conf
 Type: boolean
 Default: true