[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.0-1-39-ge3907f7

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 5d10fc0252d4b7b801ce8b918af012dd705cdcd2
Author: Andrew Pollock <apollock at debian.org>
Date:   Sun Aug 30 22:13:01 2009 -0700

    Patch groff warnings detected by Lintian

diff --git a/debian/changelog b/debian/changelog
index 19b724b..2d1b4c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ isc-dhcp (4.1.0-1) unstable; urgency=low
     upgrading from dhcp3-client
   * debian/changelog: added marker for legacy malformed changelog entry to
     placate Lintian
+  * Add a patch to correct groff warnings in man pages
 
- -- Andrew Pollock <apollock at debian.org>  Sun, 30 Aug 2009 18:02:09 -0700
+ -- Andrew Pollock <apollock at debian.org>  Sun, 30 Aug 2009 22:12:30 -0700
 
 dhcp3 (3.1.2-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index d872509..b25cfaa 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,23 +1,7 @@
 # emailed upstream
-#Makefile
-# emailed upstream
-#-#ddns-update-style-default
-#-## emailed upstream
 dhclient-script-exit-status
-#-## emailed upstream
-#-#dhclient.c.stale-pids
-#-## emailed upstream
-#-#dhcpd-chdir
-#-#dhclient-chdir
-#-## Not emailed upstream
-#-#remove-excessive-junk
-#-#site.conf
-#-## emailed upstream
-#-#add-libdst.a-dhcp3-dev
-#-## emailed upstream
-#-#ignore-invalid-interfaces
-#-## GNU/kfreebsd system
-#-#kfreebsd
+# emailed upstream
+fix_groff_warnings
 #ldap backend for dhcp3 server (docs and code)
 #dhcp-3.1.0-ldap-docs
 #dhcp-3.1.0-ldap-code
diff --git a/debian/patches/fix_groff_warnings.dpatch b/debian/patches/fix_groff_warnings.dpatch
new file mode 100755
index 0000000..a28d671
--- /dev/null
+++ b/debian/patches/fix_groff_warnings.dpatch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_groff_warnings.dpatch by  <apollock at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct errors in man pages detected by Lintian
+
+ at DPATCH@
+diff -urNad isc-dhcp~/common/dhcp-options.5 isc-dhcp/common/dhcp-options.5
+--- isc-dhcp~/common/dhcp-options.5	2009-06-23 22:15:20.000000000 -0700
++++ isc-dhcp/common/dhcp-options.5	2009-08-30 22:08:46.000000000 -0700
+@@ -1230,7 +1230,7 @@
+ .PP
+ Specifies the domain name that the client wishes to use.   This can be a
+ fully-qualified domain name, or a single label.   If there is no trailing
+-'.' character in the name, it is not fully-qualified, and the server will
++\'.\' character in the name, it is not fully-qualified, and the server will
+ generally update that name in some locally-defined domain.
+ .RE
+ .PP
+diff -urNad isc-dhcp~/omapip/omapi.3 isc-dhcp/omapip/omapi.3
+--- isc-dhcp~/omapip/omapi.3	2009-06-23 22:15:20.000000000 -0700
++++ isc-dhcp/omapip/omapi.3	2009-08-30 22:08:14.000000000 -0700
+@@ -37,7 +37,7 @@
+ used by the ISC DHCP server and this outline addresses the parts of
+ OMAPI appropriate to the clients of DHCP server. It does this by also
+ describing the use of a thin API layered on top of OMAPI called
+-'dhcpctl'
++\'dhcpctl\'
+ .PP
+ OMAPI uses TCP/IP as the transport for server communication, and
+ security can be imposed by having the client and server
+diff -urNad isc-dhcp~/server/dhcpd.conf.5 isc-dhcp/server/dhcpd.conf.5
+--- isc-dhcp~/server/dhcpd.conf.5	2009-06-23 22:15:20.000000000 -0700
++++ isc-dhcp/server/dhcpd.conf.5	2009-08-30 22:08:34.000000000 -0700
+@@ -820,7 +820,7 @@
+ normally).  This process is referred to as 'MAC Address Affinity', but this
+ is somewhat misnamed: it applies equally to DHCP Client Identifier options.
+ Note also that affinity is applied to leases when they enter the state
+-'free' from 'expired' or 'released'.  In this case also, leases will not
++\'free\' from \'expired\' or \'released\'.  In this case also, leases will not
+ be moved from free to backup if the secondary already has more than its
+ share.
+ .PP
diff --git a/debian/patches/remove-excessive-junk.dpatch b/debian/patches/remove-excessive-junk.dpatch
deleted file mode 100644
index a2319c6..0000000
--- a/debian/patches/remove-excessive-junk.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove-excessive-junk.dpatch by  <apollock at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes some unnecessary noise from the logs when logging errors
-
- at DPATCH@
-diff -urNad dhcp3-3.0.2/omapip/errwarn.c /tmp/dpep.f40ek4/dhcp3-3.0.2/omapip/errwarn.c
---- dhcp3-3.0.2/omapip/errwarn.c	2004-10-01 06:38:32.000000000 +1000
-+++ /tmp/dpep.f40ek4/dhcp3-3.0.2/omapip/errwarn.c	2005-06-15 12:47:51.798490662 +1000
-@@ -76,7 +76,7 @@
- 	  write (STDERR_FILENO, "\n", 1);
-   }
- 
--#if !defined (NOMINUM)
-+#if 0
-   log_error ("%s", "");
-   log_error ("If you did not get this software from ftp.isc.org, please");
-   log_error ("get the latest from ftp.isc.org and install that before");

-- 
ISC DHCP packaging for Debian