Codebase list xapp / b5873c6
set libexecdir to lib/$TRIPLE, adjust install files We are building with --Dlibexecdir=lib/$(DEB_TARGET_MULTIARCH) so that the xapp-sn-watcher binary is correctly placed in an arch-dependent directory. The other libexec files (applet_constants.py mate-xapp-status-applet.py) are installed into arch-deps but arch-all package xapp1-common, and thus cannot use the $(DEB_TARGET_MULTIARCH) directory. Since the location of the Python files are not hard-coded in the source but only in the service and desktop file, we install the .py into /usr/libexec, and patch the service and aplet files to use the updated path. Norbert Preining 3 years ago
5 changed file(s) with 39 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all
00 usr/lib/*/libxapp.so.1
11 usr/lib/*/libxapp.so.1.*
2 usr/libexec/xapps/sn-watcher/*
2 usr/lib/*/xapps/sn-watcher/*
0 We are building with --Dlibexecdir=lib/$(DEB_TARGET_MULTIARCH) so that the
1 xapp-sn-watcher binary is correctly placed in an arch-dependent directory.
2
3 The other libexec files (applet_constants.py mate-xapp-status-applet.py)
4 are installed into arch-deps but arch-all package xapp1-common, and thus
5 cannot use the $(DEB_TARGET_MULTIARCH) directory.
6
7 Since the location of the Python files are not hard-coded in the source but
8 only in the service and desktop file, we install the .py into /usr/libexec,
9 and patch the service and aplet files to use the updated path.
10 ---
11 status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service.in | 2 +-
12 status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-)
14
15 --- a/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service.in
16 +++ b/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service.in
17 @@ -1,3 +1,3 @@
18 [D-BUS Service]
19 Name=org.mate.panel.applet.MateXAppStatusAppletFactory
20 -Exec=@libexec@/xapps/mate-xapp-status-applet.py
21 +Exec=/usr/libexec/xapps/mate-xapp-status-applet.py
22 --- a/status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in
23 +++ b/status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in
24 @@ -1,7 +1,7 @@
25 [Applet Factory]
26 Id=MateXAppStatusAppletFactory
27 InProcess=false
28 -Location=@libexec@/xapps/mate-xapp-status-applet.py
29 +Location=/usr/libexec/xapps/mate-xapp-status-applet.py
30 Name=XApp Status Applet Factory
31 Description=Area where XApp status icons appear
32
0 remap-archall-libexec
00 #!/usr/bin/make -f
1
2 include /usr/share/dpkg/architecture.mk
13
24 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,now
35
68
79 override_dh_auto_configure:
810 dh_auto_configure -- \
11 -D libexecdir=lib/$(DEB_TARGET_MULTIARCH) \
912 -D docs=true \
1013 -D deprecated_warnings=false
44 usr/share/icons
55 usr/share/locale
66 usr/share/mate-panel/applets/org.x.MateXAppStatusApplet.mate-panel-applet
7 usr/libexec/xapps/*.py
87 etc/xdg/autostart/xapp-sn-watcher.desktop
8 usr/lib/*/xapps/*.py usr/libexec/xapps/