Module: ngircd.git Branch: master Commit: 37c8699f3403f8d45c1cfb1679be4248cfb1e726 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=37c86...

Author: Alexander Barton alex@barton.de Date: Sun Oct 20 18:06:21 2013 +0200

Debian: Fix default "HelpFile" file name in ngircd.conf

The "full" package variants must use "/usr/share/doc/ngircd-full/Commands.txt" and "/usr/share/doc/ngircd-full-dbg/Commands.txt" respectively.

---

contrib/Debian/changelog | 6 ++++++ contrib/Debian/rules | 26 ++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index a8aba17..c547703 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (21~rc2-0ab2) unstable; urgency=low + + * Fix default "HelpFile" file name in ngircd.conf for "full" packages. + + -- Alexander Barton alex@barton.de Sun, 20 Oct 2013 17:18:28 +0200 + ngircd (21~rc2-0ab1) unstable; urgency=low

* New "upstream" release candidate 2 for ngIRCd Release 21. diff --git a/contrib/Debian/rules b/contrib/Debian/rules index e02db22..c824db0 100755 --- a/contrib/Debian/rules +++ b/contrib/Debian/rules @@ -139,10 +139,10 @@ install-ngircd: build-ngircd 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|;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" \ >$(CURDIR)/debian/ngircd/etc/ngircd/ngircd.conf touch $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.motd

@@ -159,10 +159,11 @@ install-ngircd-full: build-ngircd-full $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full 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" | \ - 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|;MotdFile = /usr/local/etc/ngircd.motd|MotdFile = /etc/ngircd/ngircd.motd|g" | \ + sed -e "s|;HelpFile = /usr/share/doc/ngircd/Commands.txt|HelpFile = /usr/share/doc/ngircd-full/Commands.txt|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 @@ -181,10 +182,11 @@ install-ngircd-full-dbg: build-ngircd-full-dbg $(CURDIR)/debian/ngircd-full-dbg/usr/share/doc/ngircd-full-dbg 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" | \ - 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|;MotdFile = /usr/local/etc/ngircd.motd|MotdFile = /etc/ngircd/ngircd.motd|g" | \ + sed -e "s|;HelpFile = /usr/share/doc/ngircd/Commands.txt|HelpFile = /usr/share/doc/ngircd-full-dbg/Commands.txt|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