diff options
| author | Alexander Barton <alex@barton.de> | 2012-10-06 18:25:43 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2012-10-06 18:26:25 +0200 |
| commit | 46b0eef721b9b3eec37d29aff65b6a7fc488a887 (patch) | |
| tree | d863ced9e38b1e6e38c8fef3afa984d69984ab45 /contrib/Debian | |
| parent | 4790d78c980c79abfd71c064be1eb085717210f8 (diff) | |
| parent | 343a90dc376eb9979151752ec33c64ca45b04802 (diff) | |
| download | ngircd-46b0eef721b9b3eec37d29aff65b6a7fc488a887.tar.gz ngircd-46b0eef721b9b3eec37d29aff65b6a7fc488a887.zip | |
Merge branch 'bug109-CHARCONV'
This closes bug #109. * bug109-CHARCONV: Debian: require "telnet" or "telnet-ssl" for building Debian ngircd-full[-dbg]: enable CHARCONV Add "CHARCONV" to "feature string" when enabled Implement new IRC+ "CHARCONV" command Added new configure option "--with-iconv" Conflicts: src/ngircd/messages.h
Diffstat (limited to 'contrib/Debian')
| -rw-r--r-- | contrib/Debian/control | 2 | ||||
| -rwxr-xr-x | contrib/Debian/rules | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/contrib/Debian/control b/contrib/Debian/control index d6cf418c..59a74ab5 100644 --- a/contrib/Debian/control +++ b/contrib/Debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>> 4.0.0), libident-dev, libgnutls-dev, libpam0g-dev, - telnet, + telnet | telnet-ssl, Standards-Version: 3.9.1 Package: ngircd diff --git a/contrib/Debian/rules b/contrib/Debian/rules index 868a0425..0aecde56 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-2009 Alexander Barton <alex@barton.de> +# Copyright (c)2001-2012 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 @@ -53,7 +53,8 @@ configure-ngircd-full: configure --sysconfdir=/etc/ngircd \ --mandir=\$${prefix}/share/man \ --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 @@ -66,7 +67,8 @@ configure-ngircd-full-dbg: configure --mandir=\$${prefix}/share/man \ --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: |