summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-09-15 08:27:15 +0000
committerColin Watson <cjwatson@debian.org>2005-09-15 08:27:15 +0000
commita7510c82249a16b105edd72eb29bc89fad4168b0 (patch)
tree8cca71eb08866278275a45385cd35dbf27c6b6a4
parent74a432c0606a6068342ece4d5f51cf90f7b4e339 (diff)
* Explicitly tell po2debconf to use the 'popular' output encoding, so that
the woody-compatibility hack works even with po-debconf 0.9.0.
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules2
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
4 * Interoperate with ssh-krb5 << 3.8.1p1-1 servers, which used a slightly 4 * Interoperate with ssh-krb5 << 3.8.1p1-1 servers, which used a slightly
5 different version of the gssapi authentication method (thanks, Aaron M. 5 different version of the gssapi authentication method (thanks, Aaron M.
6 Ucko; closes: #328388). 6 Ucko; closes: #328388).
7 * Explicitly tell po2debconf to use the 'popular' output encoding, so that
8 the woody-compatibility hack works even with po-debconf 0.9.0.
7 9
8 -- Colin Watson <cjwatson@debian.org> Thu, 15 Sep 2005 09:01:57 +0100 10 -- Colin Watson <cjwatson@debian.org> Thu, 15 Sep 2005 09:01:57 +0100
9 11
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)
116 # on a system with po-debconf installed (conveniently debhelper (>= 116 # on a system with po-debconf installed (conveniently debhelper (>=
117 # 4.1.16) depends on it), the binary-arch target will generate a 117 # 4.1.16) depends on it), the binary-arch target will generate a
118 # better version for sarge. 118 # better version for sarge.
119 echo 1 > debian/po/output 119 echo '1 popular' > debian/po/output
120 po2debconf debian/openssh-server.templates.master > debian/openssh-server.templates 120 po2debconf debian/openssh-server.templates.master > debian/openssh-server.templates
121 rm -f debian/po/output 121 rm -f debian/po/output
122endif 122endif