diff -u scponly-4.6/debian/changelog scponly-4.6/debian/changelog
--- scponly-4.6/debian/changelog
+++ scponly-4.6/debian/changelog
@@ -1,3 +1,19 @@
+scponly (4.6-1.4ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #295411):
+    - Patch setup_chroot.sh.in so that dev/null gets created in the chroot.
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Fri, 07 Nov 2008 21:18:21 -0600
+
+scponly (4.6-1.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues
+  * Debconf translations:
+    - Turkish. Closes: #484686
+
+ -- Christian Perrier <bubulle@debian.org>  Sun, 21 Sep 2008 08:39:28 +0200
+
 scponly (4.6-1.3ubuntu1) intrepid; urgency=low
 
   * Merge from debian unstable, remaining changes (LP: #239208):
only in patch2:
unchanged:
--- scponly-4.6.orig/debian/po/tr.po
+++ scponly-4.6/debian/po/tr.po
@@ -0,0 +1,51 @@
+# Turkish translation of scponly debconft template
+# Copyright (C) 2008
+# This file is distributed under the same license as the scponly package.
+# Mert Dirik <mertdirik@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: scponly\n"
+"Report-Msgid-Bugs-To: scponly@packages.debian.org\n"
+"POT-Creation-Date: 2008-05-28 07:36+0200\n"
+"PO-Revision-Date: 2008-06-05 18:10+0200\n"
+"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
+"Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Turkish\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Install the chrooted binary /usr/sbin/scponlyc and set it to mode 4755 (root."
+"root)?"
+msgstr ""
+"'chroot'lanmış ikili dosya '/usr/sbin/scponlyc'ye kopyalanıp 4755 (root."
+"root) kipine ayarlansın mı?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If you want scponly to chroot into the user's home directory prior to doing "
+"its work, the scponly binary has to be installed in /usr/sbin/scponlyc and "
+"has to have the suid-root-bit set."
+msgstr ""
+"Eğer 'scponly'nin, işini yapmadan önce, kullanıcının ev dizinine "
+"'chroot'lamasını istiyorsanız, scponly ikili dosyası '/usr/sbin/scponlyc' "
+"yoluna kurulmalı ve suid-root-bit özniteliğine sahip olmalı."
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"This could lead (in the worst case) to a remotely exploitable root hole. If "
+"you don't need the chroot- functionality, don't install the file."
+msgstr ""
+"Bu (en kötü durumda) uzaktan istismar edilebilir bir root güvenlik açığına "
+"yol açabilir. Eğer chroot işlevselliğine ihtiyacınız yoksa bu dosyayı "
+"kurmayın."