Merged from debian-sid branch.

5 files changed, 20 insertions, 8 deletions

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 85cf4e119..5359f81ef 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -773,6 +773,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN);
       sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
 
+      // ignore SIGHUP as well (debian #463030)
+      sighandler_t old_SIGHUP = signal(SIGHUP,SIG_IGN);
+
       struct	termios tt;
       struct	termios tt_out;
       struct	winsize win;
@@ -881,6 +884,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	    // Restore sig int/quit
 	    signal(SIGQUIT,old_SIGQUIT);
 	    signal(SIGINT,old_SIGINT);
+	    signal(SIGINT,old_SIGHUP);
 	    return _error->Errno("waitpid","Couldn't wait for subprocess");
 	 }
 
@@ -920,6 +924,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       // Restore sig int/quit
       signal(SIGQUIT,old_SIGQUIT);
       signal(SIGINT,old_SIGINT);
+      signal(SIGINT,old_SIGHUP);
 
       if(master >= 0) 
       {
diff --git a/debian/changelog b/debian/changelog
index 4f12c563e..27f78e958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ apt (0.7.19) unstable; urgency=low
       is a request to install only one package and it is not installable.
       (Closes: #419521)
 
+  [ Michael Vogt ]
+    - fix SIGHUP handling (closes: #463030)
+
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 08 Nov 2008 12:40:19 +0200
 
 apt (0.7.18) unstable; urgency=low
@@ -20,6 +23,7 @@ apt (0.7.18) unstable; urgency=low
   [ Christian Perrier ]
   * Translations:
     - French updated
+    - Thai updated. Closes: #505067
 
   [ Eugene V. Lyubimkin ]
   * doc/examples/configure-index:
diff --git a/po/ChangeLog b/po/ChangeLog
index cdc605b4a..2f2a97766 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-09  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: updated to 540t.
+
 2008-11-06  Christian Perrier  <bubulle@debian.org>
 
 	* Update all PO files and apt-all.pot. 540 strings.
diff --git a/po/fr.po b/po/fr.po
index 9bc0aced5..ac39ae5b5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2102,7 +2102,7 @@ msgstr "Erreur de lecture du serveur"
 
 #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
-msgstr "Echec de la troncature du fichier"
+msgstr "Échec de la troncature du fichier"
 
 #: methods/http.cc:1105
 msgid "Bad header data"
diff --git a/po/th.po b/po/th.po
index cb28792b4..b4e767e1c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-28 18:12+0100\n"
-"PO-Revision-Date: 2008-05-06 12:52+0700\n"
+"PO-Revision-Date: 2008-11-06 15:54+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -2024,9 +2024,8 @@ msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 
 #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
-#, fuzzy
 msgid "Failed to truncate file"
-msgstr "ไม่สามารถเขียนแฟ้ม %s"
+msgstr "ไม่สามารถตัดท้ายแฟ้ม"
 
 #: methods/http.cc:1105
 msgid "Bad header data"
@@ -2051,7 +2050,7 @@ msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบ�
 
 #: apt-pkg/contrib/mmap.cc:213
 msgid "Dynamic MMap ran out of room"
-msgstr ""
+msgstr "เนื้อที่สำหรับทำ MMap แบบพลวัตเต็มแล้ว"
 
 #: apt-pkg/contrib/strutl.cc:1014
 #, c-format
@@ -2765,9 +2764,9 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
 
 #: apt-pkg/deb/dpkgpm.cc:49
-#, fuzzy, c-format
+#, c-format
 msgid "Installing %s"
-msgstr "ติดตั้ง %s แล้ว"
+msgstr "กำลังติดตั้ง %s"
 
 #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
 #, c-format
@@ -2782,7 +2781,7 @@ msgstr "กำลังถอดถอน %s"
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr ""
+msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
 
 #: apt-pkg/deb/dpkgpm.cc:521
 #, c-format