Compiz

Merge lp:~bregma/compiz/lp-1395105 into lp:compiz/0.9.12

  1. lp-1395105
  2. Merge into 0.9.12
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3913
Merged at revision: 3911
Proposed branch: lp:~bregma/compiz/lp-1395105
Merge into: lp:compiz/0.9.12
Diff against target: 1086 lines (+488/-277)
20 files modified
CMakeLists.txt (+7/-6)
compizconfig/CMakeLists.txt (+6/-6)
compizconfig/compizconfig-python/CMakeLists.txt (+1/-1)
compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt (+1/-1)
debian/compiz-core.install (+6/-6)
debian/compiz-dev.install (+10/-10)
debian/compiz-gnome.install (+8/-8)
debian/compiz-plugins-default.install (+49/-25)
debian/compiz-plugins.install (+106/-57)
debian/compiz-plugins.install.armel (+92/-52)
debian/compiz-plugins.install.armhf (+92/-52)
debian/control (+24/-1)
debian/libcompizconfig0-dev.install (+5/-5)
debian/libcompizconfig0.install (+5/-5)
debian/libdecoration0-dev.install (+3/-3)
debian/libdecoration0.install (+1/-1)
debian/python-compizconfig.install (+3/-3)
debian/rules (+7/-0)
src/plugin.cpp (+42/-35)
src/plugin/tests/test-plugin.cpp (+20/-0)
To merge this branch: bzr merge lp:~bregma/compiz/lp-1395105
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+243031@code.launchpad.net

Commit message

added support for multi-arch installations

Description of the change

Tweaks build infrastructure and modifies packaging to produce multi-arch packages where possible.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3913
http://jenkins.qa.ubuntu.com/job/compiz-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/14/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3913
http://jenkins.qa.ubuntu.com/job/compiz-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/5
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/15/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3913
http://jenkins.qa.ubuntu.com/job/compiz-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/6
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/16/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3913
http://jenkins.qa.ubuntu.com/job/compiz-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/17/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Added inline comment.

I still need to compile it to be sure it builds fine...

review: Needs Information
lp:~bregma/compiz/lp-1395105 updated
3913. By Stephen M. Webb

added backwards-compatibility plugin loading for multi-arch

Revision history for this message
Stephen M. Webb (bregma) wrote :

I don't know how many times I removed that danged debian/changelog file change. It seem to be gone for good this time.

Revision history for this message
Christopher Townsend (townsend) wrote :

Ok, compiles and runs fine and code looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-11-18 09:39:57 +0000
3+++ CMakeLists.txt 2014-12-02 14:42:59 +0000
4@@ -8,6 +8,7 @@
5 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${COMPIZ_CMAKE_MODULE_PATH})
6
7 include (CTest)
8+include (GNUInstallDirs)
9
10 set (MEMORYCHECK_COMMAND_OPTIONS --trace-children=yes)
11 set (MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_SOURCE_DIR}/tests/experimental-memcheck/compiz.supp CACHE FILEPATH "" FORCE)
12@@ -64,15 +65,15 @@
13 if (COMPIZ_PACKAGING_ENABLED)
14 set (prefix ${CMAKE_INSTALL_PREFIX} CACHE PATH "prefix")
15 set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
16- set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "libdir")
17- set (includedir ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "includedir")
18- set (datadir ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "datadir")
19+ set (libdir ${CMAKE_INSTALL_FULL_LIBDIR} CACHE PATH "libdir")
20+ set (includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR} CACHE PATH "includedir")
21+ set (datadir ${CMAKE_INSTALL_FULL_DATAROOTDIR} CACHE PATH "datadir")
22 else (COMPIZ_PACKAGING_ENABLED)
23 set (prefix ${CMAKE_INSTALL_PREFIX} )
24 set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin )
25- set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
26- set (includedir ${CMAKE_INSTALL_PREFIX}/include )
27- set (datadir ${CMAKE_INSTALL_PREFIX}/share )
28+ set (libdir ${CMAKE_INSTALL_FULL_LIBDIR} )
29+ set (includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR} )
30+ set (datadir ${CMAKE_INSTALL_FULL_DATAROOTDIR} )
31 endif (COMPIZ_PACKAGING_ENABLED)
32
33 set (compiz_plugindir ${libdir}/compiz)
34
35=== modified file 'compizconfig/CMakeLists.txt'
36--- compizconfig/CMakeLists.txt 2013-05-13 13:30:19 +0000
37+++ compizconfig/CMakeLists.txt 2014-12-02 14:42:59 +0000
38@@ -5,14 +5,14 @@
39 set (COMPIZCONFIG_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR}/libcompizconfig)
40
41 if (COMPIZ_PACKAGING_ENABLED)
42- set (libcompizconfig_libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "libdir")
43- set (libcompizconfig_includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig CACHE PATH "includedir")
44- set (libcompizconfig_prefix ${CMAKE_INSTALL_PREFIX} CACHE PATH "prefix")
45- set (libcompizconfig_exec_prefix ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
46+ set (libcompizconfig_prefix ${CMAKE_INSTALL_PREFIX} CACHE PATH "prefix")
47+ set (libcompizconfig_libdir ${CMAKE_INSTALL_FULL_LIBDIR} CACHE PATH "libdir")
48+ set (libcompizconfig_includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}/compizconfig CACHE PATH "includedir")
49+ set (libcompizconfig_exec_prefix ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
50 else (COMPIZ_PACKAGING_ENABLED)
51- set (libcompizconfig_libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
52- set (libcompizconfig_includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig)
53 set (libcompizconfig_prefix ${CMAKE_INSTALL_PREFIX})
54+ set (libcompizconfig_libdir ${CMAKE_INSTALL_FULL_LIBDIR})
55+ set (libcompizconfig_includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}/compizconfig)
56 set (libcompizconfig_exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
57 endif (COMPIZ_PACKAGING_ENABLED)
58
59
60=== modified file 'compizconfig/compizconfig-python/CMakeLists.txt'
61--- compizconfig/compizconfig-python/CMakeLists.txt 2013-02-26 11:56:10 +0000
62+++ compizconfig/compizconfig-python/CMakeLists.txt 2014-12-02 14:42:59 +0000
63@@ -95,7 +95,7 @@
64 set (INSTALL_LAYOUT_DIR site-packages)
65 endif ($ENV{COMPIZ_DEB_BUILD})
66
67-set (PYTHON_MODULE_DIR ${libdir}/python${PY_VERSION}/${INSTALL_LAYOUT_DIR})
68+set (PYTHON_MODULE_DIR ${CMAKE_INSTALL_PREFIX}/lib/python${PY_VERSION}/${INSTALL_LAYOUT_DIR})
69
70 install (TARGETS compizconfig_python_module
71 DESTINATION ${PYTHON_MODULE_DIR})
72
73=== modified file 'compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt'
74--- compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt 2012-10-26 00:31:03 +0000
75+++ compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt 2014-12-02 14:42:59 +0000
76@@ -77,6 +77,6 @@
77 ${GSETTINGS_UTIL_LIBRARIES})
78
79 install (TARGETS compizconfig_gsettings_backend
80- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
81+ DESTINATION ${libdir})
82
83 endif (GSETTINGS_UTIL_FOUND)
84
85=== modified file 'debian/compiz-core.install'
86--- debian/compiz-core.install 2014-04-17 14:33:50 +0000
87+++ debian/compiz-core.install 2014-12-02 14:42:59 +0000
88@@ -1,7 +1,7 @@
89-debian/tmp/usr/bin/compiz*
90-debian/tmp/usr/lib/libcompiz_core.so.*
91-debian/tmp/usr/share/compiz/*.png
92-debian/tmp/usr/share/compiz/core.xml
93 debian/source_compiz.py usr/share/apport/package-hooks
94-debian/tmp/usr/share/locale
95-debian/tmp/usr/share/applications/compiz.desktop
96+usr/bin/compiz*
97+usr/lib/*/libcompiz_core.so.*
98+usr/share/applications/compiz.desktop
99+usr/share/compiz/core.xml
100+usr/share/compiz/*.png
101+usr/share/locale
102
103=== modified file 'debian/compiz-dev.install'
104--- debian/compiz-dev.install 2012-09-10 13:45:36 +0000
105+++ debian/compiz-dev.install 2014-12-02 14:42:59 +0000
106@@ -1,14 +1,14 @@
107 debian/tmp/usr/include/compiz/[!d]*
108-debian/tmp/usr/lib/libcompiz_core.so
109-debian/tmp/usr/lib/pkgconfig/compiz-animation.pc
110-debian/tmp/usr/lib/pkgconfig/compiz-compiztoolbox.pc
111-debian/tmp/usr/lib/pkgconfig/compiz-composite.pc
112-debian/tmp/usr/lib/pkgconfig/compiz-cube.pc
113-debian/tmp/usr/lib/pkgconfig/compiz-mousepoll.pc
114-debian/tmp/usr/lib/pkgconfig/compiz-opengl.pc
115-debian/tmp/usr/lib/pkgconfig/compiz.pc
116-debian/tmp/usr/lib/pkgconfig/compiz-scale.pc
117-debian/tmp/usr/lib/pkgconfig/compiz-text.pc
118+debian/tmp/usr/lib/*/libcompiz_core.so
119+debian/tmp/usr/lib/*/pkgconfig/compiz-animation.pc
120+debian/tmp/usr/lib/*/pkgconfig/compiz-compiztoolbox.pc
121+debian/tmp/usr/lib/*/pkgconfig/compiz-composite.pc
122+debian/tmp/usr/lib/*/pkgconfig/compiz-cube.pc
123+debian/tmp/usr/lib/*/pkgconfig/compiz-mousepoll.pc
124+debian/tmp/usr/lib/*/pkgconfig/compiz-opengl.pc
125+debian/tmp/usr/lib/*/pkgconfig/compiz.pc
126+debian/tmp/usr/lib/*/pkgconfig/compiz-scale.pc
127+debian/tmp/usr/lib/*/pkgconfig/compiz-text.pc
128 debian/tmp/usr/share/compiz/xslt
129 debian/tmp/usr/share/cmake*/FindCompiz.cmake
130 debian/tmp/usr/share/cmake*/Modules/FindCompiz.cmake
131
132=== modified file 'debian/compiz-gnome.install'
133--- debian/compiz-gnome.install 2013-02-19 15:22:31 +0000
134+++ debian/compiz-gnome.install 2014-12-02 14:42:59 +0000
135@@ -1,11 +1,11 @@
136-debian/tmp/usr/share/applications/compiz.desktop usr/share/gnome/wm-properties/
137-debian/tmp/usr/share/gnome-control-center
138-debian/tmp/usr/share/gconf/schemas/*.schemas
139-debian/tmp/usr/share/glib-2.0/schemas/*.xml
140-debian/tmp/usr/bin/gtk-window-decorator
141 debian/65compiz_profile-on-session /etc/X11/Xsession.d
142+debian/profile_upgrades/*.upgrade usr/share/compizconfig/upgrades
143 debian/unity.ini /etc/compizconfig/
144-debian/profile_upgrades/*.upgrade usr/share/compizconfig/upgrades
145-debian/tmp/usr/lib/compizconfig/backends/libgsettings.so
146-debian/tmp/usr/lib/libcompizconfig_gsettings_backend.so
147 postinst/convert-files/*.convert usr/lib/compiz/migration/
148+usr/bin/gtk-window-decorator
149+usr/lib/*/compizconfig/backends/libgsettings.so
150+usr/lib/*/libcompizconfig_gsettings_backend.so
151+usr/share/applications/compiz.desktop usr/share/gnome/wm-properties/
152+usr/share/gconf/schemas/*.schemas
153+usr/share/glib-2.0/schemas/*.xml
154+usr/share/gnome-control-center
155
156=== modified file 'debian/compiz-plugins-default.install'
157--- debian/compiz-plugins-default.install 2014-04-17 22:42:34 +0000
158+++ debian/compiz-plugins-default.install 2014-12-02 14:42:59 +0000
159@@ -1,26 +1,50 @@
160-debian/tmp/usr/*/compiz/*animation.*
161-debian/tmp/usr/*/compiz/*commands.*
162-debian/tmp/usr/*/compiz/*compiztoolbox.*
163-debian/tmp/usr/*/compiz/*composite.*
164-debian/tmp/usr/*/compiz/*copytex.*
165-debian/tmp/usr/*/compiz/*decor.*
166-debian/tmp/usr/*/compiz/*expo.*
167-debian/tmp/usr/*/compiz/*ezoom.*
168-debian/tmp/usr/*/compiz/*fade.*
169-debian/tmp/usr/*/compiz/*gnomecompat.*
170-debian/tmp/usr/*/compiz/*grid.*
171-debian/tmp/usr/*/compiz/*imgpng.*
172-debian/tmp/usr/*/compiz/*mousepoll.*
173-debian/tmp/usr/*/compiz/*move.*
174-debian/tmp/usr/*/compiz/*opengl.*
175-debian/tmp/usr/*/compiz/*place.*
176-debian/tmp/usr/*/compiz/*regex.*
177-debian/tmp/usr/*/compiz/*resize.*
178-debian/tmp/usr/*/compiz/*scale.*
179-debian/tmp/usr/share/compiz/scale
180-debian/tmp/usr/*/compiz/*session.*
181-debian/tmp/usr/*/compiz/*snap.*
182-debian/tmp/usr/*/compiz/*vpswitch.*
183-debian/tmp/usr/*/compiz/*wall.*
184-debian/tmp/usr/*/compiz/*workarounds.*
185+usr/lib/*/compiz/*animation.*
186+usr/share/compiz/*animation.*
187+usr/lib/*/compiz/*commands.*
188+usr/share/compiz/*commands.*
189+usr/lib/*/compiz/*compiztoolbox.*
190+usr/share/compiz/*compiztoolbox.*
191+usr/lib/*/compiz/*composite.*
192+usr/share/compiz/*composite.*
193+usr/lib/*/compiz/*copytex.*
194+usr/share/compiz/*copytex.*
195+usr/lib/*/compiz/*decor.*
196+usr/share/compiz/*decor.*
197+usr/lib/*/compiz/*expo.*
198+usr/share/compiz/*expo.*
199+usr/lib/*/compiz/*ezoom.*
200+usr/share/compiz/*ezoom.*
201+usr/lib/*/compiz/*fade.*
202+usr/share/compiz/*fade.*
203+usr/lib/*/compiz/*gnomecompat.*
204+usr/share/compiz/*gnomecompat.*
205+usr/lib/*/compiz/*grid.*
206+usr/share/compiz/*grid.*
207+usr/lib/*/compiz/*imgpng.*
208+usr/share/compiz/*imgpng.*
209+usr/lib/*/compiz/*mousepoll.*
210+usr/share/compiz/*mousepoll.*
211+usr/lib/*/compiz/*move.*
212+usr/share/compiz/*move.*
213+usr/lib/*/compiz/*opengl.*
214+usr/share/compiz/*opengl.*
215+usr/lib/*/compiz/*place.*
216+usr/share/compiz/*place.*
217+usr/lib/*/compiz/*regex.*
218+usr/share/compiz/*regex.*
219+usr/lib/*/compiz/*resize.*
220+usr/share/compiz/*resize.*
221+usr/lib/*/compiz/*scale.*
222+usr/share/compiz/*scale.*
223+usr/share/compiz/scale
224+usr/lib/*/compiz/*session.*
225+usr/share/compiz/*session.*
226+usr/lib/*/compiz/*snap.*
227+usr/share/compiz/*snap.*
228+usr/lib/*/compiz/*vpswitch.*
229+usr/share/compiz/*vpswitch.*
230+usr/lib/*/compiz/*wall.*
231+usr/share/compiz/*wall.*
232+usr/lib/*/compiz/*workarounds.*
233+usr/share/compiz/*workarounds.*
234
235
236=== modified file 'debian/compiz-plugins.install'
237--- debian/compiz-plugins.install 2014-04-17 22:42:34 +0000
238+++ debian/compiz-plugins.install 2014-12-02 14:42:59 +0000
239@@ -1,57 +1,106 @@
240-debian/tmp/usr/*/compiz/*addhelper.*
241-debian/tmp/usr/*/compiz/*annotate.*
242-debian/tmp/usr/*/compiz/*bench.*
243-debian/tmp/usr/*/compiz/*clone.*
244-debian/tmp/usr/*/compiz/*crashhandler.*
245-debian/tmp/usr/*/compiz/*cube.*
246-debian/tmp/usr/share/compiz/cube
247-debian/tmp/usr/*/compiz/*cubeaddon.*
248-debian/tmp/usr/share/compiz/cubeaddon
249-debian/tmp/usr/*/compiz/*dbus.*
250-debian/tmp/usr/*/compiz/*extrawm.*
251-debian/tmp/usr/*/compiz/*fadedesktop.*
252-debian/tmp/usr/*/compiz/*firepaint.*
253-debian/tmp/usr/*/compiz/*freewins.*
254-debian/tmp/usr/*/compiz/*gears.*
255-debian/tmp/usr/*/compiz/*imgjpeg.*
256-debian/tmp/usr/*/compiz/*imgsvg.*
257-debian/tmp/usr/*/compiz/*inotify.*
258-debian/tmp/usr/*/compiz/*kdecompat.*
259-debian/tmp/usr/*/compiz/*mag.*
260-debian/tmp/usr/share/compiz/mag
261-debian/tmp/usr/*/compiz/*maximumize.*
262-debian/tmp/usr/*/compiz/*mblur.*
263-debian/tmp/usr/*/compiz/*neg.*
264-debian/tmp/usr/*/compiz/*notification.*
265-debian/tmp/usr/share/compiz/notification
266-debian/tmp/usr/*/compiz/*obs.*
267-debian/tmp/usr/*/compiz/*opacify.*
268-debian/tmp/usr/*/compiz/*put.*
269-debian/tmp/usr/*/compiz/*resizeinfo.*
270-debian/tmp/usr/*/compiz/*ring.*
271-debian/tmp/usr/*/compiz/*rotate.*
272-debian/tmp/usr/*/compiz/*scaleaddon.*
273-debian/tmp/usr/*/compiz/*scalefilter.*
274-debian/tmp/usr/*/compiz/*screenshot.*
275-debian/tmp/usr/*/compiz/*shelf.*
276-debian/tmp/usr/*/compiz/*shift.*
277-debian/tmp/usr/*/compiz/*showdesktop.*
278-debian/tmp/usr/*/compiz/*showmouse.*
279-debian/tmp/usr/share/compiz/showmouse
280-debian/tmp/usr/*/compiz/*splash.*
281-debian/tmp/usr/share/compiz/splash
282-debian/tmp/usr/*/compiz/*showrepaint.*
283-debian/tmp/usr/*/compiz/*switcher.*
284-debian/tmp/usr/*/compiz/*td.*
285-debian/tmp/usr/*/compiz/*text.*
286-debian/tmp/usr/*/compiz/*thumbnail.*
287-debian/tmp/usr/*/compiz/*titleinfo.*
288-debian/tmp/usr/*/compiz/*trailfocus.*
289-debian/tmp/usr/*/compiz/*wallpaper.*
290-debian/tmp/usr/*/compiz/*water.*
291-debian/tmp/usr/*/compiz/*widget.*
292-debian/tmp/usr/*/compiz/*winrules.*
293-debian/tmp/usr/*/compiz/*wizard.*
294-debian/tmp/usr/*/compiz/*wobbly.*
295-debian/tmp/usr/*/compiz/*workspacenames.*
296-
297+usr/lib/*/compiz/*addhelper.*
298+usr/share/compiz/*addhelper.*
299+usr/lib/*/compiz/*annotate.*
300+usr/share/compiz/*annotate.*
301+usr/lib/*/compiz/*bench.*
302+usr/share/compiz/*bench.*
303+usr/lib/*/compiz/*clone.*
304+usr/share/compiz/*clone.*
305+usr/lib/*/compiz/*crashhandler.*
306+usr/share/compiz/*crashhandler.*
307+usr/lib/*/compiz/*cube.*
308+usr/share/compiz/*cube.*
309+usr/share/compiz/cube
310+usr/lib/*/compiz/*cubeaddon.*
311+usr/share/compiz/*cubeaddon.*
312+usr/share/compiz/cubeaddon
313+usr/lib/*/compiz/*dbus.*
314+usr/share/compiz/*dbus.*
315+usr/lib/*/compiz/*extrawm.*
316+usr/share/compiz/*extrawm.*
317+usr/lib/*/compiz/*fadedesktop.*
318+usr/share/compiz/*fadedesktop.*
319+usr/lib/*/compiz/*firepaint.*
320+usr/share/compiz/*firepaint.*
321+usr/lib/*/compiz/*freewins.*
322+usr/share/compiz/*freewins.*
323+usr/lib/*/compiz/*gears.*
324+usr/share/compiz/*gears.*
325+usr/lib/*/compiz/*imgjpeg.*
326+usr/share/compiz/*imgjpeg.*
327+usr/lib/*/compiz/*imgsvg.*
328+usr/share/compiz/*imgsvg.*
329+usr/lib/*/compiz/*inotify.*
330+usr/share/compiz/*inotify.*
331+usr/lib/*/compiz/*kdecompat.*
332+usr/share/compiz/*kdecompat.*
333+usr/lib/*/compiz/*mag.*
334+usr/share/compiz/*mag.*
335+usr/share/compiz/mag
336+usr/lib/*/compiz/*maximumize.*
337+usr/share/compiz/*maximumize.*
338+usr/lib/*/compiz/*mblur.*
339+usr/share/compiz/*mblur.*
340+usr/lib/*/compiz/*neg.*
341+usr/share/compiz/*neg.*
342+usr/lib/*/compiz/*notification.*
343+usr/share/compiz/*notification.*
344+usr/share/compiz/notification
345+usr/lib/*/compiz/*obs.*
346+usr/share/compiz/*obs.*
347+usr/lib/*/compiz/*opacify.*
348+usr/share/compiz/*opacify.*
349+usr/lib/*/compiz/*put.*
350+usr/share/compiz/*put.*
351+usr/lib/*/compiz/*resizeinfo.*
352+usr/share/compiz/*resizeinfo.*
353+usr/lib/*/compiz/*ring.*
354+usr/share/compiz/*ring.*
355+usr/lib/*/compiz/*rotate.*
356+usr/share/compiz/*rotate.*
357+usr/lib/*/compiz/*scaleaddon.*
358+usr/share/compiz/*scaleaddon.*
359+usr/lib/*/compiz/*scalefilter.*
360+usr/share/compiz/*scalefilter.*
361+usr/lib/*/compiz/*screenshot.*
362+usr/share/compiz/*screenshot.*
363+usr/lib/*/compiz/*shelf.*
364+usr/share/compiz/*shelf.*
365+usr/lib/*/compiz/*shift.*
366+usr/share/compiz/*shift.*
367+usr/lib/*/compiz/*showdesktop.*
368+usr/share/compiz/*showdesktop.*
369+usr/lib/*/compiz/*showmouse.*
370+usr/share/compiz/*showmouse.*
371+usr/share/compiz/showmouse
372+usr/lib/*/compiz/*showrepaint.*
373+usr/share/compiz/*showrepaint.*
374+usr/lib/*/compiz/*splash.*
375+usr/share/compiz/*splash.*
376+usr/share/compiz/splash
377+usr/lib/*/compiz/*switcher.*
378+usr/share/compiz/*switcher.*
379+usr/lib/*/compiz/*td.*
380+usr/share/compiz/*td.*
381+usr/lib/*/compiz/*text.*
382+usr/share/compiz/*text.*
383+usr/lib/*/compiz/*thumbnail.*
384+usr/share/compiz/*thumbnail.*
385+usr/lib/*/compiz/*titleinfo.*
386+usr/share/compiz/*titleinfo.*
387+usr/lib/*/compiz/*trailfocus.*
388+usr/share/compiz/*trailfocus.*
389+usr/lib/*/compiz/*wallpaper.*
390+usr/share/compiz/*wallpaper.*
391+usr/lib/*/compiz/*water.*
392+usr/share/compiz/*water.*
393+usr/lib/*/compiz/*widget.*
394+usr/share/compiz/*widget.*
395+usr/lib/*/compiz/*winrules.*
396+usr/share/compiz/*winrules.*
397+usr/lib/*/compiz/*wizard.*
398+usr/share/compiz/*wizard.*
399+usr/lib/*/compiz/*wobbly.*
400+usr/share/compiz/*wobbly.*
401+usr/lib/*/compiz/*workspacenames.*
402+usr/share/compiz/*workspacenames.*
403
404=== modified file 'debian/compiz-plugins.install.armel'
405--- debian/compiz-plugins.install.armel 2014-04-17 22:42:34 +0000
406+++ debian/compiz-plugins.install.armel 2014-12-02 14:42:59 +0000
407@@ -1,52 +1,92 @@
408-debian/tmp/usr/*/compiz/*addhelper.*
409-debian/tmp/usr/*/compiz/*annotate.*
410-debian/tmp/usr/*/compiz/*clone.*
411-debian/tmp/usr/*/compiz/*commands.*
412-debian/tmp/usr/*/compiz/*copytex.*
413-debian/tmp/usr/*/compiz/*crashhandler.*
414-debian/tmp/usr/*/compiz/*cube.*
415-debian/tmp/usr/share/compiz/cube
416-debian/tmp/usr/*/compiz/*cubeaddon.*
417-debian/tmp/usr/share/compiz/cubeaddon
418-debian/tmp/usr/*/compiz/*dbus.*
419-debian/tmp/usr/*/compiz/*extrawm.*
420-debian/tmp/usr/*/compiz/*fadedesktop.*
421-debian/tmp/usr/*/compiz/*firepaint.*
422-debian/tmp/usr/*/compiz/*imgjpeg.*
423-debian/tmp/usr/*/compiz/*imgsvg.*
424-debian/tmp/usr/*/compiz/*inotify.*
425-debian/tmp/usr/*/compiz/*kdecompat.*
426-debian/tmp/usr/*/compiz/*mag.*
427-debian/tmp/usr/share/compiz/mag
428-debian/tmp/usr/*/compiz/*maximumize.*
429-debian/tmp/usr/*/compiz/*neg.*
430-debian/tmp/usr/*/compiz/*notification.*
431-debian/tmp/usr/share/compiz/notification
432-debian/tmp/usr/*/compiz/*obs.*
433-debian/tmp/usr/*/compiz/*opacify.*
434-debian/tmp/usr/*/compiz/*put.*
435-debian/tmp/usr/*/compiz/*resizeinfo.*
436-debian/tmp/usr/*/compiz/*ring.*
437-debian/tmp/usr/*/compiz/*rotate.*
438-debian/tmp/usr/*/compiz/*scaleaddon.*
439-debian/tmp/usr/*/compiz/*scalefilter.*
440-debian/tmp/usr/*/compiz/*screenshot.*
441-debian/tmp/usr/*/compiz/*shelf.*
442-debian/tmp/usr/*/compiz/*shift.*
443-debian/tmp/usr/*/compiz/*showdesktop.*
444-debian/tmp/usr/*/compiz/*showmouse.*
445-debian/tmp/usr/share/compiz/showmouse
446-debian/tmp/usr/*/compiz/*splash.*
447-debian/tmp/usr/share/compiz/splash
448-debian/tmp/usr/*/compiz/*showrepaint.*
449-debian/tmp/usr/*/compiz/*switcher.*
450-debian/tmp/usr/*/compiz/*text.*
451-debian/tmp/usr/*/compiz/*titleinfo.*
452-debian/tmp/usr/*/compiz/*trailfocus.*
453-debian/tmp/usr/*/compiz/*wallpaper.*
454-debian/tmp/usr/*/compiz/*water.*
455-debian/tmp/usr/*/compiz/*winrules.*
456-debian/tmp/usr/*/compiz/*wizard.*
457-debian/tmp/usr/*/compiz/*wobbly.*
458-debian/tmp/usr/*/compiz/*workspacenames.*
459-
460+usr/lib/*/compiz/*addhelper.*
461+usr/share/compiz/*addhelper.*
462+usr/lib/*/compiz/*annotate.*
463+usr/share/compiz/*annotate.*
464+usr/lib/*/compiz/*clone.*
465+usr/share/compiz/*clone.*
466+usr/lib/*/compiz/*crashhandler.*
467+usr/share/compiz/*crashhandler.*
468+usr/lib/*/compiz/*cube.*
469+usr/share/compiz/*cube.*
470+usr/share/compiz/cube
471+usr/lib/*/compiz/*cubeaddon.*
472+usr/share/compiz/*cubeaddon.*
473+usr/share/compiz/cubeaddon
474+usr/lib/*/compiz/*dbus.*
475+usr/share/compiz/*dbus.*
476+usr/lib/*/compiz/*extrawm.*
477+usr/share/compiz/*extrawm.*
478+usr/lib/*/compiz/*fadedesktop.*
479+usr/share/compiz/*fadedesktop.*
480+usr/lib/*/compiz/*firepaint.*
481+usr/share/compiz/*firepaint.*
482+usr/lib/*/compiz/*imgjpeg.*
483+usr/share/compiz/*imgjpeg.*
484+usr/lib/*/compiz/*imgsvg.*
485+usr/share/compiz/*imgsvg.*
486+usr/lib/*/compiz/*inotify.*
487+usr/share/compiz/*inotify.*
488+usr/lib/*/compiz/*kdecompat.*
489+usr/share/compiz/*kdecompat.*
490+usr/lib/*/compiz/*mag.*
491+usr/share/compiz/*mag.*
492+usr/share/compiz/mag
493+usr/lib/*/compiz/*maximumize.*
494+usr/share/compiz/*maximumize.*
495+usr/lib/*/compiz/*neg.*
496+usr/share/compiz/*neg.*
497+usr/lib/*/compiz/*notification.*
498+usr/share/compiz/*notification.*
499+usr/share/compiz/notification
500+usr/lib/*/compiz/*obs.*
501+usr/share/compiz/*obs.*
502+usr/lib/*/compiz/*opacify.*
503+usr/share/compiz/*opacify.*
504+usr/lib/*/compiz/*put.*
505+usr/share/compiz/*put.*
506+usr/lib/*/compiz/*resizeinfo.*
507+usr/share/compiz/*resizeinfo.*
508+usr/lib/*/compiz/*ring.*
509+usr/share/compiz/*ring.*
510+usr/lib/*/compiz/*rotate.*
511+usr/share/compiz/*rotate.*
512+usr/lib/*/compiz/*scaleaddon.*
513+usr/share/compiz/*scaleaddon.*
514+usr/lib/*/compiz/*scalefilter.*
515+usr/share/compiz/*scalefilter.*
516+usr/lib/*/compiz/*screenshot.*
517+usr/share/compiz/*screenshot.*
518+usr/lib/*/compiz/*shelf.*
519+usr/share/compiz/*shelf.*
520+usr/lib/*/compiz/*shift.*
521+usr/share/compiz/*shift.*
522+usr/lib/*/compiz/*showdesktop.*
523+usr/share/compiz/*showdesktop.*
524+usr/lib/*/compiz/*showmouse.*
525+usr/share/compiz/*showmouse.*
526+usr/share/compiz/showmouse
527+usr/lib/*/compiz/*showrepaint.*
528+usr/share/compiz/*showrepaint.*
529+usr/lib/*/compiz/*splash.*
530+usr/share/compiz/*splash.*
531+usr/share/compiz/splash
532+usr/lib/*/compiz/*switcher.*
533+usr/share/compiz/*switcher.*
534+usr/lib/*/compiz/*text.*
535+usr/share/compiz/*text.*
536+usr/lib/*/compiz/*titleinfo.*
537+usr/share/compiz/*titleinfo.*
538+usr/lib/*/compiz/*trailfocus.*
539+usr/share/compiz/*trailfocus.*
540+usr/lib/*/compiz/*wallpaper.*
541+usr/share/compiz/*wallpaper.*
542+usr/lib/*/compiz/*water.*
543+usr/share/compiz/*water.*
544+usr/lib/*/compiz/*winrules.*
545+usr/share/compiz/*winrules.*
546+usr/lib/*/compiz/*wizard.*
547+usr/share/compiz/*wizard.*
548+usr/lib/*/compiz/*wobbly.*
549+usr/share/compiz/*wobbly.*
550+usr/lib/*/compiz/*workspacenames.*
551+usr/share/compiz/*workspacenames.*
552
553=== modified file 'debian/compiz-plugins.install.armhf'
554--- debian/compiz-plugins.install.armhf 2014-04-17 22:42:34 +0000
555+++ debian/compiz-plugins.install.armhf 2014-12-02 14:42:59 +0000
556@@ -1,52 +1,92 @@
557-debian/tmp/usr/*/compiz/*addhelper.*
558-debian/tmp/usr/*/compiz/*annotate.*
559-debian/tmp/usr/*/compiz/*clone.*
560-debian/tmp/usr/*/compiz/*commands.*
561-debian/tmp/usr/*/compiz/*copytex.*
562-debian/tmp/usr/*/compiz/*crashhandler.*
563-debian/tmp/usr/*/compiz/*cube.*
564-debian/tmp/usr/share/compiz/cube
565-debian/tmp/usr/*/compiz/*cubeaddon.*
566-debian/tmp/usr/share/compiz/cubeaddon
567-debian/tmp/usr/*/compiz/*dbus.*
568-debian/tmp/usr/*/compiz/*extrawm.*
569-debian/tmp/usr/*/compiz/*fadedesktop.*
570-debian/tmp/usr/*/compiz/*firepaint.*
571-debian/tmp/usr/*/compiz/*imgjpeg.*
572-debian/tmp/usr/*/compiz/*imgsvg.*
573-debian/tmp/usr/*/compiz/*inotify.*
574-debian/tmp/usr/*/compiz/*kdecompat.*
575-debian/tmp/usr/*/compiz/*mag.*
576-debian/tmp/usr/share/compiz/mag
577-debian/tmp/usr/*/compiz/*maximumize.*
578-debian/tmp/usr/*/compiz/*neg.*
579-debian/tmp/usr/*/compiz/*notification.*
580-debian/tmp/usr/share/compiz/notification
581-debian/tmp/usr/*/compiz/*obs.*
582-debian/tmp/usr/*/compiz/*opacify.*
583-debian/tmp/usr/*/compiz/*put.*
584-debian/tmp/usr/*/compiz/*resizeinfo.*
585-debian/tmp/usr/*/compiz/*ring.*
586-debian/tmp/usr/*/compiz/*rotate.*
587-debian/tmp/usr/*/compiz/*scaleaddon.*
588-debian/tmp/usr/*/compiz/*scalefilter.*
589-debian/tmp/usr/*/compiz/*screenshot.*
590-debian/tmp/usr/*/compiz/*shelf.*
591-debian/tmp/usr/*/compiz/*shift.*
592-debian/tmp/usr/*/compiz/*showdesktop.*
593-debian/tmp/usr/*/compiz/*showmouse.*
594-debian/tmp/usr/share/compiz/showmouse
595-debian/tmp/usr/*/compiz/*splash.*
596-debian/tmp/usr/share/compiz/splash
597-debian/tmp/usr/*/compiz/*showrepaint.*
598-debian/tmp/usr/*/compiz/*switcher.*
599-debian/tmp/usr/*/compiz/*text.*
600-debian/tmp/usr/*/compiz/*titleinfo.*
601-debian/tmp/usr/*/compiz/*trailfocus.*
602-debian/tmp/usr/*/compiz/*wallpaper.*
603-debian/tmp/usr/*/compiz/*water.*
604-debian/tmp/usr/*/compiz/*winrules.*
605-debian/tmp/usr/*/compiz/*wizard.*
606-debian/tmp/usr/*/compiz/*wobbly.*
607-debian/tmp/usr/*/compiz/*workspacenames.*
608-
609+usr/lib/*/compiz/*addhelper.*
610+usr/share/compiz/*addhelper.*
611+usr/lib/*/compiz/*annotate.*
612+usr/share/compiz/*annotate.*
613+usr/lib/*/compiz/*clone.*
614+usr/share/compiz/*clone.*
615+usr/lib/*/compiz/*crashhandler.*
616+usr/share/compiz/*crashhandler.*
617+usr/lib/*/compiz/*cube.*
618+usr/share/compiz/*cube.*
619+usr/share/compiz/cube
620+usr/lib/*/compiz/*cubeaddon.*
621+usr/share/compiz/*cubeaddon.*
622+usr/share/compiz/cubeaddon
623+usr/lib/*/compiz/*dbus.*
624+usr/share/compiz/*dbus.*
625+usr/lib/*/compiz/*extrawm.*
626+usr/share/compiz/*extrawm.*
627+usr/lib/*/compiz/*fadedesktop.*
628+usr/share/compiz/*fadedesktop.*
629+usr/lib/*/compiz/*firepaint.*
630+usr/share/compiz/*firepaint.*
631+usr/lib/*/compiz/*imgjpeg.*
632+usr/share/compiz/*imgjpeg.*
633+usr/lib/*/compiz/*imgsvg.*
634+usr/share/compiz/*imgsvg.*
635+usr/lib/*/compiz/*inotify.*
636+usr/share/compiz/*inotify.*
637+usr/lib/*/compiz/*kdecompat.*
638+usr/share/compiz/*kdecompat.*
639+usr/lib/*/compiz/*mag.*
640+usr/share/compiz/*mag.*
641+usr/share/compiz/mag
642+usr/lib/*/compiz/*maximumize.*
643+usr/share/compiz/*maximumize.*
644+usr/lib/*/compiz/*neg.*
645+usr/share/compiz/*neg.*
646+usr/lib/*/compiz/*notification.*
647+usr/share/compiz/*notification.*
648+usr/share/compiz/notification
649+usr/lib/*/compiz/*obs.*
650+usr/share/compiz/*obs.*
651+usr/lib/*/compiz/*opacify.*
652+usr/share/compiz/*opacify.*
653+usr/lib/*/compiz/*put.*
654+usr/share/compiz/*put.*
655+usr/lib/*/compiz/*resizeinfo.*
656+usr/share/compiz/*resizeinfo.*
657+usr/lib/*/compiz/*ring.*
658+usr/share/compiz/*ring.*
659+usr/lib/*/compiz/*rotate.*
660+usr/share/compiz/*rotate.*
661+usr/lib/*/compiz/*scaleaddon.*
662+usr/share/compiz/*scaleaddon.*
663+usr/lib/*/compiz/*scalefilter.*
664+usr/share/compiz/*scalefilter.*
665+usr/lib/*/compiz/*screenshot.*
666+usr/share/compiz/*screenshot.*
667+usr/lib/*/compiz/*shelf.*
668+usr/share/compiz/*shelf.*
669+usr/lib/*/compiz/*shift.*
670+usr/share/compiz/*shift.*
671+usr/lib/*/compiz/*showdesktop.*
672+usr/share/compiz/*showdesktop.*
673+usr/lib/*/compiz/*showmouse.*
674+usr/share/compiz/*showmouse.*
675+usr/share/compiz/showmouse
676+usr/lib/*/compiz/*showrepaint.*
677+usr/share/compiz/*showrepaint.*
678+usr/lib/*/compiz/*splash.*
679+usr/share/compiz/*splash.*
680+usr/share/compiz/splash
681+usr/lib/*/compiz/*switcher.*
682+usr/share/compiz/*switcher.*
683+usr/lib/*/compiz/*text.*
684+usr/share/compiz/*text.*
685+usr/lib/*/compiz/*titleinfo.*
686+usr/share/compiz/*titleinfo.*
687+usr/lib/*/compiz/*trailfocus.*
688+usr/share/compiz/*trailfocus.*
689+usr/lib/*/compiz/*wallpaper.*
690+usr/share/compiz/*wallpaper.*
691+usr/lib/*/compiz/*water.*
692+usr/share/compiz/*water.*
693+usr/lib/*/compiz/*winrules.*
694+usr/share/compiz/*winrules.*
695+usr/lib/*/compiz/*wizard.*
696+usr/share/compiz/*wizard.*
697+usr/lib/*/compiz/*wobbly.*
698+usr/share/compiz/*wobbly.*
699+usr/lib/*/compiz/*workspacenames.*
700+usr/share/compiz/*workspacenames.*
701
702=== modified file 'debian/control'
703--- debian/control 2014-10-31 12:22:10 +0000
704+++ debian/control 2014-12-02 14:42:59 +0000
705@@ -4,7 +4,7 @@
706 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
707 XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
708 Uploaders: David Nusinow <dnusinow@debian.org>, Sean Finney <seanius@debian.org>, Cyril Brulebois <kibi@debian.org>
709-Build-Depends: cmake (>= 2.6),
710+Build-Depends: cmake (>= 2.8.5),
711 debhelper (>= 9~),
712 dh-migrations,
713 dh-translations,
714@@ -57,6 +57,7 @@
715 gsettings-desktop-schemas-dev,
716 xserver-xorg-dev (>= 0.7.0),
717 Standards-Version: 3.9.6
718+X-Python-Version: >= 2.7
719 # If you aren't a member of ~compiz-team but need to upload packaging changes,
720 # just go ahead. ~compiz-team will notice and sync up the code again.
721 Vcs-Bzr: https://code.launchpad.net/~compiz-team/compiz/0.9.10
722@@ -81,6 +82,8 @@
723
724 Package: compiz-core
725 Architecture: any
726+Multi-Arch: no
727+Pre-Depends: ${misc:Pre-Depends}
728 Depends: ${shlibs:Depends},
729 ${misc:Depends},
730 Recommends: compiz-plugins-default,
731@@ -100,6 +103,8 @@
732
733 Package: compiz-dev
734 Architecture: any
735+Multi-Arch: same
736+Pre-Depends: ${misc:Pre-Depends}
737 Depends: compiz-core (= ${binary:Version}),
738 libdecoration0-dev (= ${binary:Version}),
739 ${misc:Depends},
740@@ -139,6 +144,8 @@
741
742 Package: compiz-gnome
743 Architecture: any
744+Multi-Arch: no
745+Pre-Depends: ${misc:Pre-Depends}
746 Depends: ${shlibs:Depends},
747 ${misc:Depends},
748 ${python:Depends},
749@@ -165,6 +172,8 @@
750
751 Package: compiz-plugins-default
752 Architecture: any
753+Multi-Arch: same
754+Pre-Depends: ${misc:Pre-Depends}
755 Depends: compiz-core (= ${binary:Version}),
756 libdecoration0 (= ${binary:Version}),
757 ${shlibs:Depends},
758@@ -182,6 +191,8 @@
759
760 Package: compiz-plugins
761 Architecture: any
762+Multi-Arch: same
763+Pre-Depends: ${misc:Pre-Depends}
764 Depends: compiz-core (= ${binary:Version}),
765 compiz-plugins-default (= ${binary:Version}),
766 ${shlibs:Depends},
767@@ -203,6 +214,8 @@
768
769 Package: libdecoration0
770 Architecture: any
771+Multi-Arch: same
772+Pre-Depends: ${misc:Pre-Depends}
773 Depends: ${shlibs:Depends},
774 ${misc:Depends},
775 Description: Compiz window decoration library
776@@ -213,6 +226,8 @@
777 Package: libdecoration0-dev
778 Section: libdevel
779 Architecture: any
780+Multi-Arch: same
781+Pre-Depends: ${misc:Pre-Depends}
782 Depends: libdecoration0 (= ${binary:Version}),
783 ${misc:Depends},
784 libx11-dev,
785@@ -227,6 +242,8 @@
786
787 Package: libcompizconfig0
788 Architecture: any
789+Multi-Arch: same
790+Pre-Depends: ${misc:Pre-Depends}
791 Depends: ${shlibs:Depends},
792 ${misc:Depends},
793 compiz-core (= ${binary:Version}),
794@@ -240,7 +257,9 @@
795
796 Package: libcompizconfig0-dev
797 Architecture: any
798+Multi-Arch: same
799 Section: libdevel
800+Pre-Depends: ${misc:Pre-Depends}
801 Depends: ${misc:Depends},
802 libcompizconfig0 (= ${binary:Version}),
803 compiz-dev,
804@@ -255,7 +274,9 @@
805
806 Package: python-compizconfig
807 Architecture: any
808+Multi-Arch: same
809 Section: python
810+Pre-Depends: ${misc:Pre-Depends}
811 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
812 Provides: ${python:Provides}
813 Description: Compizconfig bindings for Python
814@@ -269,7 +290,9 @@
815
816 Package: compizconfig-settings-manager
817 Architecture: all
818+Multi-Arch: allowed
819 XB-Python-Version: ${python:Versions}
820+Pre-Depends: ${misc:Pre-Depends}
821 Depends: ${shlibs:Depends},
822 ${misc:Depends},
823 ${python:Depends},
824
825=== modified file 'debian/libcompizconfig0-dev.install'
826--- debian/libcompizconfig0-dev.install 2012-06-19 11:22:48 +0000
827+++ debian/libcompizconfig0-dev.install 2014-12-02 14:42:59 +0000
828@@ -1,5 +1,5 @@
829-debian/tmp/usr/lib/libcompizconfig.so
830-debian/tmp/usr/include/compizconfig/*.h
831-debian/tmp/usr/lib/pkgconfig/libcompizconfig.pc
832-debian/tmp/usr/share/cmake*/FindCompizConfig.cmake
833-debian/tmp/usr/share/compiz/cmake/LibCompizConfigCommon.cmake
834+usr/include/compizconfig/*.h
835+usr/lib/*/libcompizconfig.so
836+usr/lib/*/pkgconfig/libcompizconfig.pc
837+usr/share/cmake*/FindCompizConfig.cmake
838+usr/share/compiz/cmake/LibCompizConfigCommon.cmake
839
840=== modified file 'debian/libcompizconfig0.install'
841--- debian/libcompizconfig0.install 2014-10-30 17:49:34 +0000
842+++ debian/libcompizconfig0.install 2014-12-02 14:42:59 +0000
843@@ -1,6 +1,6 @@
844-debian/tmp/usr/lib/libcompizconfig.so.0.0.0
845-debian/tmp/usr/lib/libcompizconfig.so.0
846-debian/tmp/usr/lib/compizconfig/backends/libini.so
847-debian/tmp/usr/share/compiz/ccp.xml
848-debian/tmp/usr/lib/compiz/libccp.so
849 config /etc/compizconfig
850+usr/lib/*/compizconfig/backends/libini.so
851+usr/lib/*/compiz/libccp.so
852+usr/lib/*/libcompizconfig.so.0
853+usr/lib/*/libcompizconfig.so.0.0.0
854+usr/share/compiz/ccp.xml
855
856=== modified file 'debian/libdecoration0-dev.install'
857--- debian/libdecoration0-dev.install 2012-06-19 11:22:48 +0000
858+++ debian/libdecoration0-dev.install 2014-12-02 14:42:59 +0000
859@@ -1,3 +1,3 @@
860-debian/tmp/usr/include/compiz/decoration.h
861-debian/tmp/usr/lib/libdecoration.so
862-debian/tmp/usr/lib/pkgconfig/libdecoration.pc
863+usr/include/compiz/decoration.h
864+usr/lib/*/libdecoration.so
865+usr/lib/*/pkgconfig/libdecoration.pc
866
867=== modified file 'debian/libdecoration0.install'
868--- debian/libdecoration0.install 2012-06-19 11:22:48 +0000
869+++ debian/libdecoration0.install 2014-12-02 14:42:59 +0000
870@@ -1,1 +1,1 @@
871-debian/tmp/usr/lib/libdecoration*.so.*
872+usr/lib/*/libdecoration*.so.*
873
874=== modified file 'debian/python-compizconfig.install'
875--- debian/python-compizconfig.install 2012-09-07 11:25:34 +0000
876+++ debian/python-compizconfig.install 2014-12-02 14:42:59 +0000
877@@ -1,3 +1,3 @@
878-debian/tmp/usr/lib/*/*/compizconfig.so
879-debian/tmp/usr/lib/pkgconfig/compizconfig-python.pc
880-debian/tmp/usr/lib/*/dist-packages/compizconfig_python*
881+usr/lib/*/*/compizconfig.*.so
882+usr/lib/*/pkgconfig/compizconfig-python.pc
883+usr/lib/*/dist-packages/compizconfig_python*
884
885=== modified file 'debian/rules'
886--- debian/rules 2014-11-03 22:52:41 +0000
887+++ debian/rules 2014-12-02 14:42:59 +0000
888@@ -4,6 +4,8 @@
889 export COMPIZ_DEB_BUILD=1
890
891 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
892+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
893+python2_version := $(shell pyversions --requested --version debian/control)
894 gles2_architectures := armel armhf
895
896 # currently, segfault if CMAKE_BUILD_TYPE=Release
897@@ -70,6 +72,11 @@
898 # work around having a file with a conflicted special name (#1156294)
899 cp debian/compizconfig debian/tmp/config
900
901+ # accommodate Python's just-gotta-be-different approach to multi-arch
902+ python2_dir=debian/tmp/usr/lib/python$(python2_version)/dist-packages; \
903+ mv $${python2_dir}/compizconfig.so \
904+ $${python2_dir}/compizconfig.$(DEB_HOST_MULTIARCH).so
905+
906 dh_install --fail-missing
907
908 # remove the compizconfig dev file from compiz-dev
909
910=== modified file 'src/plugin.cpp'
911--- src/plugin.cpp 2013-12-10 19:03:52 +0000
912+++ src/plugin.cpp 2014-12-02 14:42:59 +0000
913@@ -1,5 +1,6 @@
914 /*
915 * Copyright © 2005 Novell, Inc.
916+ * Copyright 2014 Canonical Ltd.
917 *
918 * Permission to use, copy, modify, distribute, and sell this software
919 * and its documentation for any purpose is hereby granted without
920@@ -412,53 +413,59 @@
921 delete p;
922 }
923
924+#ifndef COMPIZ_LIBDIR
925+# define COMPIZ_LIBDIR "/usr/lib/compiz"
926+#endif
927+
928+typedef std::vector<std::string> PluginSearchPath;
929+
930+static PluginSearchPath
931+create_plugin_search_path ()
932+{
933+ PluginSearchPath plugin_search_path;
934+
935+ if (char* plugin_dir_override = getenv ("COMPIZ_PLUGIN_DIR"))
936+ {
937+ std::vector <std::string> paths;
938+ boost::split (paths, plugin_dir_override, boost::is_any_of (":"));
939+ foreach (const std::string &path, paths)
940+ {
941+ if (!path.empty ())
942+ plugin_search_path.push_back (path);
943+ }
944+ }
945+ if (char* home = getenv ("HOME"))
946+ {
947+ plugin_search_path.push_back (std::string (home) + HOME_PLUGINDIR);
948+ }
949+ plugin_search_path.push_back (PLUGINDIR);
950+ plugin_search_path.push_back (COMPIZ_LIBDIR);
951+ return plugin_search_path;
952+}
953+
954 CompPlugin *
955 CompPlugin::load (const char *name)
956 {
957- char *compiz_plugin_dir_override = getenv ("COMPIZ_PLUGIN_DIR");
958- std::auto_ptr<CompPlugin>p(new CompPlugin ());
959-
960+ std::auto_ptr <CompPlugin> p (new CompPlugin ());
961 p->devPrivate.uval = 0;
962 p->devType = "";
963 p->vTable = 0;
964
965 compLogMessage (here, CompLogLevelInfo, "Loading plugin: %s", name);
966
967- if (compiz_plugin_dir_override)
968- {
969- std::vector <std::string> paths;
970- boost::split (paths,
971- compiz_plugin_dir_override,
972- boost::is_any_of (":"));
973-
974- foreach (const std::string &path, paths)
975- {
976- if (path.empty ())
977- continue;
978-
979- if (loaderLoadPlugin (p.get (), path.c_str (), name))
980- return p.release ();
981- }
982- }
983-
984- if (char* home = getenv ("HOME"))
985- {
986- boost::scoped_array<char> plugindir(new char [strlen (home) + strlen (HOME_PLUGINDIR) + 3]);
987- sprintf (plugindir.get(), "%s/%s", home, HOME_PLUGINDIR);
988-
989- if (loaderLoadPlugin (p.get(), plugindir.get(), name))
990- return p.release();
991- }
992-
993- if (loaderLoadPlugin (p.get(), PLUGINDIR, name))
994- return p.release();
995-
996- if (loaderLoadPlugin (p.get(), NULL, name))
997- return p.release();
998+ PluginSearchPath plugin_search_path = create_plugin_search_path ();
999+ foreach (const std::string &path, plugin_search_path)
1000+ {
1001+ if (loaderLoadPlugin (p.get (), path.c_str (), name))
1002+ return p.release();
1003+ }
1004+
1005+ if (loaderLoadPlugin (p.get (), NULL, name))
1006+ return p.release();
1007
1008 compLogMessage (here, CompLogLevelError, "Failed to load plugin: %s", name);
1009
1010- return 0;
1011+ return NULL;
1012 }
1013
1014 bool
1015
1016=== modified file 'src/plugin/tests/test-plugin.cpp'
1017--- src/plugin/tests/test-plugin.cpp 2014-01-13 19:52:40 +0000
1018+++ src/plugin/tests/test-plugin.cpp 2014-12-02 14:42:59 +0000
1019@@ -90,6 +90,8 @@
1020 MockPluginFilesystem mockfs;
1021 };
1022
1023+#define COMPIZ_LIBDIR "/usr/lib/compiz"
1024+
1025 TEST_F (PluginTest, load_non_existant_plugin_must_fail)
1026 {
1027 using namespace testing;
1028@@ -100,6 +102,9 @@
1029 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(PLUGINDIR), StrEq("dummy"))).
1030 WillOnce(Return(false));
1031
1032+ EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(COMPIZ_LIBDIR), StrEq("dummy"))).
1033+ WillOnce(Return(false));
1034+
1035 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), Eq((void*)0), StrEq("dummy"))).
1036 WillOnce(Return(false));
1037
1038@@ -118,6 +123,9 @@
1039 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(PLUGINDIR), StrEq("dummy"))).
1040 Times(AtMost(0));
1041
1042+ EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(COMPIZ_LIBDIR), StrEq("dummy"))).
1043+ Times(AtMost(0));
1044+
1045 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), Eq((void*)0), StrEq("dummy"))).
1046 Times(AtMost(0));
1047
1048@@ -139,6 +147,9 @@
1049 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(PLUGINDIR), StrEq("dummy"))).
1050 WillOnce(Return(true));
1051
1052+ EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(COMPIZ_LIBDIR), StrEq("dummy"))).
1053+ Times(AtMost(0));
1054+
1055 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), Eq((void*)0), StrEq("dummy"))).
1056 Times(AtMost(0));;
1057
1058@@ -166,6 +177,9 @@
1059 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(PLUGINDIR), StrEq("dummy"))).
1060 Times(AtMost(0));
1061
1062+ EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(COMPIZ_LIBDIR), StrEq("dummy"))).
1063+ Times(AtMost(0));
1064+
1065 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), Eq((void*)0), StrEq("dummy"))).
1066 Times(AtMost(0));
1067
1068@@ -205,6 +219,9 @@
1069 EndsWith(PLUGINDIR), StrEq("dummy"))).
1070 Times(AtMost(0));
1071
1072+ EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(COMPIZ_LIBDIR), StrEq("dummy"))).
1073+ Times(AtMost(0));
1074+
1075 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0),
1076 Eq((void*)0), StrEq("dummy"))).
1077 Times(AtMost(0));
1078@@ -227,6 +244,9 @@
1079 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(PLUGINDIR), StrEq("dummy"))).
1080 WillOnce(Return(false));
1081
1082+ EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), EndsWith(COMPIZ_LIBDIR), StrEq("dummy"))).
1083+ WillOnce(Return(false));
1084+
1085 EXPECT_CALL(mockfs, LoadPlugin(Ne((void*)0), Eq((void*)0), StrEq("dummy"))).
1086 WillOnce(Return(true));
1087

Subscribers

People subscribed via source and target branches