Update Debian package

[ngircd-alex.git] / contrib / Debian / rules

diff --git a/contrib/Debian/rules b/contrib/Debian/rules
index 868a04250a09d70d37a952c24d5cff545b268a3a..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-2009 Alexander Barton <alex@barton.de>
+# 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
@@ -42,6 +42,7 @@ configure-ngircd: configure
          --prefix=/usr \
          --sysconfdir=/etc/ngircd \
          --mandir=\$${prefix}/share/man \
+         --docdir=\$${prefix}/share/doc/ngircd \
          --with-syslog --with-zlib
 
 configure-ngircd-full: configure
@@ -52,8 +53,10 @@ configure-ngircd-full: configure
          --prefix=/usr \
          --sysconfdir=/etc/ngircd \
          --mandir=\$${prefix}/share/man \
+         --docdir=\$${prefix}/share/doc/ngircd-full \
          --with-syslog --with-zlib \
-         --with-gnutls --with-ident --with-tcp-wrappers --with-pam \
+         --with-gnutls --with-iconv --with-ident --with-tcp-wrappers \
+         --with-pam \
          --enable-ipv6
 
 configure-ngircd-full-dbg: configure
@@ -64,9 +67,11 @@ configure-ngircd-full-dbg: configure
          --prefix=/usr \
          --sysconfdir=/etc/ngircd \
          --mandir=\$${prefix}/share/man \
+         --docdir=\$${prefix}/share/doc/ngircd-full-dbg \
          --enable-debug --enable-sniffer \
          --with-syslog --with-zlib \
-         --with-gnutls --with-ident --with-tcp-wrappers --with-pam \
+         --with-gnutls --with-iconv --with-ident --with-tcp-wrappers \
+         --with-pam \
          --enable-ipv6
 
 build:
@@ -135,12 +140,10 @@ 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" | \
-        sed -e "s/;MotdFile = \/usr\/local\/etc\/ngircd.motd/MotdFile = \/etc\/ngircd\/ngircd.motd/g" | \
-        sed -e "s/;PidFile = \/var\/run\/ngircd\/ngircd.pid/PidFile = \/var\/run\/ircd\/ngircd.pid/g" \
+        sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \
+        sed -e "s|;ServerGID = 65534|ServerGID = irc|g" | \
+        sed -e "s|;PidFile = /var/run/ngircd/ngircd.pid|PidFile = /var/run/ircd/ngircd.pid|g" \
         >$(CURDIR)/debian/ngircd/etc/ngircd/ngircd.conf
        touch $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.motd
 
@@ -151,16 +154,12 @@ install-ngircd-full: build-ngircd-full
 
        # Add here commands to install the "full" package into debian/ngircd-full:
        $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full
-       rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/INSTALL*
-       rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/COPYING*
-       mv $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd \
-        $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full
-       mkdir -p $(CURDIR)/debian/ngircd-full/var/run/ircd
+       rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/INSTALL*
+       rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full/COPYING*
        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" | \
-        sed -e "s/;MotdFile = \/usr\/local\/etc\/ngircd.motd/MotdFile = \/etc\/ngircd\/ngircd.motd/g" | \
-        sed -e "s/;PidFile = \/var\/run\/ngircd\/ngircd.pid/PidFile = \/var\/run\/ircd\/ngircd.pid/g" \
+        sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \
+        sed -e "s|;ServerGID = 65534|ServerGID = irc|g" | \
+        sed -e "s|;PidFile = /var/run/ngircd/ngircd.pid|PidFile = /var/run/ircd/ngircd.pid|g" \
         >$(CURDIR)/debian/ngircd-full/etc/ngircd/ngircd.conf
        touch $(CURDIR)/debian/ngircd-full/etc/ngircd/ngircd.motd
        mkdir -p $(CURDIR)/debian/ngircd-full/etc/pam.d
@@ -173,16 +172,12 @@ install-ngircd-full-dbg: build-ngircd-full-dbg
 
        # Add here commands to install the "full" package into debian/ngircd-full:
        $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full-dbg
-       rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd/INSTALL*
-       rm $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd/COPYING*
-       mv $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd \
-        $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg
-       mkdir -p $(CURDIR)/debian/ngircd-full-dbg/var/run/ircd
+       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*
        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" | \
-        sed -e "s/;MotdFile = \/usr\/local\/etc\/ngircd.motd/MotdFile = \/etc\/ngircd\/ngircd.motd/g" | \
-        sed -e "s/;PidFile = \/var\/run\/ngircd\/ngircd.pid/PidFile = \/var\/run\/ircd\/ngircd.pid/g" \
+        sed -e "s|;ServerUID = 65534|ServerUID = irc|g" | \
+        sed -e "s|;ServerGID = 65534|ServerGID = irc|g" | \
+        sed -e "s|;PidFile = /var/run/ngircd/ngircd.pid|PidFile = /var/run/ircd/ngircd.pid|g" \
         >$(CURDIR)/debian/ngircd-full-dbg/etc/ngircd/ngircd.conf
        touch $(CURDIR)/debian/ngircd-full-dbg/etc/ngircd/ngircd.motd
        mkdir -p $(CURDIR)/debian/ngircd-full-dbg/etc/pam.d
@@ -214,7 +209,7 @@ binary-arch: build install
        dh_installdocs -a
        dh_installinit -a
        dh_strip -a --no-package=ngircd-full-dbg
-       dh_compress -a
+       dh_compress -a -XCommands.txt
        dh_fixperms -a
        dh_installdeb -a
        dh_shlibdeps -a
@@ -224,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-