Update Debian package

- Update debhelper compatibility to version 9.
- Update build-dependencies.
- Change group of ngircd.conf to "irc" in postinst script (this makes
  starting ngIRCd as user "irc" easier, for example when using systemd).
- Don't create /var/run/ircd during installation: this is handled by the
  SysV init script and the systemd service already.

diff --git a/contrib/Debian/compat b/contrib/Debian/compat
index b8626c4cff2849624fb67f87cd0ad72b163671ad..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/contrib/Debian/compat
+++ b/contrib/Debian/compat
@@ -1 +1 @@
-4
+9

diff --git a/contrib/Debian/control b/contrib/Debian/control
index 59a74ab5b4af7c18b505bf66d40576ce3d236866..158d9533420df60055c9dbb8eb0398a3fafd4057 100644 (file)
--- a/contrib/Debian/control
+++ b/contrib/Debian/control
@@ -2,13 +2,13 @@ Source: ngircd
 Section: net
 Priority: optional
 Maintainer: Alexander Barton <alex@barton.de>
-Build-Depends: debhelper (>> 4.0.0),
+Build-Depends: debhelper (>> 9.0.0),
     autotools-dev,
     expect,
     libz-dev,
     libwrap0-dev,
     libident-dev,
-    libgnutls-dev,
+    libgnutls28-dev,
     libpam0g-dev,
     telnet | telnet-ssl,
 Standards-Version: 3.9.1

diff --git a/contrib/Debian/ngircd.postinst b/contrib/Debian/ngircd.postinst
index 556793422965de19db04747dafb3217172c22c8a..f6e3c4f7e23946c166b9556d2e938da4d093c358 100755 (executable)
--- a/contrib/Debian/ngircd.postinst
+++ b/contrib/Debian/ngircd.postinst
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Debian post-installation script
-# $Id: ngircd.postinst,v 1.2 2006/12/26 14:44:40 alex Exp $
 #
 
 set -e
@@ -12,6 +11,7 @@ case "$1" in
                        # make sure that the configuration file is not
                        # world-readable, it contains passwords!
                        chmod o= /etc/ngircd/ngircd.conf
+                       chgrp irc /etc/ngircd/ngircd.conf
                fi
                ;;
 esac

diff --git a/contrib/Debian/rules b/contrib/Debian/rules
index 1630a0159393a3fef3c706bb32764c5a9e339b39..609a8dd6d0763c4fe675299d4e2e7dadae537b5a 100755 (executable)
--- a/contrib/Debian/rules
+++ b/contrib/Debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2016 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -140,7 +140,6 @@ install-ngircd: build-ngircd
        $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd
        rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/INSTALL*
        rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/COPYING*
-       mkdir -p $(CURDIR)/debian/ngircd/var/run/ircd
        cat $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/sample-ngircd.conf | \
         sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \
         sed -e "s|;ServerGID = 65534|ServerGID = irc|g" | \
@@ -157,7 +156,6 @@ install-ngircd-full: build-ngircd-full
        $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full
        rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/INSTALL*
        rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/COPYING*
-       mkdir -p $(CURDIR)/debian/ngircd-full/var/run/ircd
        cat $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/sample-ngircd.conf | \
         sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \
         sed -e "s|;ServerGID = 65534|ServerGID = irc|g" | \
@@ -176,7 +174,6 @@ install-ngircd-full-dbg: build-ngircd-full-dbg
        $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full-dbg
        rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/INSTALL*
        rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/COPYING*
-       mkdir -p $(CURDIR)/debian/ngircd-full-dbg/var/run/ircd
        cat $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg/sample-ngircd.conf | \
         sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \
         sed -e "s|;ServerGID = 65534|ServerGID = irc|g" | \
@@ -222,6 +219,6 @@ binary-arch: build install
 
 binary: binary-indep binary-arch
 
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install
 
 # -eof-