From 049d989c6570c893aaea501c66be0b4391916fc8 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <calvin@debian.org>
Date: Sun, 7 Mar 2010 11:56:25 +0100
Subject: [PATCH] Move msgfmt.py into po/ subdir

---
 MANIFEST.in                 | 2 +-
 debian/changelog            | 4 ++++
 doc/todo.txt                | 5 +----
 {linkcheck => po}/msgfmt.py | 0
 setup.py                    | 4 +++-
 5 files changed, 9 insertions(+), 6 deletions(-)
 rename {linkcheck => po}/msgfmt.py (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index fbd11d7e..949355be 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -36,7 +36,7 @@ include linkcheck/gui/rc/Makefile
 include linkcheck/gui/rc/*.png
 include linkcheck/gui/rc/*.qrc
 include linkcheck/gui/ui/*.ui
-include po/*.po po/*.pot po/Makefile
+include po/*.po po/*.pot po/Makefile po/msgfmt.py
 include doc/*.example
 include doc/html/*.ico
 include doc/html/*.html
diff --git a/debian/changelog b/debian/changelog
index 596064d4..749d7a29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 linkchecker (5.2-1) unstable; urgency=low
 
   * New upstream release.
+  * Does not install msgfmt.py anymore, since it has been moved out
+    of the linkcheck package.
+    (Closes: #555414)
+  * Standards version 3.8.4.
 
  -- Bastian Kleineidam <calvin@debian.org>  Mon, 15 Feb 2010 23:52:35 +0100
 
diff --git a/doc/todo.txt b/doc/todo.txt
index 4a1d105f..a9ae9d47 100644
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,8 +1,7 @@
 - [GUI] Add more context menu actions:
   + Show detailed URL properties
   + View source
-- [GUI] Read (initial) configuration from linkcheckerrc file.
-- [GUI] Save options in qsettings
+- [GUI] Save options in qsettings, and read linkcheckerrc file.
 - [PYTHON3]
   linkchecker-git/linkcheck/dns/resolver.py:313: DeprecationWarning: in 3.x, __getslice__ has been removed; use __getitem__
   linkcheck.dns.name.Name(linkcheck.dns.name.from_text(socket.gethostname())[1:])
@@ -12,8 +11,6 @@
 - [HTTP] Do not fall back to GET when no recursion is requested on
   single pages. This would allow to check pages even if robots.txt
   disallows to get the page content.
-- [HTTP] There are still errors "Bad status Line" and "Connect reset by peer"
-  See email.
 - [HTTP] try out httest
 - [CHECKING] Parse Word files for hyperlinks (needs win32com)
   app = CreateObject("Word.Application")
diff --git a/linkcheck/msgfmt.py b/po/msgfmt.py
similarity index 100%
rename from linkcheck/msgfmt.py
rename to po/msgfmt.py
diff --git a/setup.py b/setup.py
index ed7d856a..90d08a08 100755
--- a/setup.py
+++ b/setup.py
@@ -312,11 +312,13 @@ class MyBuild (build, object):
 
     def build_message_files (self):
         """For each po/*.po, build .mo file in target locale directory."""
+        # msgfmt.py is in the po/ subdirectory
+        sys.path.append('po')
+        import msgfmt
         for (src, dst) in list_message_files(self.distribution.get_name()):
             build_dst = os.path.join("build", dst)
             self.mkpath(os.path.dirname(build_dst))
             self.announce("Compiling %s -> %s" % (src, build_dst))
-            from linkcheck import msgfmt
             msgfmt.make(src, build_dst)
 
     def run (self):