/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.enable, Client.disable, ClientDBus.approve): Call
                    self.send_changedstate() after change, not before.
  (Client.disable): Bug fix: Handle disable_initiator_tag and
                    checker_initiator_tag of 0.
  (Client.init_checker): Bug fix: Remove old checker_initiator_tag and
                         disable_initiator_tag, if any.
  (Client.bump_timeout): Bug fix: Remove old disable_initiator_tag, if
                         any.
  (ClientDBus.Timeout_dbus_property): Bug fix: Use self.expires.
  (ClientHandler.handle): Bug fix: timedelta_to_milliseconds is a
                          global function, not a class method.
* mandos-monitor (MandosClientWidget._update_timer_callback_lock):
  Removed.  All users changed.
  (MandosClientWidget.last_checked_ok): Removed (unused).
  (MandosClientWidget.__init__): Don't call self.using_timer().
  (MandosClientWidget.property_changed): Removed unused version.
  (MandosClientWidget.using_timer): Stop using the counter
                                    self._update_timer_callback_lock;
                                    be strictly boolean.
  (MandosClientWidget.need_approval): Don't call self.using_timer().
  (MandosClientWidget.update): Call self.using_timer() throughout.
                               Bug fix: Never show negative timers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
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
24
38
 
25
39
build-arch: build-arch-stamp
26
40
build-arch-stamp: configure-stamp
27
 
        dh_auto_build -- all doc
 
41
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
28
42
        touch $@
29
43
 
30
44
build-indep: build-indep-stamp
31
45
build-indep-stamp: configure-stamp
32
 
        dh_auto_build -- doc
 
46
        LC_ALL=en_US.UTF-8 dh_auto_build -- doc
33
47
        touch $@
34
48
 
35
49
clean:
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 \
75
87
                --exclude etc/mandos/plugins.d \
76
 
                --exclude usr/lib/mandos/plugins.d
 
88
                --exclude usr/lib/mandos/plugins.d \
 
89
                --exclude usr/share/doc/mandos-client/network-hooks.d
77
90
        dh_installdeb
78
91
        dh_shlibdeps
79
92
        dh_gencontrol