diff --git a/debian/changelog b/debian/changelog
index 36c282d5277311f2d3168f9b3eef22b08f1aab67..5c77e8d0f900db26dce65d75103bd2ab12b24379 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+isc-dhcp (4.3.5~b1-1) unstable; urgency=medium
+
+ * New upstream beta release.
+ * Fix some lintian warnings.
+ * Increase standards version.
+ * Update version control fields.
+ * Fix new upstream spelling mistakes.
+
+ -- Michael Gilbert <mgilbert@debian.org> Sun, 11 Sep 2016 22:59:15 +0000
+
isc-dhcp (4.3.4-1) unstable; urgency=medium
* New upstream stable release (closes: #817158).
diff --git a/debian/control b/debian/control
index f8734898de37324a96e07f66dec9f8a9af9a0f64..895f57d088ed3653fc06d77a5c3921807285b16e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: net
Priority: important
Maintainer: Debian ISC DHCP maintainers <pkg-dhcp-devel@lists.alioth.debian.org>
Uploaders: Andrew Pollock <apollock@debian.org>, Michael Gilbert <mgilbert@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
+Vcs-Git: https://anonscm.debian.org/pkg-dhcp/isc-dhcp.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-dhcp/isc-dhcp.git;a=summary
Homepage: http://www.isc.org
Build-Depends:
dpkg-dev (>= 1.13.2),
@@ -16,7 +16,7 @@ Build-Depends:
libssl-dev,
libldap2-dev,
libbind-export-dev (>= 1:9.10.3.dfsg.P4-2),
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Package: isc-dhcp-server
Priority: optional
@@ -29,11 +29,9 @@ Depends:
Recommends:
isc-dhcp-common,
policycoreutils,
-Conflicts:
- dhcp,
- logcheck-database (<= 1.3.17~)
Breaks:
isc-dhcp-common (<= 4.3.3-1),
+ logcheck-database (<= 1.3.17~)
Replaces:
isc-dhcp-common (<= 4.3.3-1),
Suggests:
diff --git a/debian/isc-dhcp-client.postrm b/debian/isc-dhcp-client.postrm
index 285647c1b7789ad6c308a5c6f4a0d0a91c21495c..f2360479f235f0916646af1c654630e3c74c94ed 100644
--- a/debian/isc-dhcp-client.postrm
+++ b/debian/isc-dhcp-client.postrm
@@ -1,6 +1,6 @@
-#!/bin/sh -e
-#
-#
+#!/bin/sh
+
+set -e
if [ "$1" = "purge" ]; then
# Remove lease database
diff --git a/debian/isc-dhcp-relay.config b/debian/isc-dhcp-relay.config
index 4e0be80def3116661dd9e2e0d178733896074696..2922a3d889ff396b33262f3ad2909dbf19c99eca 100644
--- a/debian/isc-dhcp-relay.config
+++ b/debian/isc-dhcp-relay.config
@@ -1,6 +1,6 @@
-#!/bin/sh -e
-#
-#
+#!/bin/sh
+
+set -e
# Source debconf library.
. /usr/share/debconf/confmodule
diff --git a/debian/isc-dhcp-relay.postrm b/debian/isc-dhcp-relay.postrm
index 26b2736b5a84a4b6cf9b507d1bbe3e06d7198461..3a954b6b8b8eeb28053d59cfbb559d0f5b081ce5 100644
--- a/debian/isc-dhcp-relay.postrm
+++ b/debian/isc-dhcp-relay.postrm
@@ -1,6 +1,6 @@
-#!/bin/sh -e
-#
-#
+#!/bin/sh
+
+set -e
if [ "$1" = "purge" ]; then
# Remove init.d configuration file
diff --git a/debian/isc-dhcp-relay.prerm b/debian/isc-dhcp-relay.prerm
index 3640f7231652ec088fd4c6abe5637fd2bea0708b..bb78700b4159ebd128b29a0c1b93b78504abbdac 100644
--- a/debian/isc-dhcp-relay.prerm
+++ b/debian/isc-dhcp-relay.prerm
@@ -1,6 +1,6 @@
-#!/bin/sh -e
-#
-#
+#!/bin/sh
+
+set -e
invoke-rc.d isc-dhcp-relay stop
diff --git a/debian/isc-dhcp-server.config b/debian/isc-dhcp-server.config
index 80091aa8370b94cdc7dbc32966a3fdbe9a387726..f6dfdd00cd61dcb04a668b5daef1637074316e02 100644
--- a/debian/isc-dhcp-server.config
+++ b/debian/isc-dhcp-server.config
@@ -1,6 +1,6 @@
-#!/bin/sh -e
-#
-#
+#!/bin/sh
+
+set -e
# Source debconf library.
. /usr/share/debconf/confmodule
diff --git a/debian/isc-dhcp-server.postrm b/debian/isc-dhcp-server.postrm
index 95f18864020ba50c2380284bef6dae78747d6a0c..36df71b8fed9d07a01d59920233b8c8b496903a1 100644
--- a/debian/isc-dhcp-server.postrm
+++ b/debian/isc-dhcp-server.postrm
@@ -1,6 +1,4 @@
#!/bin/sh
-#
-#
set -e
diff --git a/debian/isc-dhcp-server.prerm b/debian/isc-dhcp-server.prerm
index e1299d6f0250b133db3db16f323ac43e979c37f2..65973632a4efa95b52e6b6be07bc6883f0e7e3aa 100644
--- a/debian/isc-dhcp-server.prerm
+++ b/debian/isc-dhcp-server.prerm
@@ -1,6 +1,4 @@
#!/bin/sh
-#
-#
set -e
diff --git a/debian/patches/fix-spelling-error.patch b/debian/patches/fix-spelling-error.patch
index fe519204e5ccd8df30fe3b13ecd6a8b06ca4fbf0..9ba986ed2080739ca009ae791e28abd0a231609c 100644
--- a/debian/patches/fix-spelling-error.patch
+++ b/debian/patches/fix-spelling-error.patch
@@ -1,4 +1,4 @@
-Description: fix spelling of necessary
+Description: fix spelling mistakes
Author: Michael Gilbert <mgilbert@debian.org>
--- a/common/parse.c
@@ -12,3 +12,34 @@ Author: Michael Gilbert <mgilbert@debian.org>
val, option->name);
/* If we've been told to allocate, that means that this
* (might) be an option code definition, so we'll create
+@@ -2398,7 +2398,7 @@ int parse_executable_statement (result,
+
+ token = next_token (&val, (unsigned *)0, cfile);
+ if (token != RBRACE) {
+- parse_warn (cfile, "expecting rigt brace.");
++ parse_warn (cfile, "expecting right brace.");
+ goto badx;
+ }
+ } else {
+--- a/client/dhclient.8
++++ b/client/dhclient.8
+@@ -337,7 +337,7 @@ a destination for DHCP protocol messages
+ has acquired an IP address. Normally,
+ .B dhclient
+ transmits these messages to 255.255.255.255 (the IP limited broadcast
+-address). Overriding this is mostly useful for debugging purposes. This
++address). Overridding this is mostly useful for debugging purposes. This
+ feature is not supported in DHCPv6 (\fB-6\fR) mode.
+ .TP
+ .BI \-g \ relay
+--- a/server/dhcpd.conf.5
++++ b/server/dhcpd.conf.5
+@@ -2663,7 +2663,7 @@ pool usage passes that level. After tha
+ output until the pool usage falls below the low threshold. If the low
+ threshold is not given, it default to a value of zero.
+ .PP
+-A special case occurs when the low threshold is set to be higer than
++A special case occurs when the low threshold is set to be higher than
+ the high threshold. In this case, a message will be generated each time
+ a lease is acknowledged when the pool usage is above the high threshold.
+ .PP