* Explicitly tell po2debconf to use the 'popular' output encoding, so that

  the woody-compatibility hack works even with po-debconf 0.9.0.

2 files changed, 3 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index f91f1e96b..ba01ec08d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ openssh (1:4.2p1-3) UNRELEASED; urgency=low
   * Interoperate with ssh-krb5 << 3.8.1p1-1 servers, which used a slightly
     different version of the gssapi authentication method (thanks, Aaron M.
     Ucko; closes: #328388).
+  * Explicitly tell po2debconf to use the 'popular' output encoding, so that
+    the woody-compatibility hack works even with po-debconf 0.9.0.
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 15 Sep 2005 09:01:57 +0100
 
diff --git a/debian/rules b/debian/rules
index 74c39731e..43868d52c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,7 @@ ifeq ($(PO2DEBCONF),yes)
         # 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 > debian/po/output
+        echo '1 popular' > debian/po/output
         po2debconf debian/openssh-server.templates.master > debian/openssh-server.templates
         rm -f debian/po/output
 endif