/mandos/trunk

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

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Teddy Hogeborn
  • Date: 2011-09-18 15:59:05 UTC
  • mfrom: (24.1.179 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110918155905-ngj2ig0yheralj1s
* DBUS-API: Document new "Expires" and "ExtendedTimeout" properties.
* README: Refer to the installed manual page more simply.
* mandos (Client.extended_timeout, Client.expires): New attributes.
  (Client.extended_timeout_milliseconds): New.
  (Client.__init__, Client.enable, Client.disable): Set new attributes.
  (Client.checked_ok): Take new "timeout" argument.
  (ClientDBus.expires): Transform into a property which sends a D-Bus
                        signal when changed.
  (ClientDBus._datetime_to_dbus): Return empty D-Bus string on None.
                                  All callers changed to use this.

  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property,
  ClientDBus.Host_dbus_property, ClientDBus.Timeout_dbus_property,
  ClientDBus.Interval_dbus_property,
  ClientDBus.Checker_dbus_property): Bug fix: Only send D-Bus signal
                                     if new value is different.
  (ClientDBus.Timeout_dbus_property): Use new "expires" attribute.
  (ClientDBus.Expires_dbus_property,
  ClientDBus.ExtendedTimeout_dbus_property): New D-Bus properties.
  (ClientHandler.handle): Bump time using extended_timeout value.
  (main.client_defaults): Change default values of "timeout" and
                          "interval", added new default value for
                          "extended_timeout".
* mandos-clients.conf.xml (OPTIONS): Changed default values of
                                     "interval" and "timeout".  Add
                                     new "extended_timeout" option.
  (EXAMPLE): Updated default values.
* mandos-ctl: Show new "ExtendedTimeout" D-Bus property and change it
              using new "--extended-timeout" option.
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new
                                      "--extended-timeout" option.
* mandos-monitor (MandosClientWidget.update): Use new "Expires" D-Bus
                                              property.
* mandos.xml (DESCRIPTION): Add reference to intro(8mandos) manual
                            page.
  (CHECKING): Refer to the new "extended_timeout" option in
  clients.conf.

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
 
18
32
configure: configure-stamp
19
33
configure-stamp:
20
34
        dh_testdir
38
52
        rm -f build-arch-stamp build-indep-stamp configure-stamp
39
53
        dh_auto_clean
40
54
        dh_clean
41
 
        debconf-updatepo
42
55
 
43
56
install: install-indep install-arch
44
57
install-indep:
48
61
        dh_installdirs --indep
49
62
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos install-server
50
63
        dh_lintian
51
 
        dh_installinit --onlyscripts --no-start \
 
64
        dh_installinit --onlyscripts \
52
65
                --update-rcd-params="defaults 25 15"
53
66
        dh_install --indep
54
67
 
66
79
        dh_testroot
67
80
        dh_installchangelogs
68
81
        dh_installdocs
69
 
        dh_installdebconf
70
82
        dh_link
71
83
        dh_strip
72
84
        dh_compress
73
85
        dh_fixperms --exclude etc/keys/mandos \
74
86
                --exclude etc/mandos/clients.conf \
 
87
                --exclude etc/mandos/plugins.d \
75
88
                --exclude usr/lib/mandos/plugins.d
76
89
        dh_installdeb
77
90
        dh_shlibdeps