/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 at recompile
  • Date: 2012-02-26 11:47:19 UTC
  • mto: This revision was merged to the branch mainline in revision 561.
  • Revision ID: teddy@recompile.se-20120226114719-m3odq4s34ebt6hg8
Add facilities for D-Bus interface annotations and use them to mark
the old D-Bus interfaces as deprecated.

* mandos (dbus_interface_annotations): New decorator.
  (DBusObjectWithProperties._is_dbus_property): Removed.  All callers
                                                changed.
  (DBusObjectWithProperties._is_dbus_thing): New; generalized version
                                             of "_is_dbus_property".
  (DBusObjectWithProperties._get_all_dbus_properties): Removed.  All
                                                       callers
                                                       changed.
  (DBusObjectWithProperties._get_all_dbus_things): New; generalized
                                                   version of
                                                   "_get_all_dbus_properties".
  (DBusObjectWithProperties.Introspect): Also add interface
                                         annotation tags.
  (AlternateDBusNamesMetaclass.__new__): Also copy interface
                                         annotations.  Add
                                         "deprecated" annotation on
                                         old interface.
  (ClientDBus._foo): New interface annotation to mark non-compliance
                     with the standard property change signal
                     interface.
  (MandosDBusService): Inherit from DBusObjectWithProperties to get
                       interface annotation support.
  (MandosDBusService._foo): New interface annotation to mark
                            non-compliance with the standard property
                            change signal interface.

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