Merge lp:~cyphermox/ubuntu/lucid/resolvconf/lucid into lp:ubuntu/lucid/resolvconf

[Mathieu Trudel-Lapierre]

[lp:~cyphermox/ubuntu/lucid/resolvconf/lucid]

18. By Mathieu Trudel-Lapierre on 2009-12-30

* debian/postinst:
  - make sure all run files are sent to /var/run, not /lib/init/rw

19. By Mathieu Trudel-Lapierre on 2009-12-30

update regex to check that /var/run is a tmpfs (LP: #386822)

20. By Mathieu Trudel-Lapierre on 2009-12-30

fix typo in comments

21. By Mathieu Trudel-Lapierre on 2009-12-30

* debian/postrm:
  - remove /var/run/resolvconf, not /lib/init/rw/resolvconf

22. By Mathieu Trudel-Lapierre on 2009-12-30

also purge /var/run/resolvconf/interface

=== modified file 'debian/changelog'
--- debian/changelog	2009-06-04 16:38:43 +0000
+++ debian/changelog	2009-12-30 21:24:14 +0000
@@ -1,3 +1,32 @@
+resolvconf (1.45ubuntu1) lucid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #495998):
+    - bin/resolvconf:
+      + fail with non-zero exit code when /etc/resolv.conf is not a symlink.
+    - debian/postinst:
+      + use default /var/run.
+    - debian/rules:
+      + don't install the init script in runlevels 0 and 6.
+  * debian/postinst:
+    - make sure all run files are sent to /var/run, not /lib/init/rw
+    - update regex to check that /var/run is a tmpfs (LP: #386822)
+    - fix typo in comments
+  * debian/postrm:
+    - remove /var/run/resolvconf, not /lib/init/rw/resolvconf
+    - also purge /var/run/resolvconf/interface
+
+ -- Mathieu Trudel <[e-mail]>  Wed, 30 Dec 2009 16:17:58 -0500
+
+resolvconf (1.45) unstable; urgency=low
+
+  [ Thomas Hood ]
+  * Bump standards version
+  * Add note to man page that tail file is a good place for a
+    resolver "options" line  (Closes: #533297)
+  * Add eu.po (Closes: #534558)
+
+ -- Marco Nenciarini <[e-mail]>  Thu, 13 Aug 2009 20:01:51 +0200
+
 resolvconf (1.44ubuntu1) karmic; urgency=low
 
   * Merge from debian unstable, remaining changes (LP: #384131):
 
=== modified file 'debian/control'
--- debian/control	2009-06-04 16:38:43 +0000
+++ debian/control	2009-12-30 21:24:14 +0000
@@ -9,7 +9,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/resolvconf/resolvconf/trunk
 Homepage: http://alioth.debian.org/projects/resolvconf/
 Dm-Upload-Allowed: yes
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 
 Package: resolvconf
 Architecture: all
 
=== added file 'debian/po/eu.po'
--- debian/po/eu.po	1970-01-01 00:00:00 +0000
+++ debian/po/eu.po	2009-12-30 21:24:14 +0000
@@ -0,0 +1,152 @@
+# translation of resolvconf-eu.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide EGaña <[e-mail]>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: resolvconf-eu\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-02-11 07:44+0100\n"
+"PO-Revision-Date: 2009-06-25 11:48+0200\n"
+"Last-Translator: Piarres Beobide <[e-mail]>\n"
+"Language-Team: Euskara <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Prepare /etc/resolv.conf for dynamic updates?"
+msgstr "Prestatu /etc/resolv.conf eguneraketa dinamikoentzat?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The resolvconf package contains the infrastructure required for dynamic "
+"updating of the resolver configuration file. Part of the necessary "
+"infrastructure is a symbolic link from /etc/resolv.conf to /etc/resolvconf/"
+"run/resolv.conf. If you choose this option then this link will be created; "
+"the existing /etc/resolv.conf file will be preserved as /etc/resolvconf/"
+"resolv.conf.d/original, and will be restored if this package is removed."
+msgstr ""
+"Resolvconf paketeak ebazte konfigurazio fitxategia automatikoki "
+"eguneratzeko beharrezko azpiegitura du. Beharrezko azpiegitura "
+"horren zati bat /etc/resolv.conf eta /etc/resolvconf/run/resolv.conf "
+"arteko lotura sinboliko bat da. Aukera hau hautatuaz gero lotura "
+"hori sortu egingo da; aurreko /etc/resolv.conf fitxategia /etc/resolvconf/"
+"resolv.conf.d/original izenaz gordeko da eta paketea kentzen bada berriz "
+"bere lekuan ipiniko da."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Declining this option will prevent future installations from recreating the "
+"symbolic link and therefore the resolver configuration file will not be "
+"dynamically updated. Dynamic updating can then be activated following "
+"instructions in the README file."
+msgstr ""
+"Aukera hau baztertzeak hurrengo instalazioetan lotura sortzea desgaituko du, "
+"beraz ebazte konfigurazio fitxategia ez da dinamikoki eguneratuko. "
+"Eguneraketa dinamikoa README fitxategiko argibideak jarraituaz gaitu daiteke."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The presence of resolvconf can affect the behavior of other programs, so it "
+"should not be left installed if unconfigured."
+msgstr ""
+"Resolvconf egoteak beste programa batzuen portamoldea aldatu dezake, beraz "
+"ez litzateke konfiguratu gabe instalaturik utzi beharko."
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid "Network interfaces reconfiguration mandatory"
+msgstr "Sare interfaze birkonfigurazioa beharrezkoa"
+
+#. Type: note
+#. Description
+#: ../templates:3001
+msgid ""
+"Once resolvconf is installed, interface configurers supply name server "
+"information to it (which it then makes available to the C library resolver "
+"and to DNS caches). However, they do this only when they bring up "
+"interfaces. Therefore for resolvconf's name server information to be up to "
+"date after initial installation it is necessary to reconfigure interfaces "
+"(that is, to take them down and then to bring them up again) and to restart "
+"DNS caches."
+msgstr ""
+"Behin resolvconf instalaturik dagoela, interfaze konfigurazioak emango dizkio "
+"izen zerbitzariaren argibideak (honek C liburutegi ebazte eta DNS cache-ei "
+"eskurgarri egingo die). Hau bakarrik interfazeak altxatzean egingo dute. Hala ere "
+"resolvconf-ren izen zerbitzari argibideak instalatu ondoren behar bezala egoteko "
+"beharrezkoa da interfazeak birkonfiguratzea (hau da, interfazeak desgaitu eta "
+"berriz gaitzea) eta DNS cache-ak berrabiaraztea."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Append original file to dynamic file?"
+msgstr "Erantsi jatorrizko fitxategia fitxategi dinamikora?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If the original static resolver configuration file (/etc/resolv.conf) "
+"contains name server addresses, those addresses should be listed on \"dns-"
+"nameservers\" lines in /etc/network/interfaces. For more information, please "
+"consult the resolvconf(8) man page and the README file."
+msgstr ""
+"Jatorrizko ebazpen 'finko' konfigurazio fitxategiak (etc/resolv.conf) izen "
+"zerbitzariak baditu, helbide horiek /etc/network/interfaces fitxategiko "
+"\"dns-nameservers\" lerroetan gehitu beharko dira. Argibide gehiagorako "
+"irakurri itzazu resolvconf(8) manual orrialdea eta README fitxategia."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"Until /etc/network/interfaces has been edited and the affected interfaces "
+"brought down and up again, the name server addresses will not be included in "
+"the dynamically generated resolver configuration file."
+msgstr ""
+"Behin /etc/network/interfaces editatua izan denean eta dagozkion interfazeak "
+"desgaitu eta gaitu arte izen zerbitzari helbideak ez dira gehituko dinamikoki "
+"sortutako ebazte konfigurazio fitxategian."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"If you choose this option, a temporary workaround will be put in place: a "
+"symbolic link will be created (if it does not already exist) from /etc/"
+"resolvconf/resolv.conf.d/tail to /etc/resolvconf/resolv.conf.d/original. "
+"This will cause the whole of that original resolver configuration file to be "
+"appended to the dynamically generated file."
+msgstr ""
+"Aukera hau hautatzen baduzu aldiroko portamolde bat erabiliko da, lotura "
+"sinboliko bat sortuko da (dagoeneko ez badago) /etc/resolvconf/"
+"resolv.conf.d/tail eta /etc/resolvconf/resolv.conf.d/original artean. Honela "
+"jatorrizko ebazte konfigurazio fitxategia dinamikoki sortutakoari erantsiko "
+"zaio."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
+"After the required \"dns-nameservers\" lines have been added to /etc/network/"
+"interfaces, the /etc/resolvconf/resolv.conf.d/tail link should be replaced "
+"by one to /dev/null."
+msgstr ""
+"Behin beharrezko \"dns-nameservers\" lerroak /etc/network/interfaces "
+"fitxategira gehitu direnean, /etc/resolvconf/resolv.conf.d/tail lotura "
+"/dev/null-erako batez ordeztu beharko zen."
+
 
=== modified file 'debian/postinst'
--- debian/postinst	2008-08-20 02:32:47 +0000
+++ debian/postinst	2009-12-30 21:24:14 +0000
@@ -32,19 +32,19 @@
 			rm -f /etc/resolvconf/run
 		elif \
 			[ "$RUN_CANONICALPATH" = "/dev/shm/resolvconf" ] \
-			&& [ -d /lib/init/rw ] \
-			&& [ -w /lib/init/rw ] \
+			&& [ -d /var/run ] \
+			&& [ -w /var/run ] \
 			&& [ -r /proc/mounts ] \
-			&& grep -qs "^tmpfs[[:space:]]\+/lib/init/rw[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \
-			&& { [ -d /lib/init/rw/resolvconf ] || mkdir -v /lib/init/rw/resolvconf ; } \
-			&& { [ -d /lib/init/rw/resolvconf/interface ] || mkdir -v /lib/init/rw/resolvconf/interface ; } \
+			&& grep -qs "^none[[:space:]]\+/var/run[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \
+			&& { [ -d /var/run/resolvconf ] || mkdir -v /var/run/resolvconf ; } \
+			&& { [ -d /var/run/resolvconf/interface ] || mkdir -v /var/run/resolvconf/interface ; } \
 			&& F="$(echo /dev/shm/resolvconf/*)" \
 			&& [ "$F" ] \
 			&& [ "$F" != '/dev/shm/resolvconf/*' ] \
-			&& cp -a /dev/shm/resolvconf/* /lib/init/rw/resolvconf
+			&& cp -a /dev/shm/resolvconf/* /var/run/resolvconf
 		then
-			report_info "Migrating run-time database from /dev/shm/resolvconf to /lib/init/rw/resolvconf"
-			ln -nsf /lib/init/rw/resolvconf /etc/resolvconf/run
+			report_info "Migrating run-time database from /dev/shm/resolvconf to /var/run/resolvconf"
+			ln -nsf /var/run/resolvconf /etc/resolvconf/run
 		fi
 	fi
 	# Delete it if it isn't a directory or a link to one
@@ -64,12 +64,12 @@
 		# It's a dangling but canonicalizable symlink
 		mkdir -v "$RUN_CANONICALPATH" "${RUN_CANONICALPATH}/interface"
 	else
-		# It's a nonexistent
+		# It's nonexistent
 		# Use /var/run.
 		if \
 			[ -d /var/run ] \
 			&& [ -w /var/run ] \
-			&& grep -qs "^tmpfs[[:space:]]\+/var/run[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \
+			&& grep -qs "^none[[:space:]]\+/var/run[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \
 			&& { [ -d /var/run/resolvconf ] || mkdir -v /var/run/resolvconf ; } \
 			&& { [ -d /var/run/resolvconf/interface ] || mkdir -v /var/run/resolvconf/interface ; }
 		then
 
=== modified file 'debian/postrm'
--- debian/postrm	2009-06-02 18:02:23 +0000
+++ debian/postrm	2009-12-30 21:24:14 +0000
@@ -31,8 +31,9 @@
 	rm -f /etc/resolvconf/resolv.conf.d/tail
 	rm -f /etc/resolvconf/resolv.conf.d/original
 	rm -f /etc/default/resolvconf
-	rmdir /lib/init/rw/resolvconf/interface || :
-	rmdir /lib/init/rw/resolvconf || :
+	rm -f /var/run/resolvconf/interface/*
+	rmdir /var/run/resolvconf/interface || :
+	rmdir /var/run/resolvconf || :
 	;;
 esac
 
 
=== modified file 'man/resolvconf.8'
--- man/resolvconf.8	2008-12-07 15:12:34 +0000
+++ man/resolvconf.8	2009-12-30 21:24:14 +0000
@@ -234,6 +234,13 @@
 .I /etc/resolvconf/resolv.conf.d/tail
 File to be appended to the dynamically generated resolver configuration file.
 To append nothing, make this an empty file.
+This file is a good place to put a resolver
+.B options
+line if one is needed, e.g.,
+
+.EX
+    options inet6
+.EE
 .SH BUGS
 Currently
 .B resolvconf