summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--ftparchive/writer.cc5
2 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index bb0b11147..4712e80c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
+
apt (0.8.11.6) UNRELEASED; urgency=low
+ [ Christian Perrier ]
* Fix error in French translation of manpages (apt_preferences(5)).
Merci, RĂ©mi Vanicat. Closes: #613689
* Complete French manpage translation
- -- Christian Perrier <bubulle@debian.org> Fri, 18 Feb 2011 05:53:49 +0100
+ [ David Kalnischkies ]
+ * ftparchive/writer.cc:
+ - ensure that Date and Valid-Until time strings are not localised
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Tue, 22 Feb 2011 13:22:58 +0100
apt (0.8.11.5) unstable; urgency=low
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 9cdca8d3e..80ec61ab9 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -925,6 +925,9 @@ ReleaseWriter::ReleaseWriter(string const &DB)
Output = stdout;
time_t const now = time(NULL);
+
+ setlocale(LC_TIME, "C");
+
char datestr[128];
if (strftime(datestr, sizeof(datestr), "%a, %d %b %Y %H:%M:%S UTC",
gmtime(&now)) == 0)
@@ -941,6 +944,8 @@ ReleaseWriter::ReleaseWriter(string const &DB)
validstr[0] = '\0';
}
+ setlocale(LC_TIME, "");
+
map<string,string> Fields;
Fields["Origin"] = "";
Fields["Label"] = "";