summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2010-02-20 10:41:13 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:37:06 +0100
commitfc683c9b6372c5458cce1fbf986e920c45fcf104 (patch)
tree2301b4091ecf60d3d9304d3fdff1a933fbc90669
parent5def3263730db0cbae990ae6e577a98bcba2e081 (diff)
downloadapache2-fc683c9b6372c5458cce1fbf986e920c45fcf104.tar.gz
Fix error in Polish translation of 404 error page
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1151 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/00list1
-rwxr-xr-xdebian/patches/079_polish_translation.dpatch19
3 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bd87c755..1a51d482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
apache2 (2.2.14-7) UNRELEASED; urgency=low
* Fix potential memory leaks related to the usage of apr_brigade_destroy().
+ * Fix error in Polish translation of 404 error page. Closes: #570228
* Document ThreadLimit in apache2.conf's comments.
-- Stefan Fritsch <sf@debian.org> Fri, 19 Feb 2010 19:02:32 +0100
diff --git a/debian/patches/00list b/debian/patches/00list
index e5c88ed9..9cf7274d 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -26,6 +26,7 @@
076_apxs2_a2enmod.dpatch
077_CacheIgnoreURLSessionIdentifiers.dpatch
078_avoid_brigade_destroy.dpatch
+079_polish_translation.dpatch
099_config_guess_sub_update
200_cp_suexec.dpatch
201_build_suexec-custom.dpatch
diff --git a/debian/patches/079_polish_translation.dpatch b/debian/patches/079_polish_translation.dpatch
new file mode 100755
index 00000000..adea1b92
--- /dev/null
+++ b/debian/patches/079_polish_translation.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 079_polish_translation.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: #570228
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/docs/error/HTTP_NOT_FOUND.html.var trunk/docs/error/HTTP_NOT_FOUND.html.var
+--- trunk~/docs/error/HTTP_NOT_FOUND.html.var 2005-11-13 14:22:28.000000000 +0100
++++ trunk/docs/error/HTTP_NOT_FOUND.html.var 2010-02-20 11:37:08.229021346 +0100
+@@ -292,7 +292,7 @@
+ o problemie.
+
+ <!--#else -->
+- Jeśli wpisałeś URLa ręcznie, sprawdź, czy nie się nie pomyliłeś.
++ Jeśli wpisałeś URLa ręcznie, sprawdź, czy się nie pomyliłeś.
+
+ <!--#endif -->
+