about summary refs log tree commit diff
path: root/contrib/Debian/control
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2012-10-06 18:25:43 +0200
committerAlexander Barton <alex@barton.de>2012-10-06 18:26:25 +0200
commit46b0eef721b9b3eec37d29aff65b6a7fc488a887 (patch)
treed863ced9e38b1e6e38c8fef3afa984d69984ab45 /contrib/Debian/control
parent4790d78c980c79abfd71c064be1eb085717210f8 (diff)
parent343a90dc376eb9979151752ec33c64ca45b04802 (diff)
downloadngircd-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/control')
-rw-r--r--contrib/Debian/control2
1 files changed, 1 insertions, 1 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