[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. upstream/4.1.1-P1-95-g8dcae8c

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 8dcae8ce6b3a053ecb0dc6133d23db30049adb46
Author: Andrew Pollock <apollock at debian.org>
Date:   Tue Nov 2 23:04:06 2010 -0700

    Correct groff de-warning patch
    
    Patch from Colin Watson for bug #602114

diff --git a/debian/changelog b/debian/changelog
index a90e93a..31afddc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.1.1-P1-12) UNRELEASED; urgency=low
+
+  * Updated patch to correct groff warnings in man pages, to be more
+    anatomically correct (thanks to Colin Watson) (closes: #602114)
+
+ -- Andrew Pollock <apollock at debian.org>  Tue, 02 Nov 2010 22:57:59 -0700
+
 isc-dhcp (4.1.1-P1-11) unstable; urgency=low
 
   * debian/control: make isc-dhcp-client's dependency on iproute Linux-only
diff --git a/debian/patches/fix_groff_warnings.dpatch b/debian/patches/fix_groff_warnings.dpatch
index bece816..6fe6a1a 100755
--- a/debian/patches/fix_groff_warnings.dpatch
+++ b/debian/patches/fix_groff_warnings.dpatch
@@ -6,14 +6,14 @@
 
 @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:16:30.000000000 -0700
+--- isc-dhcp~/common/dhcp-options.5	2010-11-01 16:52:08.000000000 +0000
++++ isc-dhcp/common/dhcp-options.5	2010-11-01 17:00:52.000000000 +0000
 @@ -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
++\&'.' character in the name, it is not fully-qualified, and the server will
  generally update that name in some locally-defined domain.
  .RE
  .PP
@@ -22,31 +22,31 @@ diff -urNad isc-dhcp~/common/dhcp-options.5 isc-dhcp/common/dhcp-options.5
  .PP
  The \fBpreference\fR option informs a DHCPv6 client which server is
 -'preferred' for use on a given subnet.  This preference is only
-+\'preferred\' for use on a given subnet.  This preference is only
++\&'preferred' for use on a given subnet.  This preference is only
  applied during the initial stages of configuration - once a client
  is bound to an IA, it will remain bound to that IA until it is no
  longer valid or has expired.  This value may be configured on the
 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:16:13.000000000 -0700
+--- isc-dhcp~/omapip/omapi.3	2010-11-01 16:52:08.000000000 +0000
++++ isc-dhcp/omapip/omapi.3	2010-11-01 17:01:03.000000000 +0000
 @@ -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\'
++\&'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:16:13.000000000 -0700
+--- isc-dhcp~/server/dhcpd.conf.5	2010-11-01 16:52:08.000000000 +0000
++++ isc-dhcp/server/dhcpd.conf.5	2010-11-01 17:01:22.000000000 +0000
 @@ -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
++\&'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

-- 
ISC DHCP packaging for Debian