/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at bsnet
  • Date: 2010-10-05 18:57:05 UTC
  • mfrom: (237.7.2 mandos-local)
  • Revision ID: teddy@fukt.bsnet.se-20101005185705-wy8zfho4d936vlwu
Merge from trunk.

* debian/changelog: Include entry from NMU.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008-2010 Teddy Hogeborn
 
15
# Copyright © 2008-2010 Björn Påhlsson
16
16
# 
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
81
81
        SO_BINDTODEVICE = None
82
82
 
83
83
 
84
 
version = "1.0.14"
 
84
version = "1.2.1"
85
85
 
86
86
#logger = logging.getLogger(u'mandos')
87
87
logger = logging.Logger(u'mandos')
1684
1684
    parser.add_option("--debug", action=u"store_true",
1685
1685
                      help=u"Debug mode; run in foreground and log to"
1686
1686
                      u" terminal")
1687
 
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1687
    parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1688
1688
                      help=u"Debug level for stdout output")
1689
1689
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1690
1690
                      u" priority string (see GnuTLS documentation)")