/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-monitor: Speedup: Use properties from D-Bus
                  GetAllClientsWithProperties() call.  Also use
                  super() properly - only use keyword arguments and
                  strip them off as "kwargs" is passed on.
  (MandosClientPropertyCache.__init__): Take new "properties"
                                        argument; use it to skip
                                        calling D-Bus GetAll() method.
                                        Call super().  Bind self._
  (MandosClientPropertyCache._property_changed): New helper function.
  (MandosClientPropertyCache.property_changed): Changed to take
                                                keyword arguments.
  (MandosClientPropertyCache.delete): Bug fix: Don't call
                                      super().__init__().
  (MandosClientWidget.__init__): Don't take *args.  Strip used keyword
                                 arguments before calling super().
  (MandosClientWidget.property_changed): Removed dead code.
  (MandosClientWidget.delete): Don't take *args.
  (MandosClientWidget.property_changed): Don't take "value" argument,
                                         since it is not used.
  (ConstrainedListBox.keypress): Take *args, **kwargs and pass them on
                                 to super().

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
 
ifneq (,$(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:))
19
 
  BROKEN_PIE := yes
20
 
  export BROKEN_PIE
21
 
endif
22
 
ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:))
23
 
  BROKEN_PIE := yes
24
 
  export BROKEN_PIE
 
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
25
30
endif
26
31
 
27
32
configure: configure-stamp
33
38
 
34
39
build-arch: build-arch-stamp
35
40
build-arch-stamp: configure-stamp
36
 
        dh_auto_build -- all doc
 
41
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
37
42
        touch $@
38
43
 
39
44
build-indep: build-indep-stamp
40
45
build-indep-stamp: configure-stamp
41
 
        dh_auto_build -- doc
 
46
        LC_ALL=en_US.UTF-8 dh_auto_build -- doc
42
47
        touch $@
43
48
 
44
49
clean:
80
85
        dh_fixperms --exclude etc/keys/mandos \
81
86
                --exclude etc/mandos/clients.conf \
82
87
                --exclude etc/mandos/plugins.d \
83
 
                --exclude usr/lib/mandos/plugins.d
 
88
                --exclude usr/lib/mandos/plugins.d \
 
89
                --exclude usr/share/doc/mandos-client/network-hooks.d
84
90
        dh_installdeb
85
91
        dh_shlibdeps
86
92
        dh_gencontrol