- Updated Czech debconf translation.

- Fix bashism in init script.
- Mention bug fixes.
- Depend on dbus, it's required now.

4 files changed, 16 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index 21e7f6db3..289e68113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
-strongswan (4.2.4-1) UNRELEASED; urgency=low
+strongswan (4.2.4-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release.
+  * Apply patch to ipsec init script to fix bashism.
+    Closes: #473703: strongswan: bashism in /bin/sh script 
+  * Updated Czech debconf translation.
+    Closes: #480928: [l10n] Updated Czech translation of strongswan debconf
+                     messages
+  * Need to depend on dbus, since charon is now being compiled with dbus
+    support. Mea culpa.
+    Closes: #475098: charon needs dbus but strongswan does not depend on dbus
 
  -- Rene Mayrhofer <rene@mayrhofer.eu.org>  Thu, 10 Jul 2008 14:40:43 +0200
 
diff --git a/debian/control b/debian/control
index 33cd8c030..6e56bac9d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 4.1.16), libtool, libgmp3-dev, libssl-dev (>= 0.9.8
 Package: strongswan
 Architecture: any
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, ${misc:Depends}, bsdmainutils, debianutils (>=1.7), ipsec-tools, openssl, host, iproute
+Depends: ${shlibs:Depends}, ${misc:Depends}, bsdmainutils, debianutils (>=1.7), ipsec-tools, openssl, host, iproute, dbus
 Suggests: curl
 Provides: ike-server
 Conflicts: freeswan (<< 2.04-12), openswan
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 32ae57a53..58b82106c 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: strongswan\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
 "POT-Creation-Date: 2007-07-05 01:24+0100\n"
-"PO-Revision-Date: 2007-07-07 21:01+0200\n"
+"PO-Revision-Date: 2008-05-12 19:17+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -270,15 +270,11 @@ msgstr "Jméno souboru s certifikátem X509 ve formátu PEM:"
 #. Type: string
 #. Description
 #: ../strongswan.templates:8001
-#, fuzzy
-#| msgid ""
-#| "Please enter the full location of the file containing your X509  "
-#| "certificate in PEM format."
 msgid ""
 "Please enter the full location of the file containing your X509 certificate "
 "in PEM format."
 msgstr ""
-"Zadejte prosím absolutní cestu k souboru obsahujícímu váš certifikát X509 ve "
+"Zadejte prosím celou cestu k souboru obsahujícímu váš certifikát X509 ve "
 "formátu PEM."
 
 #. Type: string
@@ -308,12 +304,6 @@ msgstr "Délka vytvořeného RSA klíče (v bitech):"
 #. Type: string
 #. Description
 #: ../strongswan.templates:10001
-#, fuzzy
-#| msgid ""
-#| "Please enter the length of the created RSA key. it should not be less "
-#| "than 1024 bits because this should be considered unsecure and you will "
-#| "probably not need anything more than 2048 bits because it only slows the "
-#| "authentication process down and is not needed at the moment."
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -321,7 +311,7 @@ msgid ""
 "authentication process down and is not needed at the moment."
 msgstr ""
 "Zadejte prosím délku vytvářeného RSA klíče. Kvůli bezpečnosti by neměla být "
-"méně než 1024 bitů a pravděpodobně nepotřebujete víc než 2048 bitů, protože "
+"menší než 1024 bitů a pravděpodobně nepotřebujete víc než 2048 bitů, protože "
 "to již zpomaluje proces autentizace."
 
 #. Type: boolean
@@ -353,19 +343,13 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates:11001
-#, fuzzy
-#| msgid ""
-#| "If you do not want to create a self-signed certificate, then this "
-#| "installer will only create the RSA private key and the certificate "
-#| "request and you will have to sign the certificate request with your "
-#| "certificate authority."
 msgid ""
 "If you do not want to create a self-signed certificate, then this installer "
 "will only create the RSA private key and the certificate request and you "
 "will have to get the certificate request signed by your certificate "
 "authority."
 msgstr ""
-"Jestliže nechcete vytvořit certifikát podepsaný sám sebou, vytvoří tento "
+"Jestliže nechcete vytvořit certifikát podepsaný sebou samým, vytvoří tento "
 "instalátor jen soukromý RSA klíč a požadavek na certifikát. Vy potom musíte "
 "podepsat požadavek svojí certifikační autoritou."
 
diff --git a/src/ipsec/ipsec.in b/src/ipsec/ipsec.in
index 707612e92..3f4b94353 100755
--- a/src/ipsec/ipsec.in
+++ b/src/ipsec/ipsec.in
@@ -326,7 +326,7 @@ update)
 	;;
 version|--version)
 	echo "Linux $IPSEC_NAME $IPSEC_VERSION"
-	echo -e $IPSEC_DISTRO
+	printf "$IPSEC_DISTRO\n"
 	echo "See \`ipsec --copyright' for copyright information."
 	exit 0
 	;;