[pkg-dhcp-commits] [isc-dhcp] 04/04: release 4.3.5~b1-1
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Sep 11 23:39:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository isc-dhcp.
commit feb80a90ca940adbf8c83f908fcc4032e554d9d6
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Sep 11 23:26:46 2016 +0000
release 4.3.5~b1-1
---
debian/changelog | 10 ++++++++++
debian/control | 10 ++++------
debian/isc-dhcp-client.postrm | 6 +++---
debian/isc-dhcp-relay.config | 6 +++---
debian/isc-dhcp-relay.postrm | 6 +++---
debian/isc-dhcp-relay.prerm | 6 +++---
debian/isc-dhcp-server.config | 6 +++---
debian/isc-dhcp-server.postrm | 2 --
debian/isc-dhcp-server.prerm | 2 --
debian/patches/fix-spelling-error.patch | 33 ++++++++++++++++++++++++++++++++-
10 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 36c282d..5c77e8d 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 at 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 f873489..895f57d 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>, 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
+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 285647c..f236047 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 4e0be80..2922a3d 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 26b2736..3a954b6 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 3640f72..bb78700 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 80091aa..f6dfdd0 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 95f1886..36df71b 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 e1299d6..6597363 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 fe51920..9ba986e 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 at debian.org>
--- a/common/parse.c
@@ -12,3 +12,34 @@ Author: Michael Gilbert <mgilbert at 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
--
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