/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: 2009-09-21 21:39:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090921213925-jbpt6tzu99otseng
Use D-Bus properties instead of our own methods.

* mandos (Client._datetime_to_milliseconds): Renamed to
                                             "_timedelta_to_milliseconds".
                                             All callers changed.
  (dbus_service_property): New decorator for D-Bus properties.
  (DBusPropertyException, DBusPropertyAccessException,
  DBusPropertyNotFound): New D-Bus exception classes.
  (DBusObjectWithProperties): New; extends "dbus.service.Object" with
                              support for properties.
  (ClientDBus): Inherit from, and call up to, "DBusObjectWithProperties".
  (ClientDBus.CheckedOK, ClientDBus.GetAllProperties,
  ClientDBus.SetChecker, ClientDBus.SetHost, ClientDBus.SetInterval,
  ClientDBus.SetSecret, ClientDBus.SetTimeout, ClientDBus.Enable,
  ClientDBus.StartChecker, ClientDBus.Disable,
  ClientDBus.StopChecker): Removed, replaced with properties.
  (ClientDBus.IsStillValid): Removed, superfluous.
  (ClientDBus.name_dbus_property,
  ClientDBus.fingerprint_dbus_property, ClientDBus.host_dbus_property,
  ClientDBus.created_dbus_property,
  ClientDBus.last_enabled_dbus_property,
  ClientDBus.enabled_dbus_property,
  ClientDBus.last_checked_ok_dbus_property,
  ClientDBus.timeout_dbus_property, ClientDBus.interval_dbus_property,
  ClientDBus.checker_dbus_property,
  ClientDBus.checker_running_dbus_property,
  ClientDBus.object_path_dbus_property,
  ClientDBus.secret_dbus_property): New D-Bus properties.

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
 
 
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:
79
65
        dh_testroot
80
66
        dh_installchangelogs
81
67
        dh_installdocs
82
 
        dh_installexamples
83
68
        dh_link
84
69
        dh_strip
85
70
        dh_compress
86
71
        dh_fixperms --exclude etc/keys/mandos \
87
72
                --exclude etc/mandos/clients.conf \
88
73
                --exclude etc/mandos/plugins.d \
89
 
                --exclude usr/lib/mandos/plugins.d \
90
 
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
 
74
                --exclude usr/lib/mandos/plugins.d
91
75
        dh_installdeb
92
76
        dh_shlibdeps
93
77
        dh_gencontrol