diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Debian/changelog | 20 | ||||
| -rwxr-xr-x | contrib/Debian/rules | 22 | ||||
| -rw-r--r-- | contrib/ngircd.spec | 2 |
3 files changed, 29 insertions, 15 deletions
diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index f8332365..46e42112 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,23 @@ +ngircd (22-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 22. + + -- Alexander Barton <alex@barton.de> Sat, 11 Oct 2014 20:29:03 +0200 + +ngircd (22~rc1-0ab1) unstable; urgency=low + + * New "upstream" release candidate 1 for ngIRCd Release 22. + + -- Alexander Barton <alex@barton.de> Mon, 29 Sep 2014 17:07:55 +0200 + +ngircd (21.1-0ab2) unstable; urgency=low + + * Use correct package name in pathname to "HelpFile" (Command.txt) + in "ngircd-full" and "ngircd-full-dbg" packages. + * Don't adjust path names that are correct by default. + + -- Alexander Barton <alex@barton.de> Mon, 14 Jul 2014 11:20:17 +0200 + ngircd (21.1-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 21.1. diff --git a/contrib/Debian/rules b/contrib/Debian/rules index 4df0609c..1630a015 100755 --- 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-2012 Alexander Barton (alex@barton.de) and Contributors +# Copyright (c)2001-2014 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,6 +53,7 @@ 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-iconv --with-ident --with-tcp-wrappers \ --with-pam \ @@ -65,6 +67,7 @@ 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-iconv --with-ident --with-tcp-wrappers \ @@ -141,7 +144,6 @@ install-ngircd: build-ngircd 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" \ >$(CURDIR)/debian/ngircd/etc/ngircd/ngircd.conf touch $(CURDIR)/debian/ngircd/etc/ngircd/ngircd.motd @@ -153,16 +155,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 + 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" | \ - 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 @@ -176,16 +174,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 + 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" | \ - 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 diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index c49eff68..63adba91 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 21.1 +%define version 22 %define release 1 %define prefix %{_prefix} |