[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. upstream/4.1.1-69-g885154e
Andrew Pollock
apollock at debian.org
Thu Jul 8 06:27:41 UTC 2010
The following commit has been merged in the master branch:
commit 885154e15947a25466d635d66bf65bab008d7b4c
Author: Andrew Pollock <apollock at debian.org>
Date: Wed Jul 7 23:25:41 2010 -0700
Correctly build LDAP-enabled DHCP server
* add build-deps on autoconf and automake
* tweak debian/rules
* fixes bug #574754
Also remove bashism from reinstated dhcp3-client.postrm
Bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index 2533dce..87d9e47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ isc-dhcp (4.1.1-P1-8) UNRELEASED; urgency=low
* debian/dhcp3-server.postrm: bring back to clean up cruft
* Updated French debconf templates translation (closes: #588281)
* debian/isc-dhcp-server.templates: corrected /etc/dhcp3 -> /etc/dhcp
+ * debian/rules: correctly build LDAP-enabled DHCP server (closes: #574754)
+ * debian/control: build-depend on autoconf and automake
+ * debian/control: bump Standards-Version (no changes)
- -- Andrew Pollock <apollock at debian.org> Tue, 06 Jul 2010 17:38:58 -0700
+ -- Andrew Pollock <apollock at debian.org> Wed, 07 Jul 2010 23:24:31 -0700
isc-dhcp (4.1.1-P1-7) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9a87a4e..15daa51 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: net
Priority: important
Maintainer: Debian ISC DHCP maintainers <pkg-dhcp-devel at lists.alioth.debian.org>
Uploaders: Andrew Pollock <apollock at debian.org>
-Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, dpatch, po-debconf, libldap2-dev, libssl-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, dpatch, po-debconf, libldap2-dev, libssl-dev, autoconf, automake
+Standards-Version: 3.9.0
Package: isc-dhcp-server
Priority: optional
diff --git a/debian/dhcp3-client.postrm b/debian/dhcp3-client.postrm
index 9253f46..951b13d 100644
--- a/debian/dhcp3-client.postrm
+++ b/debian/dhcp3-client.postrm
@@ -2,7 +2,7 @@
set -e
-if [ "$1" == "purge" ]; then
+if [ "$1" = "purge" ]; then
# Remove old lease database
rm -f /var/lib/dhcp3/dhclient.*leases*
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 8c803a6..468bd13 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-05-31 08:26+0100\n"
"Last-Translator: Grumpa <v.matys at grumpa.net>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -111,7 +111,7 @@ msgstr "Po instalaci je vyžadováno ruÄnà nastavenÃ"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Po nainstalovánà DHCP serveru je potÅ™eba ho jeÅ¡tÄ› ruÄnÄ› nastavit úpravou "
diff --git a/debian/po/de.po b/debian/po/de.po
index 66aa3bf..ccf4a7e 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3_3.0.4-15_de\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-06-11 21:49+0200\n"
"Last-Translator: Erik Schanze <eriks at debian.org>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -117,7 +117,7 @@ msgstr "Manuelle Einstellungen nach der Installation erforderlich"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Nachdem der DHCP-Server installiert wurde, müssen Sie ihn manuell durch "
diff --git a/debian/po/es.po b/debian/po/es.po
index 84ab75f..9883c89 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -31,7 +31,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-05-30 21:43+0200\n"
"Last-Translator: Javier Fernández-Sanguino <jfs at debian.org>\n"
"Language-Team: Debian l10n spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -136,7 +136,7 @@ msgstr ""
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Después de instalar el servidor de DHCP necesitará configurarlo manualmente "
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 43e2416..f3612ec 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-12-21 11:01+0100\n"
"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
"Language-Team: Euskara <Librezale at librezale.org>\n"
@@ -110,7 +110,7 @@ msgstr "Eskuzko konfigurazioa beharrezkoa da instalatu ondoren."
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"DHCP birbidalketa zerbitzaria instalatu ondoren beharrezkoa /etc/isc-dhcp/"
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 416ffcc..bb9d28b 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3, 3.0.6.dfsg-1\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-10-20 22:30+0200\n"
"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -102,7 +102,7 @@ msgstr "Asetuksia tulee muokata käsin asennuksen jälkeen"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"DHCP-palvelimen asetuksia tiedostossa /etc/isc-dhcp/dhcpd.conf tarvitsee "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index b964bac..039b53a 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-06-06 20:37+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
-"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
"X-Generator: KBabel 1.11.4\n"
"X-Poedit-Country: SWITZERLAND\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -102,15 +102,21 @@ msgstr "Configuration du serveur DHCP requise après l'installation"
#. 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/dhcp3/dhcpd.conf. Please note that the dhcpd."
+#| "conf supplied is just a sample, and must be adapted to the network "
+#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Après l'installation du serveur DHCP, vous devrez le configurer vous-même en "
-"modifiant le fichier /etc/dhcp3/dhcpd.conf. Veuillez noter qu'un exemple "
-"de fichier dhcpd.conf est fourni, mais que cette configuration est partielle "
-"et qu'elle doit être adaptée à votre environnement réseau."
+"modifiant le fichier /etc/dhcp3/dhcpd.conf. Veuillez noter qu'un exemple de "
+"fichier dhcpd.conf est fourni, mais que cette configuration est partielle et "
+"qu'elle doit être adaptée à votre environnement réseau."
#. Type: note
#. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index ba8ad25..197de25 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-05-30 21:19+0200\n"
"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
"Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -103,7 +103,7 @@ msgstr "Hai que realizar configuración manual trala instalación"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Despois de instalar o servidor DHCP ha ter que configuralo á man editando o "
diff --git a/debian/po/it.po b/debian/po/it.po
index c37deb2..0efc302 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3 3.0.4-15 italian debconf templates\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-06-03 10:46+0200\n"
"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -106,7 +106,7 @@ msgstr "È necessaria una configurazione manuale al termine dell'installazione"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Terminata l'installazione del server DHCP, è necessario configurarlo andando "
diff --git a/debian/po/ja.po b/debian/po/ja.po
index accb296..f568ece 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3 3.1.0-2\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2008-01-27 21:26+0900\n"
"Last-Translator: Hideki Yamane(Debian-JP) <henrich at debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -114,7 +114,7 @@ msgstr "インストール後ã«æ‰‹å‹•ã§ã®è¨å®šãŒå¿…è¦ã§ã™"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"DHCP サーãƒã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å¾Œã€/etc/isc-dhcp/dhcpd.conf ファイルを編集ã—ã¦æ‰‹å‹•"
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 2a39567..61b62c4 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-06-19 23:09-0500\n"
"Last-Translator: Sunjae Park <darehanl at gmail.com>\n"
"Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
@@ -105,7 +105,7 @@ msgstr "설치 후 ì§ì ‘ ì„¤ì • í•„ìš”"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"DHCP 서버가 ì„¤ì¹˜ëœ í›„ /etc/isc-dhcp/dhcpd.conf 파ì¼ì„ ê³ ì³ì„œ 서버를 ì§ì ‘ ì„¤ì •"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index d5bd764..ebcc6be 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3_3.0.4-10_nl\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-06-01 13:56+0200\n"
"Last-Translator: Frans Pop <elendil at planet.nl>\n"
"Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -121,7 +121,7 @@ msgstr "Na de installatie is handmatige configuratie noodzakelijk"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Nadat de DHCP-server is geïnstalleerd, zal u deze nog handmatig moeten "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index fbc6d0a..1d1197c 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3 3.0.4-13\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\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"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -107,7 +107,7 @@ msgstr "É necessária configuração manual depois da instalação"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"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 "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index d1beacb..3cd5bfa 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2008-10-09 04:07-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw at debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
@@ -122,7 +122,7 @@ msgstr "Configuração manual requerida após a instalação"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Após a instalação do servidor DHCP será necessário configurá-lo manualmente "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 528bbd7..1ff3341 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3_3.0.4-15_ru\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-06-06 21:46+0400\n"
"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -117,7 +117,7 @@ msgstr "ПоÑле уÑтановки требуетÑÑ Ñ€ÑƒÑ‡Ð½Ð°Ñ Ð½Ð°ÑÑ‚Ñ€
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"ПоÑле того как DHCP-Ñервер уÑтановлен, вам нужно вручную наÑтроить его путём "
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 6bad48b..42dfe56 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3 3.0.6-1\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-08-17 23:36+0100\n"
"Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -101,7 +101,7 @@ msgstr "Po inštalácii sa vyžaduje manuálna konfigurácia"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Po inÅ¡talácii DHCP servera ho budete musieÅ¥ ruÄne nakonfigurovaÅ¥ editáciou "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index b71145e..1c7e831 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3 3.0.3-6\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2008-07-21 14:29+0100\n"
"Last-Translator: Martin Bagge <brother at bsnet.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -109,7 +109,7 @@ msgstr "Manuell konfiguration kr
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Efter att DHCP-servern är installerad behöver du manuellt konfigurera den "
diff --git a/debian/po/ta.po b/debian/po/ta.po
index d681fd7..ae6a125 100644
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-06-09 14:38+0530\n"
"Last-Translator: Dr.T.Vasudevan <agnihot3 at gmail.com>\n"
"Language-Team: TAMIL <ubuntu-l10n-tam at lists.ubuntu.com>\n"
@@ -107,7 +107,7 @@ msgstr "நிறà¯à®µà®²à¯à®•à¯à®•à¯à®ªà¯à®ªà®¿à®©à¯ கைமà¯à®±à¯ˆ
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"டிஹெசà¯à®šà®¿à®ªà®¿(DHCP) சேவயகம௠நிறà¯à®µà®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯à®®à¯ நீஙà¯à®•à®³à¯ அதை கைமà¯à®±à¯ˆà®¯à®¾à®• வடிவமைகà¯à®• வேணà¯à®Ÿà¯à®®à¯. "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index ad3a4ee..19ccfff 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -91,7 +91,7 @@ msgstr ""
#: ../isc-dhcp-server.templates:2001
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 979e965..4abb57a 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-05-31 15:22+0300\n"
"Last-Translator: Mehmet Türker <mturker at innova.com.tr>\n"
"Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -105,7 +105,7 @@ msgstr "DHCP sunucusu kurulumdan sonra elle yapılandırma gerektirir"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"DHCP sunucusu kurulduktan sonra /etc/isc-dhcp/dhcpd.conf dosyasını "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 3c3fe5b..d33d949 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dhcp3_3.0.4-14\n"
"Report-Msgid-Bugs-To: isc-dhcp at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-12 22:09-0700\n"
+"POT-Creation-Date: 2010-07-07 18:58-0700\n"
"PO-Revision-Date: 2007-06-02 15:46+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -123,7 +123,7 @@ msgstr "Cấu hình thủ công cần thiết sau khi cà i đặt"
#| "environment."
msgid ""
"After the DHCP server is installed, you will need to manually configure it "
-"by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
+"by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf "
"supplied is just a sample, and must be adapted to the network environment."
msgstr ""
"Sau khi cà i đặt xong trình phục vụ DHCP, bạn cần phải tự cấu hình nó bằng "
diff --git a/debian/rules b/debian/rules
index 64a64fc..71cbea9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,11 @@ CFLAGS += -DNOMINUM
patched-ldap/build-stamp:
dh_testdir
+
+ aclocal
+ autoconf
+ autoheader
+ automake --foreign --add-missing --copy
./configure \
--prefix=$(DESTDIR)/usr \
@@ -63,6 +68,11 @@ build: patch-stamp build-stamp
build-stamp: patched-ldap/build-stamp
dpatch deapply-until dhcp-4.1.0-ldap-code
+
+ aclocal
+ autoconf
+ autoheader
+ automake --foreign --add-missing --copy
./configure \
--prefix=$(DESTDIR)/usr \
--
ISC DHCP packaging for Debian
More information about the pkg-dhcp-commits
mailing list