/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 debian/rules

* mandos (Client.timeout, Client.interval): Changed from being a
                                            property to be a normal
                                            attribute.
  (Client._timeout, Client._interval): Removed.
  (Client._timeout_milliseconds): Changed from being an attribute to
                                  be a method "timeout_milliseconds".
                                  All users changed.
  (Client._interval_milliseconds): Changed from being an attribute to
                                   be method "interval_milliseconds".
                                   All users changed.
  (Client.__init__): Take additional "use_dbus" keyword argument.
                     Only provide D-Bus interface if "use_dbus" is
                     True.
  (Client.use_dbus): New attribute.
  (Client.dbus_object_path): Changed to only be set if "self.use_dbus"
                             is True.
  (Client.enable, Client.disable, Client.checker_callback,
  Client.bump_timeout, Client.start_checker, Client.stop_checker):
  Only emit D-Bus signals if "self.use_dbus".
  (Client.SetChecker, Client.SetHost, Client.Enable): Bug fix: Emit
                                                      D-Bus signals.
  (Client.SetInterval, Client.SetTimeout): Changed to emit D-Bus
                                           signals.

  (main): Remove deprecated "default" keyword argument to "--check"
          option.  Added new "--no-dbus" option.  Added corresponding
          "use_dbus" server configuration option.  Only provide D-Bus
          interface and emit D-Bus signals if "use_dbus".  Pass
          "use_dbus" on to Client constructor.

* mandos-options.xml ([@id="dbus"]): New option.

* mandos.conf (use_dbus): New option.

* mandos.conf.xml (OPTIONS): New option "use_dbus".
  (EXAMPLE): - '' -

* mandos.xml (SYNOPSIS): New option "--no-dbus".
  (D-BUS INTERFACE): New section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# This has to be exported to make some magic below work.
16
16
export DH_OPTIONS
17
17
 
18
 
# -pie was broken briefly on the mips and mipsel architectures, see
19
 
# <http://bugs.debian.org/526961>
20
 
BINUTILS_V := $(shell dpkg-query --showformat='$${Version}' \
21
 
                        --show binutils)
22
 
ifeq (yes,$(shell dpkg --compare-versions $(BINUTILS_V) lt 2.20-3 \
23
 
                && dpkg --compare-versions $(BINUTILS_V) ge 2.19.1-1 \
24
 
                && echo yes))
25
 
  ifneq (,$(strip $(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:) \
26
 
                $(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:)))
27
 
    BROKEN_PIE := yes
28
 
    export BROKEN_PIE
29
 
  endif
30
 
endif
31
 
 
32
18
configure: configure-stamp
33
19
configure-stamp:
34
20
        dh_testdir
38
24
 
39
25
build-arch: build-arch-stamp
40
26
build-arch-stamp: configure-stamp
41
 
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
 
27
        dh_auto_build -- all doc
42
28
        touch $@
43
29
 
44
30
build-indep: build-indep-stamp
45
31
build-indep-stamp: configure-stamp
46
 
        LC_ALL=en_US.UTF-8 dh_auto_build -- doc
 
32
        dh_auto_build -- doc
47
33
        touch $@
48
34
 
49
35
clean:
52
38
        rm -f build-arch-stamp build-indep-stamp configure-stamp
53
39
        dh_auto_clean
54
40
        dh_clean
 
41
        debconf-updatepo
55
42
 
56
43
install: install-indep install-arch
57
44
install-indep:
61
48
        dh_installdirs --indep
62
49
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos install-server
63
50
        dh_lintian
64
 
        dh_installinit --onlyscripts \
 
51
        dh_installinit --onlyscripts --no-start \
65
52
                --update-rcd-params="defaults 25 15"
66
53
        dh_install --indep
67
54
 
79
66
        dh_testroot
80
67
        dh_installchangelogs
81
68
        dh_installdocs
 
69
        dh_installdebconf
82
70
        dh_link
83
71
        dh_strip
84
72
        dh_compress
85
73
        dh_fixperms --exclude etc/keys/mandos \
86
74
                --exclude etc/mandos/clients.conf \
87
75
                --exclude etc/mandos/plugins.d \
88
 
                --exclude usr/lib/mandos/plugins.d \
89
 
                --exclude usr/share/doc/mandos-client/network-hooks.d
 
76
                --exclude usr/lib/mandos/plugins.d
90
77
        dh_installdeb
91
78
        dh_shlibdeps
92
79
        dh_gencontrol