/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: 2014-08-10 14:13:02 UTC
  • Revision ID: teddy@recompile.se-20140810141302-8q1xaaxlh8ho5joz
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal.

This deprecates the "se.recompile.Mandos.Client.PropertyChanged"
signal.  The new signal also adds support for noticing changes to the
"se.recompile.Mandos.Client.Secret" write-only property.

* mandos (dbus_annotations): Fix usage example in doc string.
  (DBusObjectWithProperties.PropertiesChanged): New; from D-Bus
                                                standard.
  (ClientDBus._interface): Set early instead of later.
  (ClientDBus.notifychangeproperty): Take new "invalidate_only"
                                     parameter, and pass in _interface
                                     as a default keyword argument.
  (ClientDBus.notifychangeproperty/setter): Also emit
                                            PropertiesChanged signal;
                                            emit new value or
                                            invalidation depending on
                                            "invalidate_only".
  (ClientDBus.secret): Apply notifychangeproperty with
                       "invalidate_only=True".
  (ClientDBus._foo): Removed defunct interface annotation.
  (ClientDBus.PropertyChanged): Add annotation; this method is now
                                deprecated.
  (main/MandosDBusService.GetAllClientsWithProperties): Use dictionary
                                                        comprehension.
* DBUS-API (Mandos Client Interface/Signals/PropertyChanged): Removed.
* mandos-monitor: Use standard "PropertiesChanged" signal instead of
                  old signal "PropertyChanged".
  (MandosClientPropertyCache.__init__): Connect to signal
                                        PropertiesChanged instead of
                                        PropertyChanged.
  (MandosClientPropertyCache._property_changed): Removed.
  (MandosClientPropertyCache.property_changed): Renamed to
                                                "properties_changed"
                                                and adapted to new
                                                call signature.
  (MandosClientWidget.properties_changed): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/make -f
2
 
# Sample debian/rules that uses debhelper.
3
 
#
4
 
# This file was originally written by Joey Hess and Craig Small.
5
 
# As a special exception, when this file is copied by dh-make into a
6
 
# dh-make output file, you may use that output file without restriction.
7
 
# This special exception was added by Craig Small in version 0.37 of dh-make.
8
 
#
9
 
# Modified to make a template file for a multi-binary package with separated
10
 
# build-arch and build-indep targets  by Bill Allombert 2001
11
 
 
12
 
# Uncomment this to turn on verbose mode.
13
 
#export DH_VERBOSE=1
14
 
 
15
 
# This has to be exported to make some magic below work.
16
 
export DH_OPTIONS
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
25
 
endif
26
 
 
27
 
configure: configure-stamp
28
 
configure-stamp:
29
 
        dh_testdir
30
 
        touch configure-stamp
31
 
 
32
 
build: build-arch build-indep
33
 
 
34
 
build-arch: build-arch-stamp
35
 
build-arch-stamp: configure-stamp
36
 
        dh_auto_build -- all doc
37
 
        touch $@
38
 
 
39
 
build-indep: build-indep-stamp
40
 
build-indep-stamp: configure-stamp
41
 
        dh_auto_build -- doc
42
 
        touch $@
43
 
 
44
 
clean:
45
 
        dh_testdir
46
 
        dh_testroot
47
 
        rm -f build-arch-stamp build-indep-stamp configure-stamp
48
 
        dh_auto_clean
49
 
        dh_clean
50
 
 
51
 
install: install-indep install-arch
52
 
install-indep:
53
 
        dh_testdir
54
 
        dh_testroot
55
 
        dh_prep
56
 
        dh_installdirs --indep
57
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos install-server
58
 
        dh_lintian
 
2
%:
 
3
        dh $@
 
4
 
 
5
override_dh_auto_build-arch:
 
6
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
 
7
 
 
8
override_dh_auto_build-indep:
 
9
        LC_ALL=en_US.utf8 dh_auto_build -- doc
 
10
 
 
11
override_dh_installinit-indep:
59
12
        dh_installinit --onlyscripts \
60
13
                --update-rcd-params="defaults 25 15"
61
 
        dh_install --indep
62
 
 
63
 
install-arch:
64
 
        dh_testdir
65
 
        dh_testroot
66
 
        dh_prep
67
 
        dh_installdirs --same-arch
68
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client install-client-nokey
69
 
        dh_lintian
70
 
        dh_install --same-arch
71
 
 
72
 
binary-common:
73
 
        dh_testdir
74
 
        dh_testroot
75
 
        dh_installchangelogs
76
 
        dh_installdocs
77
 
        dh_link
78
 
        dh_strip
79
 
        dh_compress
 
14
 
 
15
override_dh_auto_install-indep:
 
16
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos install-server
 
17
 
 
18
override_dh_auto_install-arch:
 
19
        $(MAKE) DESTDIR=$(CURDIR)/debian/mandos-client \
 
20
                install-client-nokey
 
21
 
 
22
override_dh_fixperms:
80
23
        dh_fixperms --exclude etc/keys/mandos \
81
24
                --exclude etc/mandos/clients.conf \
82
25
                --exclude etc/mandos/plugins.d \
83
 
                --exclude usr/lib/mandos/plugins.d
84
 
        dh_installdeb
85
 
        dh_shlibdeps
86
 
        dh_gencontrol
87
 
        dh_md5sums
88
 
        dh_builddeb
89
 
 
90
 
# Build architecture independant packages using the common target.
91
 
binary-indep: build-indep install-indep
92
 
        $(MAKE) -f debian/rules DH_OPTIONS=--indep binary-common
93
 
 
94
 
# Build architecture dependant packages using the common target.
95
 
binary-arch: build-arch install-arch
96
 
        $(MAKE) -f debian/rules DH_OPTIONS=--same-arch binary-common
97
 
 
98
 
binary: binary-arch binary-indep
99
 
 
100
 
.PHONY: build clean binary-indep binary-arch binary install \
101
 
                install-indep install-arch configure
 
26
                --exclude usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugins.d \
 
27
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
 
28
        chmod --recursive g-w -- \
 
29
        "$(CURDIR)/debian/mandos-client/usr/share/doc/mandos-client/examples/network-hooks.d"
 
30
 
 
31
override_dh_auto_test-arch: ;