Merge lp:~townsend/libertine/remove-libertine-demo into lp:libertine
- remove-libertine-demo
- Merge into devel
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Christopher Townsend | ||||
Approved revision: | 215 | ||||
Merged at revision: | 229 | ||||
Proposed branch: | lp:~townsend/libertine/remove-libertine-demo | ||||
Merge into: | lp:libertine | ||||
Diff against target: |
360 lines (+3/-264) 14 files modified
data/CMakeLists.txt (+1/-3) data/demo/CMakeLists.txt (+0/-4) data/demo/desktop_files/CMakeLists.txt (+0/-24) data/demo/desktop_files/puritine_firefox_0.0.desktop.in (+0/-11) data/demo/desktop_files/puritine_gedit_0.0.desktop.in (+0/-11) data/demo/desktop_files/puritine_gimp_0.0.desktop.in (+0/-11) data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in (+0/-11) data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in (+0/-11) data/demo/icons/accessories-text-editor.svg (+0/-119) data/puritine-click.conf (+0/-39) debian/control (+1/-11) debian/libertine-demo.install (+0/-4) debian/libertine-demo.lintian-overrides (+0/-5) debian/libertine-tools.install (+1/-0) |
||||
To merge this branch: | bzr merge lp:~townsend/libertine/remove-libertine-demo | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Libertine CI Bot | continuous-integration | Approve | |
Larry Price | Approve | ||
Review via email:
|
Commit message
Remove the demo icons and desktop files and rename the package to libertine-
Description of the change
Should be ok to merge into lp:libertine since it's the devel branch. Once everything else lands like libertine-scope and qtmir, then we'll prepare a silo for a new release with this change.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Libertine CI Bot (libertine-ci-bot) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Libertine CI Bot (libertine-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:214
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
Click here to trigger a rebuild:
https:/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Libertine CI Bot (libertine-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:214
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
Click here to trigger a rebuild:
https:/
- 215. By Christopher Townsend
-
Remove the puritine-click.conf upstart job in install.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Libertine CI Bot (libertine-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:215
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file 'data/CMakeLists.txt' |
2 | --- data/CMakeLists.txt 2016-05-02 20:45:21 +0000 |
3 | +++ data/CMakeLists.txt 2016-05-19 14:30:52 +0000 |
4 | @@ -1,10 +1,8 @@ |
5 | -add_subdirectory(demo) |
6 | - |
7 | install(FILES libertine.desktop |
8 | DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) |
9 | install(FILES libertine_64.png libertine-lxc.conf |
10 | DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}) |
11 | -install(FILES puritine-click.conf libertine-lxc-manager.conf libertine-xmir.conf |
12 | +install(FILES libertine-lxc-manager.conf libertine-xmir.conf |
13 | DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions) |
14 | install(FILES puritine-15.04.1.framework |
15 | DESTINATION ${CMAKE_INSTALL_DATADIR}/click/frameworks) |
16 | |
17 | === removed directory 'data/demo' |
18 | === removed file 'data/demo/CMakeLists.txt' |
19 | --- data/demo/CMakeLists.txt 2015-09-01 20:32:12 +0000 |
20 | +++ data/demo/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
21 | @@ -1,4 +0,0 @@ |
22 | -add_subdirectory(desktop_files) |
23 | - |
24 | -install(DIRECTORY icons/ |
25 | - DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/demo/icons) |
26 | |
27 | === removed directory 'data/demo/desktop_files' |
28 | === removed file 'data/demo/desktop_files/CMakeLists.txt' |
29 | --- data/demo/desktop_files/CMakeLists.txt 2015-09-18 14:35:55 +0000 |
30 | +++ data/demo/desktop_files/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
31 | @@ -1,24 +0,0 @@ |
32 | -execute_process(COMMAND dpkg-architecture -qDEB_BUILD_ARCH |
33 | - OUTPUT_VARIABLE BUILD_ARCH |
34 | - OUTPUT_STRIP_TRAILING_WHITESPACE |
35 | -) |
36 | - |
37 | -configure_file("puritine_firefox_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_firefox_0.0.desktop" @ONLY) |
38 | -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_firefox_0.0.desktop" |
39 | - DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo") |
40 | - |
41 | -configure_file("puritine_gedit_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_gedit_0.0.desktop" @ONLY) |
42 | -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_gedit_0.0.desktop" |
43 | - DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo") |
44 | - |
45 | -configure_file("puritine_gimp_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_gimp_0.0.desktop" @ONLY) |
46 | -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_gimp_0.0.desktop" |
47 | - DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo") |
48 | - |
49 | -configure_file("puritine_libreoffice-startcenter_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_libreoffice-startcenter_0.0.desktop" @ONLY) |
50 | -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_libreoffice-startcenter_0.0.desktop" |
51 | - DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo") |
52 | - |
53 | -configure_file("puritine_xchat-gnome_0.0.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/puritine_xchat-gnome_0.0.desktop" @ONLY) |
54 | -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/puritine_xchat-gnome_0.0.desktop" |
55 | - DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/demo") |
56 | |
57 | === removed file 'data/demo/desktop_files/puritine_firefox_0.0.desktop.in' |
58 | --- data/demo/desktop_files/puritine_firefox_0.0.desktop.in 2015-09-18 14:35:55 +0000 |
59 | +++ data/demo/desktop_files/puritine_firefox_0.0.desktop.in 1970-01-01 00:00:00 +0000 |
60 | @@ -1,11 +0,0 @@ |
61 | -[Desktop Entry] |
62 | -Version=1.0 |
63 | -Name=Firefox |
64 | -Exec=/bin/true |
65 | -Type=Application |
66 | -StartupNotify=true |
67 | -Icon=/usr/share/libertine/demo/icons/firefox.png |
68 | -Keywords=Libertine |
69 | -NotShowIn=Unity; |
70 | -X-Ubuntu-Touch=true |
71 | -X-Ubuntu-XMir-Enable=true |
72 | |
73 | === removed file 'data/demo/desktop_files/puritine_gedit_0.0.desktop.in' |
74 | --- data/demo/desktop_files/puritine_gedit_0.0.desktop.in 2015-09-18 14:35:55 +0000 |
75 | +++ data/demo/desktop_files/puritine_gedit_0.0.desktop.in 1970-01-01 00:00:00 +0000 |
76 | @@ -1,11 +0,0 @@ |
77 | -[Desktop Entry] |
78 | -Version=1.0 |
79 | -Name=Gedit |
80 | -Exec=/bin/true |
81 | -Type=Application |
82 | -StartupNotify=true |
83 | -Icon=/usr/share/libertine/demo/icons/accessories-text-editor.svg |
84 | -Keywords=Libertine |
85 | -NotShowIn=Unity; |
86 | -X-Ubuntu-Touch=true |
87 | -X-Ubuntu-XMir-Enable=true |
88 | |
89 | === removed file 'data/demo/desktop_files/puritine_gimp_0.0.desktop.in' |
90 | --- data/demo/desktop_files/puritine_gimp_0.0.desktop.in 2015-09-18 14:35:55 +0000 |
91 | +++ data/demo/desktop_files/puritine_gimp_0.0.desktop.in 1970-01-01 00:00:00 +0000 |
92 | @@ -1,11 +0,0 @@ |
93 | -[Desktop Entry] |
94 | -Version=1.0 |
95 | -Name=GIMP Image Editor |
96 | -Exec=/bin/true |
97 | -Type=Application |
98 | -StartupNotify=true |
99 | -Icon=/usr/share/libertine/demo/icons/gimp.png |
100 | -Keywords=Libertine |
101 | -NotShowIn=Unity; |
102 | -X-Ubuntu-Touch=true |
103 | -X-Ubuntu-XMir-Enable=true |
104 | |
105 | === removed file 'data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in' |
106 | --- data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in 2015-09-18 14:35:55 +0000 |
107 | +++ data/demo/desktop_files/puritine_libreoffice-startcenter_0.0.desktop.in 1970-01-01 00:00:00 +0000 |
108 | @@ -1,11 +0,0 @@ |
109 | -[Desktop Entry] |
110 | -Version=1.0 |
111 | -Name=LibreOffice |
112 | -Exec=/bin/true |
113 | -Type=Application |
114 | -StartupNotify=true |
115 | -Icon=/usr/share/libertine/demo/icons/libreoffice-startcenter.png |
116 | -Keywords=Libertine |
117 | -NotShowIn=Unity; |
118 | -X-Ubuntu-Touch=true |
119 | -X-Ubuntu-XMir-Enable=true |
120 | |
121 | === removed file 'data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in' |
122 | --- data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in 2015-09-18 14:35:55 +0000 |
123 | +++ data/demo/desktop_files/puritine_xchat-gnome_0.0.desktop.in 1970-01-01 00:00:00 +0000 |
124 | @@ -1,11 +0,0 @@ |
125 | -[Desktop Entry] |
126 | -Version=1.0 |
127 | -Name=XChat-GNOME |
128 | -Exec=/bin/true |
129 | -Type=Application |
130 | -StartupNotify=true |
131 | -Icon=/usr/share/libertine/demo/icons/xchat-gnome.png |
132 | -Keywords=Libertine |
133 | -NotShowIn=Unity; |
134 | -X-Ubuntu-Touch=true |
135 | -X-Ubuntu-XMir-Enable=true |
136 | |
137 | === removed directory 'data/demo/icons' |
138 | === removed file 'data/demo/icons/accessories-text-editor.svg' |
139 | --- data/demo/icons/accessories-text-editor.svg 2015-09-01 20:32:12 +0000 |
140 | +++ data/demo/icons/accessories-text-editor.svg 1970-01-01 00:00:00 +0000 |
141 | @@ -1,119 +0,0 @@ |
142 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
143 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
144 | -<svg id="svg2820" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
145 | - <metadata id="metadata290"> |
146 | - <rdf:RDF> |
147 | - <cc:Work rdf:about=""> |
148 | - <dc:format>image/svg+xml</dc:format> |
149 | - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> |
150 | - </cc:Work> |
151 | - </rdf:RDF> |
152 | - </metadata> |
153 | - <defs id="defs2822"> |
154 | - <linearGradient id="linearGradient5060"> |
155 | - <stop id="stop5062" offset="0"/> |
156 | - <stop id="stop5064" style="stop-opacity:0" offset="1"/> |
157 | - </linearGradient> |
158 | - <linearGradient id="linearGradient3104"> |
159 | - <stop id="stop3106" style="stop-color:#a0a0a0" offset="0"/> |
160 | - <stop id="stop3108" style="stop-color:#c8c8c8" offset="1"/> |
161 | - </linearGradient> |
162 | - <linearGradient id="linearGradient2670" y2="26.03" gradientUnits="userSpaceOnUse" x2="9" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -3.6613 16.731)" y1="29.057" x1="9"> |
163 | - <stop id="stop2607" style="stop-color:#ece5a5" offset="0"/> |
164 | - <stop id="stop2609" style="stop-color:#fcfbf2" offset="1"/> |
165 | - </linearGradient> |
166 | - <linearGradient id="linearGradient2673" y2="41.392" gradientUnits="userSpaceOnUse" x2="9.5221" gradientTransform="matrix(.56036 .024186 .024156 .55967 19.547 13.104)" y1="37.372" x1="5.5179"> |
167 | - <stop id="stop2613" style="stop-color:#dbce48" offset="0"/> |
168 | - <stop id="stop2615" style="stop-color:#c5b625" offset="1"/> |
169 | - </linearGradient> |
170 | - <linearGradient id="linearGradient2676" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -2.3288 15.392)" y1="24.99" x1="30.038"> |
171 | - <stop id="stop2599" style="stop-color:#b1b1b1" offset="0"/> |
172 | - <stop id="stop2601" style="stop-color:#fff" offset=".5"/> |
173 | - <stop id="stop2603" style="stop-color:#8f8f8f" offset="1"/> |
174 | - </linearGradient> |
175 | - <linearGradient id="linearGradient2679" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -2.1461 15.208)" y1="24.99" x1="30.038"> |
176 | - <stop id="stop2591" style="stop-color:#565656" offset="0"/> |
177 | - <stop id="stop2593" style="stop-color:#9a9a9a" offset=".5"/> |
178 | - <stop id="stop2595" style="stop-color:#545454" offset="1"/> |
179 | - </linearGradient> |
180 | - <linearGradient id="linearGradient2682" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -2.9668 16.033)" y1="24.99" x1="30.038"> |
181 | - <stop id="stop2583" style="stop-color:#b1b1b1" offset="0"/> |
182 | - <stop id="stop2585" style="stop-color:#fff" offset=".5"/> |
183 | - <stop id="stop2587" style="stop-color:#8f8f8f" offset="1"/> |
184 | - </linearGradient> |
185 | - <linearGradient id="linearGradient2685" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -2.7841 15.849)" y1="24.99" x1="30.038"> |
186 | - <stop id="stop2575" style="stop-color:#565656" offset="0"/> |
187 | - <stop id="stop2577" style="stop-color:#9a9a9a" offset=".5"/> |
188 | - <stop id="stop2579" style="stop-color:#545454" offset="1"/> |
189 | - </linearGradient> |
190 | - <linearGradient id="linearGradient2688" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -3.6017 16.671)" y1="24.99" x1="30.038"> |
191 | - <stop id="stop2567" style="stop-color:#b1b1b1" offset="0"/> |
192 | - <stop id="stop2569" style="stop-color:#fff" offset=".5"/> |
193 | - <stop id="stop2571" style="stop-color:#8f8f8f" offset="1"/> |
194 | - </linearGradient> |
195 | - <linearGradient id="linearGradient2691" y2="30" gradientUnits="userSpaceOnUse" x2="30.038" gradientTransform="matrix(.63801 -.64114 .85963 .85535 -3.419 16.487)" y1="24.99" x1="30.038"> |
196 | - <stop id="stop2559" style="stop-color:#565656" offset="0"/> |
197 | - <stop id="stop2561" style="stop-color:#9a9a9a" offset=".5"/> |
198 | - <stop id="stop2563" style="stop-color:#545454" offset="1"/> |
199 | - </linearGradient> |
200 | - <linearGradient id="linearGradient2697" y2="31.211" gradientUnits="userSpaceOnUse" x2="23.576" gradientTransform="matrix(.65657 -.65979 .73452 .73087 -1.013 19.863)" y1="25.357" x1="23.576"> |
201 | - <stop id="stop2541" style="stop-color:#181818" offset="0"/> |
202 | - <stop id="stop2543" style="stop-color:#dbdbdb" offset=".13483"/> |
203 | - <stop id="stop2545" style="stop-color:#a4a4a4" offset=".20224"/> |
204 | - <stop id="stop2547" style="stop-color:#fff" offset=".26966"/> |
205 | - <stop id="stop2549" style="stop-color:#8d8d8d" offset=".44650"/> |
206 | - <stop id="stop2551" style="stop-color:#959595" offset=".57114"/> |
207 | - <stop id="stop2553" style="stop-color:#cecece" offset=".72038"/> |
208 | - <stop id="stop2555" style="stop-color:#181818" offset="1"/> |
209 | - </linearGradient> |
210 | - <linearGradient id="linearGradient2973" y2="114.54" gradientUnits="userSpaceOnUse" x2="-60.908" gradientTransform="matrix(.45037 .00027173 -.00027421 .44630 46.808 -6.9909)" y1="13.668" x1="-60.97"> |
211 | - <stop id="stop3828" style="stop-color:#f4f4f4" offset="0"/> |
212 | - <stop id="stop3604" style="stop-color:#dbdbdb" offset="1"/> |
213 | - </linearGradient> |
214 | - <linearGradient id="linearGradient2975" y2="-1.0041" xlink:href="#linearGradient3104" gradientUnits="userSpaceOnUse" x2="11.536" gradientTransform="translate(5e-7 .047615)" y1="44.952" x1="11.536"/> |
215 | - <radialGradient id="radialGradient2978" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.022892 0 0 .012353 26.354 38.471)" r="117.14"/> |
216 | - <radialGradient id="radialGradient2981" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.022892 0 0 .012353 21.646 38.471)" r="117.14"/> |
217 | - <linearGradient id="linearGradient2984" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.066893 0 0 .012353 -.17722 38.471)" y1="366.65" x1="302.86"> |
218 | - <stop id="stop5050" style="stop-opacity:0" offset="0"/> |
219 | - <stop id="stop5056" offset=".5"/> |
220 | - <stop id="stop5052" style="stop-opacity:0" offset="1"/> |
221 | - </linearGradient> |
222 | - <linearGradient id="linearGradient3781" y2="3.0719" xlink:href="#linearGradient3104" gradientUnits="userSpaceOnUse" x2="22.004" y1="44.854" x1="22.004"/> |
223 | - </defs> |
224 | - <rect id="rect3706" style="opacity:.40206;fill:url(#linearGradient2984)" height="3" width="32.3" y="43" x="7.85"/> |
225 | - <path id="path3708" style="opacity:.40206;fill:url(#radialGradient2981)" d="m7.85 43v3c-1.1789 0.006-2.85-0.672-2.85-1.5s1.3156-1.5 2.85-1.5z"/> |
226 | - <path id="path3710" style="opacity:.40206;fill:url(#radialGradient2978)" d="m40.15 43v3c1.179 0.006 2.85-0.672 2.85-1.5s-1.316-1.5-2.85-1.5z"/> |
227 | - <path id="path2855" style="stroke-linejoin:round;stroke:url(#linearGradient2975);stroke-linecap:round;fill:url(#linearGradient2973)" d="m7.5 3.5c8.522 0.0051 24.478-0.0051 33 0 0.075 1.6058 0.924 38.198 0.999 41-11.666-0.007-23.333-0.014-34.999-0.021 0.0918-3.147 0.9082-39.567 1-40.979z"/> |
228 | - <path id="path5685" style="opacity:.59070;stroke-linejoin:round;fill-rule:evenodd;stroke:#f6abab;stroke-linecap:round;stroke-width:0.5;fill:#80b3ff" d="m12.688 4.2499l-0.438 39.5"/> |
229 | - <path id="path6656" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.057 9.875l-32.18-0.1845"/> |
230 | - <path id="path6658" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.131 11.875l-32.262-0.185"/> |
231 | - <path id="path6660" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.214 13.875l-32.428-0.185"/> |
232 | - <path id="path6662" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.297 15.875l-32.594-0.185"/> |
233 | - <path id="path6664" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.297 17.875l-32.594-0.185"/> |
234 | - <path id="path6666" style="opacity:.43721;stroke-linejoin:round;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;stroke-width:0.25;fill:#80b3ff" d="m40.379 19.875l-32.758-0.185"/> |
235 | - <path id="path7637" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.379 21.875l-32.758-0.185"/> |
236 | - <path id="path7639" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.462 23.875l-32.924-0.185"/> |
237 | - <path id="path7641" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.462 25.875l-32.924-0.185"/> |
238 | - <path id="path7645" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.627 27.875l-33.254-0.185"/> |
239 | - <path id="path7647" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.627 29.864l-33.254-0.184"/> |
240 | - <path id="path7649" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 31.875l-33.75-0.185"/> |
241 | - <path id="path7651" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 33.83l-33.75-0.184"/> |
242 | - <path id="path7653" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 35.814l-33.75-0.185"/> |
243 | - <path id="path7655" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 37.797l-33.75-0.185"/> |
244 | - <path id="path7657" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 39.78l-33.75-0.185"/> |
245 | - <path id="path7659" style="opacity:.43721;stroke-linejoin:round;stroke-width:0.25;fill-rule:evenodd;stroke:#80b3ff;stroke-linecap:round;fill:#80b3ff" d="m40.875 41.875l-33.75-0.185"/> |
246 | - <path id="path7671" style="opacity:.59070;stroke-linejoin:round;stroke:#b9d5ff;stroke-linecap:round;stroke-width:0.5;fill:none" d="m35.25 4.1673l1.05 39.5"/> |
247 | - <path id="path3715" style="stroke:url(#linearGradient3781);stroke-width:1px;fill:none" d="m12.999 11.546h2.348m0.335 0h2.181m0.351 0h1.945m0.32 0h0.838m0.336 0h1.878m0.369 0h4.931m0.335 0h3.757m0.336 0h1.14m-21.4 1.954h3.641m0.423 0h1.74m0.321 0h0.859m0.349 0h1.602m0.336 0h1.643m0.31 0h2.581m0.335 0h3.404m-17.544 1.98h3.081m0.324 0h5.075m0.311 0h2.461m0.316 0h2.302m0.33 0h1.961m0.316 0l3.085 0.02m-19.562 2h4.284m0.337 0h4.63m0.32 0h1.82m0.335 0h4.331m0.292 0h2.968m0.336 0h1.175m0.335 0h0.65m-21.813 2h1.599m0.492 0h5.921m-8.012 10h3.641m0.423 0h1.74m0.321 0h0.859m0.349 0h1.602m0.336 0h1.643m0.31 0h2.581m-13.805 3.98h3.081m0.324 0h5.075m0.311 0h2.461m8.697 0.061h5.027m-24.976-6.041h4.284m0.337 0h4.63m0.32 0h1.82m0.335 0h4.331m-16.057-4h2.348m0.335 0h2.181m0.351 0h1.945m0.32 0h0.838m0.336 0h1.878m0.369 0h4.931m0.335 0h3.757m-19.924 2h3.954m0.311 0h4.199m0.32 0h1.642m0.31 0h3.95m0.317 0h4.314m-19.317 10h3.695m0.397 0h1.629m0.381 0h0.813m0.259 0h1.604m0.213 0h8.492m0.399 0h2.267m0.305 0h0.572m-16.816 2h1.205m-5.415 0h3.857m1.866 0h2.805m0.297 0h4.116m0.32 0h2.793m0.281 0h0.576m0.315 0h3.546m0.363 0h1.856m-18.781 2h1.702m-5.912 0h3.857m2.423 0h2.393"/> |
248 | - <path id="path2422" style="opacity:.15;fill:#0c0c0c;fill-rule:evenodd" d="m38.469 23.944c-0.173-0.101-0.307-0.075-0.396-0.018l-11.796 7.511-2.171 1.387-0.067 0.028-2.57 5.792 6.37 0.192 0.053-0.036 2.185-1.379 11.793-7.576c0.354-0.227-0.206-1.731-1.257-3.381-0.788-1.237-1.624-2.214-2.144-2.52z"/> |
249 | - <path id="rect2383" style="stroke-linejoin:round;stroke:#0c0c0c;stroke-width:.5;fill:url(#linearGradient2697)" d="m24.934 31.028c0.446-0.334 1.697 0.294 2.847 1.438 1.147 1.141 1.751 2.362 1.424 2.812-0.001 0.002 0.029 0.026 0.027 0.027l16.01-16.088c0.407-0.409-0.225-1.7-1.411-2.88s-2.48-1.806-2.887-1.397l-16.01 16.088z"/> |
250 | - <path id="rect3175" style="opacity:.8;stroke-linejoin:round;stroke:#e28ccd;stroke-width:.5;fill:#ffb6ed" d="m38.99 16.903c0.446-0.334 1.697 0.293 2.847 1.438 1.147 1.141 1.752 2.362 1.425 2.812-0.002 0.002 0.028 0.025 0.026 0.027l1.954-1.963 0.04-0.04c0.001-0.002-0.028-0.025-0.027-0.027 0.327-0.45-0.277-1.672-1.424-2.813-1.15-1.144-2.401-1.772-2.847-1.437l-0.04 0.04-1.954 1.963z"/> |
251 | - <path id="path3208" style="opacity:.6;fill:#0c0c0c" d="m24.934 31.028c0.446-0.334 1.697 0.294 2.847 1.438 1.147 1.141 1.751 2.362 1.424 2.812-0.001 0.002 0.029 0.026 0.027 0.027l11.026-11.079 0.04-0.041c0.001-0.001-0.028-0.025-0.027-0.026 0.327-0.451-0.278-1.672-1.425-2.813-1.149-1.144-2.401-1.772-2.846-1.437l-0.04 0.04-11.026 11.079z"/> |
252 | - <path id="path3233" style="fill:url(#linearGradient2691)" d="m36.8 19.104c0.446-0.334 1.697 0.293 2.847 1.437 1.147 1.142 1.751 2.363 1.424 2.813-0.001 0.002 0.029 0.025 0.027 0.027l0.2-0.2c0.001-0.002-0.028-0.025-0.027-0.027 0.327-0.45-0.278-1.672-1.425-2.813-1.149-1.144-2.401-1.772-2.846-1.437l-0.2 0.2z"/> |
253 | - <path id="path3216" style="fill:url(#linearGradient2688)" d="m36.617 19.288c0.446-0.335 1.698 0.293 2.847 1.437 1.147 1.141 1.752 2.363 1.425 2.813-0.002 0.002 0.028 0.025 0.027 0.027l0.199-0.201c0.001-0.001-0.028-0.025-0.027-0.026 0.327-0.451-0.277-1.672-1.424-2.813-1.15-1.144-2.401-1.772-2.847-1.438l-0.2 0.201z"/> |
254 | - <path id="path3248" style="fill:url(#linearGradient2685)" d="m37.435 18.466c0.446-0.334 1.697 0.293 2.847 1.437 1.147 1.142 1.751 2.363 1.424 2.813-0.001 0.002 0.028 0.025 0.027 0.027l0.2-0.2c0.001-0.002-0.029-0.025-0.027-0.027 0.327-0.45-0.278-1.672-1.425-2.813-1.149-1.144-2.401-1.772-2.847-1.437l-0.199 0.2z"/> |
255 | - <path id="path3250" style="fill:url(#linearGradient2682)" d="m37.252 18.65c0.446-0.335 1.697 0.293 2.847 1.437 1.147 1.141 1.752 2.363 1.425 2.813-0.002 0.002 0.028 0.025 0.026 0.027l0.2-0.201c0.001-0.002-0.028-0.025-0.027-0.027 0.327-0.45-0.277-1.671-1.424-2.812-1.15-1.144-2.401-1.772-2.847-1.438l-0.2 0.201z"/> |
256 | - <path id="path3256" style="fill:url(#linearGradient2679)" d="m38.073 17.825c0.446-0.335 1.697 0.293 2.847 1.437 1.147 1.142 1.751 2.363 1.424 2.813-0.001 0.002 0.028 0.025 0.027 0.027l0.2-0.201c0.001-0.001-0.029-0.025-0.027-0.026 0.327-0.451-0.278-1.672-1.425-2.813-1.149-1.144-2.401-1.772-2.847-1.437l-0.199 0.2z"/> |
257 | - <path id="path3258" style="fill:url(#linearGradient2676)" d="m37.89 18.009c0.446-0.335 1.697 0.293 2.847 1.437 1.147 1.141 1.752 2.362 1.425 2.813-0.002 0.001 0.028 0.025 0.027 0.026l0.199-0.2c0.001-0.002-0.028-0.025-0.027-0.027 0.327-0.45-0.277-1.671-1.424-2.813-1.15-1.144-2.401-1.771-2.847-1.437l-0.2 0.201z"/> |
258 | - <path id="path3270" style="fill-rule:evenodd;stroke:url(#linearGradient2673);stroke-width:.5;fill:url(#linearGradient2670)" d="m21.866 38.31l7.284-2.97 0.062-0.063c0.327-0.45-0.285-1.671-1.432-2.813-1.15-1.144-2.4-1.768-2.846-1.433l-3.068 7.279z"/> |
259 | - <path id="path3281" style="fill-rule:evenodd;stroke:#0c0c0c;stroke-width:.5;fill:#0c0c0c" d="m22.697 36.339l-0.831 1.964 1.986-0.815c-0.159-0.191-0.306-0.384-0.497-0.575-0.22-0.219-0.437-0.396-0.658-0.574z"/> |
260 | -</svg> |
261 | |
262 | === removed file 'data/demo/icons/firefox.png' |
263 | Binary files data/demo/icons/firefox.png 2015-09-01 20:32:12 +0000 and data/demo/icons/firefox.png 1970-01-01 00:00:00 +0000 differ |
264 | === removed file 'data/demo/icons/gimp.png' |
265 | Binary files data/demo/icons/gimp.png 2015-09-01 20:32:12 +0000 and data/demo/icons/gimp.png 1970-01-01 00:00:00 +0000 differ |
266 | === removed file 'data/demo/icons/libreoffice-startcenter.png' |
267 | Binary files data/demo/icons/libreoffice-startcenter.png 2015-09-01 20:32:12 +0000 and data/demo/icons/libreoffice-startcenter.png 1970-01-01 00:00:00 +0000 differ |
268 | === removed file 'data/demo/icons/xchat-gnome.png' |
269 | Binary files data/demo/icons/xchat-gnome.png 2015-09-01 20:32:12 +0000 and data/demo/icons/xchat-gnome.png 1970-01-01 00:00:00 +0000 differ |
270 | === removed file 'data/puritine-click.conf' |
271 | --- data/puritine-click.conf 2016-04-25 15:45:05 +0000 |
272 | +++ data/puritine-click.conf 1970-01-01 00:00:00 +0000 |
273 | @@ -1,39 +0,0 @@ |
274 | -description "Puritine Click chroot linking" |
275 | - |
276 | -start on starting unity8 |
277 | - |
278 | -script |
279 | -PACKAGE_PATH=`click pkgdir com.ubuntu.puritine` |
280 | -CONTAINER_NAME=puritine |
281 | -CHROOT_PATH=$PACKAGE_PATH/libertine-data/libertine-container/$CONTAINER_NAME |
282 | - |
283 | -if [ -x $CHROOT_PATH/rootfs ] ; then |
284 | - # Link the chroot |
285 | - if [ ! -L $HOME/.cache/libertine-container/$CONTAINER_NAME/rootfs ] ; then |
286 | - mkdir -p $HOME/.cache/libertine-container/$CONTAINER_NAME/ |
287 | - ln -s $CHROOT_PATH/rootfs $HOME/.cache/libertine-container/$CONTAINER_NAME/rootfs |
288 | - fi |
289 | - |
290 | - # Copy or merge the container config files |
291 | - if [ ! -e $HOME/.local/share/libertine/ContainersConfig.json ] ; then |
292 | - mkdir -p $HOME/.local/share/libertine/ |
293 | - cp $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json $HOME/.local/share/libertine/ContainersConfig.json |
294 | - elif [ -L $HOME/.local/share/libertine/ContainersConfig.json ] ; then |
295 | - rm $HOME/.local/share/libertine/ContainersConfig.json |
296 | - cp $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json $HOME/.local/share/libertine/ContainersConfig.json |
297 | - else |
298 | - libertine-container-manager merge-configs -f $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json |
299 | - fi |
300 | - |
301 | - # Create and copy the user-data dir from the click package |
302 | - if [ ! -d $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME ] ; then |
303 | - cp -dR $PACKAGE_PATH/libertine-config/libertine-container/ $HOME/.local/share/libertine-container/ |
304 | - fi |
305 | -else |
306 | - rm -rf $HOME/.cache/libertine-container/$CONTAINER_NAME |
307 | - if [ $(libertine-container-manager list | grep -v ${CONTAINER_NAME} | wc -l) -eq 0 ]; then |
308 | - rm -rf $HOME/.local/share/libertine |
309 | - fi |
310 | - rm -rf $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME/.config/ |
311 | -fi |
312 | -end script |
313 | |
314 | === modified file 'debian/control' |
315 | --- debian/control 2016-04-28 22:06:04 +0000 |
316 | +++ debian/control 2016-05-19 14:30:52 +0000 |
317 | @@ -131,14 +131,4 @@ |
318 | This package provides the chroot-based container back end module for the |
319 | Libertine sandbox. This container back end module is intended only for |
320 | curated containers distributed for devices that do not support unprivileged |
321 | - LXC contaiers. |
322 | - |
323 | -Package: libertine-demo |
324 | -Architecture: any |
325 | -Multi-Arch: allowed |
326 | -Depends: libertine-tools, |
327 | - python3-libertine-chroot, |
328 | - ${misc:Depends} |
329 | -Description: Adds desktop files and icon for Unity 8 desktop support |
330 | - Add desktop files and icons for the targeted applications needed for legacy |
331 | - X application support on Unity 8. |
332 | + LXC containers. |
333 | |
334 | === removed file 'debian/libertine-demo.install' |
335 | --- debian/libertine-demo.install 2015-11-06 21:28:21 +0000 |
336 | +++ debian/libertine-demo.install 1970-01-01 00:00:00 +0000 |
337 | @@ -1,4 +0,0 @@ |
338 | -data/demo/icons/* usr/share/libertine/demo/icons/ |
339 | -usr/share/applications/demo/* usr/share/applications/ |
340 | -usr/share/upstart/sessions/puritine-click.conf |
341 | -usr/share/click/frameworks/puritine-15.04.1.framework |
342 | |
343 | === removed file 'debian/libertine-demo.lintian-overrides' |
344 | --- debian/libertine-demo.lintian-overrides 2015-09-02 12:55:00 +0000 |
345 | +++ debian/libertine-demo.lintian-overrides 1970-01-01 00:00:00 +0000 |
346 | @@ -1,5 +0,0 @@ |
347 | -libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_firefox_0.0.desktop bin/true |
348 | -libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_gedit_0.0.desktop bin/true |
349 | -libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_gimp_0.0.desktop bin/true |
350 | -libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_libreoffice-startcenter_0.0.desktop bin/true |
351 | -libertine-demo: desktop-command-not-in-package usr/share/applications/trusty_xchat-gnome_0.0.desktop bin/true |
352 | |
353 | === modified file 'debian/libertine-tools.install' |
354 | --- debian/libertine-tools.install 2016-05-02 20:45:21 +0000 |
355 | +++ debian/libertine-tools.install 2016-05-19 14:30:52 +0000 |
356 | @@ -8,3 +8,4 @@ |
357 | usr/share/libertine/libertine-lxc.conf |
358 | usr/share/upstart/sessions/libertine-lxc-manager.conf |
359 | usr/share/upstart/sessions/libertine-xmir.conf |
360 | +usr/share/click/frameworks/puritine-15.04.1.framework |
PASSED: Continuous integration, rev:212 /jenkins. canonical. com/libertine/ job/libertine- ci-verify- mp/196/ /jenkins. canonical. com/libertine/ job/generic- ci-generate- dsc/199 /jenkins. canonical. com/libertine/ job/libertine- ci-build- and-test- dsc/architectur e=amd64, distribution= vivid,label_ exp=jenkins- slave-0% 20%7C%7C% 20jenkins- slave-2/ 158 /jenkins. canonical. com/libertine/ job/libertine- ci-build- and-test- dsc/architectur e=amd64, distribution= xenial, label_exp= jenkins- slave-0% 20%7C%7C% 20jenkins- slave-2/ 158 /jenkins. canonical. com/libertine/ job/libertine- ci-build- and-test- dsc/architectur e=i386, distribution= vivid,label_ exp=jenkins- slave-0% 20%7C%7C% 20jenkins- slave-2/ 158 /jenkins. canonical. com/libertine/ job/libertine- ci-build- and-test- dsc/architectur e=i386, distribution= xenial, label_exp= jenkins- slave-0% 20%7C%7C% 20jenkins- slave-2/ 158 /jenkins. canonical. com/libertine/ job/libertine- ci-update- mp/1094/ console
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/libertine/ job/libertine- ci-verify- mp/196/ rebuild
https:/