Import Debian changes 1.0.4-3

tinc (1.0.4-3) unstable; urgency=low

  * Depend on debconf | debconf-2.0.
  * Include vietnamese debconf translation. Closes: #322305
  * Include japanese debconf translation. Closes: #319591

debian/changelog

@@ -1,3 +1,11 @@
+tinc (1.0.4-3) unstable; urgency=low
+
+  * Depend on debconf | debconf-2.0.
+  * Include vietnamese debconf translation. Closes: #322305
+  * Include japanese debconf translation. Closes: #319591
+
+ -- Guus Sliepen <guus@debian.org>  Thu, 29 Sep 2005 11:15:34 +0200
+
 tinc (1.0.4-2) unstable; urgency=low
 
   * Compensate for change in texinfo's output directory. Closes: #318562

debian/control

@@ -7,13 +7,9 @@ Build-Depends: libssl-dev, debhelper (>= 4.1.16), gettext, texi2html, zlib1g-dev
 
 Package: tinc
 Architecture: any
-Depends: debconf, ${shlibs:Depends}
+Depends: debconf | debconf-2.0, ${shlibs:Depends}
 Description: Virtual Private Network daemon
  tinc is a daemon with which you can create a virtual private network
  (VPN).  One daemon can handle multiple connections, so you can
  create an entire (moderately sized) VPN with only one daemon per
  participating computer.
- .
- You need to have two kernel modules installed, on a Debian system
- they should already be there.  If they are not, the manual will
- explain you how to do that.

debian/po/ja.po

@@ -0,0 +1,49 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: tinc 1.0.4-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-11-11 20:06+0000\n"
+"PO-Revision-Date: 2005-06-14 21:09+0900\n"
+"Last-Translator: Atsushi Shimono <shimono@kwasan.kyoto-u.ac.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../tinc.templates:4
+msgid "Restart tinc on each upgrade?"
+msgstr "アップグレードのたびに tinc を再起動しますか？"
+
+#. Type: boolean
+#. Description
+#: ../tinc.templates:4
+msgid ""
+"You may choose if you want me to restart the tinc daemon every time you "
+"install a new version of this package."
+msgstr ""
+"このパッケージの新しいバージョンをインストールするたびに、tinc デーモンを"
+"再起動するかどうかを選択できます。"
+
+#. Type: boolean
+#. Description
+#: ../tinc.templates:4
+msgid ""
+"Sometimes you don't want to do this, for example if you are doing the "
+"upgrade over a tunnel that is created with tinc.  Stopping the daemon would "
+"probably leave you with a dead connection, and tinc may not be started again."
+msgstr ""
+"tinc のトンネルを経由してアップグレードを行っているときなど、これを行い"
+"たくないことがあると思います。デーモンを止めることで接続が失われ、tinc "
+"も再起動しなくなります。"
+
+#. Type: boolean
+#. Description
+#: ../tinc.templates:4
+msgid ""
+"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
+"`invoke-rc.d tinc restart' whenever it suits you."
+msgstr ""
+"これを選択しない場合、アップグレードを行った際、都合が良いときに "
+"'invoke-rc.d tinc restart' を実行して tinc を自分で再起動する必要があります。"

debian/po/vi.po

@@ -0,0 +1,48 @@
+# Vietnamese translation for tinc.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tinc 1.0.4-2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-11-11 20:06+0000\n"
+"PO-Revision-Date: 2005-08-10 17:13+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\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-Generator: LocFactoryEditor 1.2.2\n"
+
+#. Type: boolean
+#. Description
+#: ../tinc.templates:4
+msgid "Restart tinc on each upgrade?"
+msgstr "Khởi chạy lại trình tinc mỗi lần nâng cấp không?"
+
+#. Type: boolean
+#. Description
+#: ../tinc.templates:4
+msgid ""
+"You may choose if you want me to restart the tinc daemon every time you "
+"install a new version of this package."
+msgstr "Tại đây bạn có thể chọn tự động khởi chạy lại trình nền (dæmon) tinc mỗi lần bạn cài đặt phiên bản mới của gói này hay không."
+
+#. Type: boolean
+#. Description
+#: ../tinc.templates:4
+msgid ""
+"Sometimes you don't want to do this, for example if you are doing the "
+"upgrade over a tunnel that is created with tinc.  Stopping the daemon would "
+"probably leave you with a dead connection, and tinc may not be started again."
+msgstr "Đôi khi bạn không muốn làm như thế, lấy thí dụ nếu bạn đang nâng cấp qua đường hầm mà tinc tạo. Trong trường hợp này, ngừng trình nền rất có thể sẽ ngắt kết nối, và có lẽ tinc sẽ không khởi chạy lại."
+
+#. Type: boolean
+#. Description
+#: ../tinc.templates:4
+msgid ""
+"If you refuse, you have to restart tinc yourself if you upgraded, by typing "
+"`invoke-rc.d tinc restart' whenever it suits you."
+msgstr "Nếu bạn từ chối thì bạn cần phải tự khởi chạy lại trình tinc mỗi lần nâng cấp, bằng cách gõ lệnh « invoke-rc.d tinc restart » (gọi-rc.d tinc khởi chạy lại) khi thích hợp."

debian/postinst

@@ -51,12 +51,12 @@ fi
 
 case "$1" in
     configure)
-	if [ ! -e /dev/.devfsd -a ! -e /dev/.devfs ] ; then
+	if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then
-		if [ ! -e /dev/net/tun -a ! -e /dev/tun ] ; then
+		if [ ! -e /dev/net/tun ] ; then if [ ! -e /dev/tun ] ; then
 			echo "Creating tun device..."
 			cd /dev && ./MAKEDEV net/tun 2>/dev/null || ./MAKEDEV tun 2>/dev/null || echo "Failed to create tun device."
-		fi
+		fi; fi
-	fi
+	fi; fi
 
 	if [ ! -e $NETSFILE ] ; then
 	    echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE