* Drop source-compatibility with Debian 3.0:

  - Remove support for building with GNOME 1. This allows simplification
    of our GNOME build-dependencies (see #460136).
  - Remove hacks to support the old PAM configuration scheme.
  - Remove compatibility for building without po-debconf.
* Build-depend on libgtk2.0-dev rather than libgnomeui-dev. As far as I
  can see, the GTK2 version of ssh-askpass-gnome has never required
  libgnomeui-dev.

1 files changed, 5 insertions, 68 deletions

diff --git a/debian/rules b/debian/rules
index cfd942bdd..7b6138d8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,28 +47,6 @@ ifneq (,$(findstring :$(DEB_HOST_ARCH_OS):,:linux:knetbsd:))
   endif
 endif
 
-ifeq (,$(wildcard /usr/bin/po2debconf))
-PO2DEBCONF := no
-MINDEBCONFVER := 0.5
-else
-PO2DEBCONF := yes
-MINDEBCONFVER := 1.2.0
-endif
-
-# We need a new libpam-runtime for sane PAM handling
-# (http://lists.debian.org/debian-devel-announce-0308/msg00012.html).
-# Unfortunately it's hard to detect during the build whether this is
-# appropriate, so woody-compatibility is a pain. I've had to punt and go for
-# a DEB_BUILD_SSH_WOODY environment variable. We can remove this hack once
-# we no longer care about woody.
-ifeq ($(DEB_BUILD_SSH_WOODY),)
-PAMSUBST := no
-PAMDEP := libpam-runtime (>= 0.76-14)
-else
-PAMSUBST := yes
-PAMDEP := libpam-runtime
-endif
-
 # Change the version string to include the Debian version
 SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
 
@@ -146,12 +124,7 @@ endif
         perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h
 
         $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
-        # Support building on Debian 3.0 (with GNOME 1.4) and later.
-        if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \
-                $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc $(OPTFLAGS) -g -Wall'; \
-        elif [ -f /usr/include/gnome-1.0/gnome.h ]; then \
-                $(MAKE) -C contrib gnome-ssh-askpass1 CC='gcc $(OPTFLAGS) -g -Wall'; \
-        fi
+        $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc $(OPTFLAGS) -g -Wall'
 
         touch build-deb-stamp
 
@@ -174,22 +147,6 @@ clean:
         rm -rf build-deb build-udeb
         $(MAKE) -C contrib clean
         rm -f config.log
-ifeq ($(PO2DEBCONF),yes)
-        # Hack for woody compatibility. This makes sure that the
-        # debian/templates file shipped in the source package doesn't
-        # specify encodings, which woody's debconf can't handle. If building
-        # on a system with po-debconf installed (conveniently debhelper (>=
-        # 4.1.16) depends on it), the binary-arch target will generate a
-        # better version for sarge.
-        echo '1 popular' > debian/po/output
-        po2debconf debian/openssh-server.templates.master > debian/openssh-server.templates
-        rm -f debian/po/output
-endif
-ifeq ($(PAMSUBST),yes)
-        if [ -f debian/ssh.pam.new-style ]; then \
-                mv debian/ssh.pam.new-style debian/ssh.pam; \
-        fi
-endif
         rm -f debian/ssh-askpass-gnome.png
         dh_clean
 
@@ -219,11 +176,7 @@ install: build
         install -m 644 -c contrib/ssh-copy-id.1 debian/openssh-client/usr/share/man/man1/ssh-copy-id.1
         install -m 644 debian/moduli.5 debian/openssh-client/usr/share/man/man5/moduli.5
 
-        if [ -f contrib/gnome-ssh-askpass2 ]; then \
-                install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass; \
-        elif [ -f contrib/gnome-ssh-askpass1 ]; then \
-                install -s -o root -g root -m 755 contrib/gnome-ssh-askpass1 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass; \
-        fi
+        install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass
         install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1
         uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue
 
@@ -276,7 +229,7 @@ binary-openssh-client: build install
                 ETC_SSH_SSH_CONFIG debian/openssh-client/etc/ssh/ssh_config \
                 debian/openssh-client/DEBIAN/preinst
         dh_shlibdeps
-        dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER)) | debconf-2.0'
+        dh_gencontrol
         dh_md5sums
         dh_builddeb
 
@@ -284,26 +237,11 @@ binary-openssh-server: DH_OPTIONS=-popenssh-server
 binary-openssh-server: build install
         dh_testdir
         dh_testroot
-ifeq ($(PO2DEBCONF),yes)
-        po2debconf -e utf8 debian/openssh-server.templates.master > debian/openssh-server.templates
-endif
         dh_installdebconf
         dh_installdocs
         mv debian/openssh-server/usr/share/doc/openssh-server debian/openssh-server/usr/share/doc/openssh-client
         rm -f debian/openssh-server/usr/share/doc/openssh-client/copyright
-ifeq ($(PAMSUBST),yes)
-        # Clean up if we've done this already, to ensure idempotency.
-        if [ -f debian/openssh-server.ssh.pam.new-style ]; then \
-                mv debian/openssh-server.ssh.pam.new-style debian/openssh-server.ssh.pam; \
-        fi
-        cp -a debian/openssh-server.ssh.pam debian/openssh-server.ssh.pam.new-style
-        sed -e "s/@include common-auth/auth       required     pam_unix.so/" \
-            -e "s/@include common-account/account    required     pam_unix.so/" \
-            -e "s/@include common-session/session    required     pam_unix.so/" \
-            -e "s/@include common-password/password   required     pam_unix.so/" \
-            debian/openssh-server.ssh.pam.new-style > debian/openssh-server.ssh.pam
-endif
-        dh_installpam --name ssh # TODO: breaks woody backports
+        dh_installpam --name ssh
         dh_link
         dh_strip
         dh_compress
@@ -315,8 +253,7 @@ endif
                 ETC_PAM_D_SSH debian/openssh-server/etc/pam.d/ssh \
                 debian/openssh-server/DEBIAN/preinst
         dh_shlibdeps
-        dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER)) | debconf-2.0' \
-                         -V'pam-depends=$(PAMDEP)'
+        dh_gencontrol
         dh_md5sums
         dh_builddeb