[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. upstream/4.1.1-85-g416d2c1
Andrew Pollock
apollock at debian.org
Tue Sep 21 19:08:47 UTC 2010
The following commit has been merged in the master branch:
commit 416d2c1a94d9dcd0778ffd8faba2a61d83039ef2
Author: Andrew Pollock <apollock at debian.org>
Date: Tue Sep 21 12:06:45 2010 -0700
Various fixes:
* Updated Portugeuse debconf template translation
* Fixed priority of transitional packages for #594339
* Added dependency on iproute2 to isc-dhcp-client
diff --git a/debian/changelog b/debian/changelog
index 6df77f6..737d40c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,12 @@ isc-dhcp (4.1.1-P1-10) UNRELEASED; urgency=low
* debian/dhcp3-server.postinst: reinstate, remove obsolete init script
(closes: #594527)
* debian/dhcp3-relay.postinst: reinstate, remove obsolete init script
+ * debian/control: make all of the transitional dummy packages Priority: extra
+ and Section: oldlibs (closes: #594339)
+ * debian/control: add iproute to dependencies of isc-dhcp-client
+ * Updated Portugeuse debconf template translation (closes: #597143)
- -- Andrew Pollock <apollock at debian.org> Sat, 28 Aug 2010 21:09:11 -0700
+ -- Andrew Pollock <apollock at debian.org> Tue, 21 Sep 2010 12:05:52 -0700
isc-dhcp (4.1.1-P1-9) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 853023d..d328c08 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,7 @@ Description: API for accessing and modifying the DHCP server and client state
Package: isc-dhcp-client
Architecture: any
-Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), iproute, ${shlibs:Depends}, ${misc:Depends}
Suggests: resolvconf, avahi-autoipd
Provides: dhcp3-client
Conflicts: dhcp-client (<< 3.0), samba-common (<< 3.0.0beta1-2), resolvconf (<= 1.45), ifupdown (<< 0.6.8+nmu3)
@@ -174,7 +174,8 @@ Description: DHCP relay daemon (debugging symbols)
Extra documentation can be found in the package isc-dhcp-common.
Package: dhcp3-server
-Priority: optional
+Priority: extra
+Section: oldlibs
Architecture: all
Depends: isc-dhcp-server, ${misc:Depends}
Description: ISC DHCP server (transitional package)
@@ -194,7 +195,8 @@ Description: ISC DHCP server (transitional package)
This dummy package may be safely removed after upgrading to squeeze
Package: dhcp3-client
-Priority: important
+Priority: extra
+Section: oldlibs
Architecture: all
Depends: isc-dhcp-client, ${misc:Depends}
Description: ISC DHCP server (transitional package)
@@ -215,7 +217,8 @@ Description: ISC DHCP server (transitional package)
This dummy package may be safely removed after upgrading to squeeze
Package: dhcp3-relay
-Priority: optional
+Priority: extra
+Section: oldlibs
Architecture: all
Depends: isc-dhcp-relay, ${misc:Depends}
Description: ISC DHCP relay (transitional package)
@@ -232,7 +235,8 @@ Description: ISC DHCP relay (transitional package)
This dummy package may be safely removed after upgrading to squeeze
Package: dhcp3-common
-Priority: important
+Priority: extra
+Section: oldlibs
Architecture: all
Depends: isc-dhcp-common, ${misc:Depends}
Description: ISC DHCP common files (transitional package)
@@ -245,8 +249,8 @@ Description: ISC DHCP common files (transitional package)
This dummy package may be safely removed after upgrading to squeeze
Package: dhcp3-dev
-Priority: optional
-Section: devel
+Priority: extra
+Section: oldlibs
Architecture: all
Depends: isc-dhcp-dev, ${misc:Depends}
Description: ISC DHCP development files (transitional package)
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 1d1197c..92e29c8 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,18 +1,20 @@
-# Portuguese translation of dhcp3 debconf messages.
+# Portuguese translation of isc-dhcp debconf messages.
# This file is distributed under the same license as the dhcp3 package.
# Ricardo Silva <ardoric at gmail.com>, 2007.
+# Pedro Ribeiro <p.m42.ribeiro at gmail.com>, 2010
#
msgid ""
msgstr ""
-"Project-Id-Version: dhcp3 3.0.4-13\n"
+"Project-Id-Version: isc-dhcp 4.1.1-P1-9\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
"POT-Creation-Date: 2010-07-07 18:58-0700\n"
-"PO-Revision-Date: 2007-05-31 19:43+0100\n"
-"Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
+"PO-Revision-Date: 2010-09-12 22:43+0100\n"
+"Last-Translator: Pedro Ribeiro <p.m42.ribeiro at gmail.com>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
#. Type: string
#. Description
@@ -54,7 +56,7 @@ msgid ""
"configure. Multiple interface names should be entered as a space-separated "
"list."
msgstr ""
-"Por favor especifique que interface(s) de rede deve o DHCP relay tentar "
+"Por favor especifique que interface(s) de rede deve o relay de DHCP tentar "
"configurar. Vários nomes de interfaces devem ser introduzidos como uma lista "
"separada por espaços."
@@ -74,15 +76,13 @@ msgstr ""
#. Description
#: ../isc-dhcp-relay.templates:4001
msgid "Additional options for the DHCP relay daemon:"
-msgstr "Opções adicionais para o daemon de reencaminhamento DHCP:"
+msgstr "Opções adicionais para o daemon de relay de DHCP:"
#. Type: string
#. Description
#: ../isc-dhcp-relay.templates:4001
msgid "Please specify any additional options for the DHCP relay daemon."
-msgstr ""
-"Por favor especifique opções adicionais para o daemon de reencaminhamento "
-"DHCP."
+msgstr "Por favor especifique opções adicionais para o daemon de relay de DHCP."
#. Type: string
#. Description
@@ -99,7 +99,6 @@ msgstr "É necessária configuração manual depois da instalação"
#. Type: note
#. Description
#: ../isc-dhcp-server.templates:2001
-#, fuzzy
#| msgid ""
#| "After the DHCP server is installed, you will need to manually configure "
#| "it by editing the file /etc/isc-dhcp/dhcpd.conf. Please note that the "
@@ -111,8 +110,8 @@ msgid ""
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Depois de instalado o servidor de DHCP terá de o configurar manualmente "
-"editando o ficheiro /etc/isc-dhcp/dhcpd.conf. Por favor note que o dhcpd."
-"conf fornecido é apenas um exemplo e tem de ser adaptado ao ambiente de rede."
+"editando o ficheiro /etc/dhcp/dhcpd.conf. Por favor note que o dhcpd.conf "
+"fornecido é apenas um exemplo e tem de ser adaptado ao ambiente de rede."
#. Type: note
#. Description
--
ISC DHCP packaging for Debian
More information about the pkg-dhcp-commits
mailing list