[pkg-dhcp-commits] [isc-dhcp] 02/02: release 4.3.1-4

Michael Gilbert mgilbert at moszumanska.debian.org
Mon Oct 13 03:36:29 UTC 2014 

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit d84e0be5a95321bf519490c1a859e040f691273c
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon Oct 13 03:34:52 2014 +0000

    release 4.3.1-4
---
 debian/changelog                     |  8 ++++++++
 debian/control                       | 10 +++++-----
 debian/copyright                     |  4 ++--
 debian/dhclient-script.kfreebsd.udeb |  2 +-
 debian/dhclient-script.linux         |  2 +-
 debian/isc-dhcp-client.install       |  4 ++--
 debian/isc-dhcp-client.manpages      |  1 +
 debian/isc-dhcp-common.install       |  4 ----
 debian/isc-dhcp-common.manpages      |  2 ++
 debian/isc-dhcp-dev.install          |  4 +---
 debian/isc-dhcp-dev.manpages         |  2 ++
 debian/isc-dhcp-server.install       |  4 +---
 debian/isc-dhcp-server.manpages      |  4 ++++
 13 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79a6116..fc2ca60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+isc-dhcp (4.3.1-4) unstable; urgency=medium
+
+  * Bump standards to 3.9.6.
+  * Correct netmask handling in dhclient-script.linux.udeb (closes: #759761).
+  * Fix missing alias_subnet_mask in dhclient-script.linux (closes: #691091).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 05 Oct 2014 22:10:15 +0000
+
 isc-dhcp (4.3.1-3) unstable; urgency=medium
 
   * Ignore arguments passed to sourced scripts (closes: #763208).
diff --git a/debian/control b/debian/control
index 8edb5f5..199bf7b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian ISC DHCP maintainers <pkg-dhcp-devel at lists.alioth.debian.org>
 Uploaders: Andrew Pollock <apollock at debian.org>, Michael Gilbert <mgilbert at debian.org>
 Vcs-Git: git://anonscm.debian.org/pkg-dhcp/isc-dhcp.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-dhcp/isc-dhcp.git;a=summary
+Homepage: http://www.isc.org
 Build-Depends:
  groff,
  quilt,
@@ -15,7 +16,7 @@ Build-Depends:
  dh-autoreconf,
  debhelper (>= 9),
  dpkg-dev (>= 1.13.2),
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 
 Package: isc-dhcp-server
 Priority: optional
@@ -131,7 +132,7 @@ Suggests:
  avahi-autoipd
 Provides:
  dhcp-client,
-Description: ISC DHCP client
+Description: DHCP client for automatically obtaining an IP address
  This is the Internet Software Consortium's DHCP client. 
  .
  Dynamic Host Configuration Protocol (DHCP) is a protocol like BOOTP
@@ -163,10 +164,9 @@ Priority: extra
 Architecture: any
 Section: debian-installer
 Depends:
- ${shlibs:Depends}
-XC-Package-Type: udeb
+ ${shlibs:Depends},
+Package-Type: udeb
 Description: ISC DHCP Client for debian-installer
- dhcp-client-udeb is a minimal dhcp package used by the debian-installer.
 
 Package: isc-dhcp-relay
 Priority: optional
diff --git a/debian/copyright b/debian/copyright
index 473f166..1ab9dce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,7 @@ Files: *
 Copyright:
  2004-2014 by Internet Systems Consortium, Inc. ("ISC")
  1995-2003 by Internet Software Consortium
-License: ISC License
+License: ISC
  Permission to use, copy, modify, and distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
@@ -33,5 +33,5 @@ Files: debian/*
 Copyright:
  2008-2013 Andrew Pollock <apollock at debian.org>
  2011-2014 Michael Gilbert <mgilbert at debian.org>
-License: ISC License
+License: ISC
  See above.
diff --git a/debian/dhclient-script.kfreebsd.udeb b/debian/dhclient-script.kfreebsd.udeb
index 0638cd8..33b212d 100644
--- a/debian/dhclient-script.kfreebsd.udeb
+++ b/debian/dhclient-script.kfreebsd.udeb
@@ -82,7 +82,7 @@ case "$reason" in
            [ "$old_ip_address" != "$new_ip_address" ] ||
            [ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then
 
-            ifconfig $interface inet $new_ip_address $new_subnet_arg \
+            ifconfig $interface inet $new_ip_address ${new_subnet_mask:+netmask $new_subnet_mask} \
                 ${new_broadcast_address:+broadcast $new_broadcast_address} $medium $mtu_arg
             route add $new_ip_address 127.1 $metric_arg >/dev/null 2>&1 || true
             for router in $new_routers; do
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 299d02e..14e68d4 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -278,7 +278,7 @@ case "$reason" in
 
         if [ -n "$alias_ip_address" ]; then
             # alias IP given => set it & add host route to it
-            ip -4 addr add ${alias_ip_address}${alias_network_arg} \
+            ip -4 addr add ${alias_ip_address}${alias_subnet_mask:+/$alias_subnet_mask} \
                 dev ${interface} label ${interface}:0
             ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
         fi
diff --git a/debian/isc-dhcp-client.install b/debian/isc-dhcp-client.install
index 522ba47..73e14af 100644
--- a/debian/isc-dhcp-client.install
+++ b/debian/isc-dhcp-client.install
@@ -1,6 +1,6 @@
 usr/sbin/dhclient sbin
+
 debian/dhclient.conf etc/dhcp
+
 debian/debug etc/dhcp/dhclient-exit-hooks.d
 debian/debug etc/dhcp/dhclient-enter-hooks.d
-
-usr/share/man/*/dhclient*
diff --git a/debian/isc-dhcp-client.manpages b/debian/isc-dhcp-client.manpages
new file mode 100644
index 0000000..894b58e
--- /dev/null
+++ b/debian/isc-dhcp-client.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/*/dhclient*
diff --git a/debian/isc-dhcp-common.install b/debian/isc-dhcp-common.install
index f48021c..273da5b 100644
--- a/debian/isc-dhcp-common.install
+++ b/debian/isc-dhcp-common.install
@@ -1,5 +1 @@
 usr/bin/omshell
-usr/share/man/man5/dhcp-*
-usr/share/man/man1/omshell.*
-doc/ja_JP.eucJP/*.5 usr/share/man/ja/man5
-doc/ja_JP.eucJP/*.8 usr/share/man/ja/man8
diff --git a/debian/isc-dhcp-common.manpages b/debian/isc-dhcp-common.manpages
new file mode 100644
index 0000000..29a941b
--- /dev/null
+++ b/debian/isc-dhcp-common.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man5/dhcp-*
+debian/tmp/usr/share/man/man1/omshell.*
diff --git a/debian/isc-dhcp-dev.install b/debian/isc-dhcp-dev.install
index bc19eed..4418816 100644
--- a/debian/isc-dhcp-dev.install
+++ b/debian/isc-dhcp-dev.install
@@ -1,4 +1,2 @@
-usr/include
 usr/lib
-usr/share/man/man3/dhcpctl.3
-usr/share/man/man3/omapi.3
+usr/include
diff --git a/debian/isc-dhcp-dev.manpages b/debian/isc-dhcp-dev.manpages
new file mode 100644
index 0000000..930ed4d
--- /dev/null
+++ b/debian/isc-dhcp-dev.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man3/omapi.3
+debian/tmp/usr/share/man/man3/dhcpctl.3
diff --git a/debian/isc-dhcp-server.install b/debian/isc-dhcp-server.install
index 3cc2931..b5b95f0 100644
--- a/debian/isc-dhcp-server.install
+++ b/debian/isc-dhcp-server.install
@@ -1,5 +1,3 @@
-usr/share/man/man5/dhcpd.conf.5
-usr/share/man/man5/dhcpd.leases.5
-usr/share/man/man8/dhcpd.8
 usr/sbin/dhcpd
+
 debian/dhcpd.conf etc/dhcp
diff --git a/debian/isc-dhcp-server.manpages b/debian/isc-dhcp-server.manpages
new file mode 100644
index 0000000..fd117de
--- /dev/null
+++ b/debian/isc-dhcp-server.manpages
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/man/man5/dhcpd.conf.5
+debian/tmp/usr/share/man/man5/dhcpd.leases.5
+
+debian/tmp/usr/share/man/man8/dhcpd.8

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git

More information about the pkg-dhcp-commits mailing list