Merge lp:~ari-tczew/cheese/ubuntu into lp:~ubuntu-desktop/cheese/ubuntu
- ubuntu
- Merge into ubuntu
Proposed by
Artur Rona
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 86 | ||||
Proposed branch: | lp:~ari-tczew/cheese/ubuntu | ||||
Merge into: | lp:~ubuntu-desktop/cheese/ubuntu | ||||
Diff against target: |
592 lines (+100/-339) 8 files modified
debian/changelog (+67/-0) debian/control (+14/-14) debian/control.in (+13/-13) debian/patches/99_ltmain_as-needed.patch (+0/-32) debian/patches/fix-help-license.patch (+0/-247) debian/patches/fix-um-crop-license.patch (+0/-24) debian/patches/series (+0/-3) debian/patches/use-plugins-good (+6/-6) |
||||
To merge this branch: | bzr merge lp:~ari-tczew/cheese/ubuntu | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ancell | Pending | ||
Review via email: mp+199062@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2013-12-15 20:29:26 +0000 |
3 | +++ debian/changelog 2013-12-16 00:16:37 +0000 |
4 | @@ -1,3 +1,70 @@ |
5 | +cheese (3.10.1-1sid1ubuntu1) trusty; urgency=low |
6 | + |
7 | + * Merge from Debian unstable. (LP: #1261080) Remaining changes: |
8 | + - debian/cheese-common.install, debian/source_cheese.py: |
9 | + + Add Apport hook. |
10 | + - debian/control: |
11 | + + Bump conflicts/replaces since we didn't take the |
12 | + libcheese-gtk-dev/ libcheese-doc split until raring. |
13 | + + Build-Depends on good gstreamer plugins instead of bad. |
14 | + + Suggest gnome-video-effects-extra, as well. |
15 | + - debian/patches/use-plugins-good.patch: |
16 | + + The camerabin plugin is part of the good gstreamer plugins |
17 | + in Ubuntu. |
18 | + * debian/patches/fix-help-license.patch, |
19 | + debian/patches/fix-um-crop-license.patch: |
20 | + - Removed, fixed upstream. |
21 | + |
22 | + -- Artur Rona <ari-tczew@tlen.pl> Sun, 15 Dec 2013 04:02:52 +0100 |
23 | + |
24 | +cheese (3.10.1-1sid1) unstable; urgency=low |
25 | + |
26 | + * Depend on gstreamer1.0-clutter for cluttervideosink (Closes: #729253) |
27 | + |
28 | + -- Andreas Henriksson <andreas@fatal.se> Tue, 12 Nov 2013 20:43:25 +0100 |
29 | + |
30 | +cheese (3.10.1-1) unstable; urgency=low |
31 | + |
32 | + [ Jeremy Bicha ] |
33 | + * debian/patches/fix-help-license.patch: |
34 | + - Backport clarification that the help files are licensed CC-BY-SA 3.0 |
35 | + * debian/patches/fix-um-crop-license.patch: |
36 | + - Backport relicensing of this file as GPL-2+ instead of GPL-3+ |
37 | + * debian/copyright: |
38 | + - Updated and converted to the 1.0 copyright format |
39 | + * debian/control.in: |
40 | + - Suggest gnome-video-effects-frei0r |
41 | + |
42 | + [ Andreas Henriksson ] |
43 | + * New upstream release. |
44 | + * Bump build-dependencies according to configure.ac: |
45 | + - libglib2.0-dev to >= 2.32.0 |
46 | + - libclutter-1.0-dev to >= 1.13.2 |
47 | + * Drop debian/patches: now included in upstream release. |
48 | + |
49 | + -- Andreas Henriksson <andreas@fatal.se> Thu, 17 Oct 2013 16:29:42 +0200 |
50 | + |
51 | +cheese (3.8.3-1) unstable; urgency=low |
52 | + |
53 | + [ Jeremy Bicha ] |
54 | + * New upstream release. |
55 | + * debian/control.in: |
56 | + - Drop build-depends on libgee-dev |
57 | + - Drop alternate build-depends on valac-0.18 since it's no longer |
58 | + in Debian |
59 | + |
60 | + [ Michael Biebl ] |
61 | + * Upload to unstable. |
62 | + * Drop 99_ltmain_as-needed.patch since we are running autoreconf with the |
63 | + --as-needed argument. |
64 | + * Bump Standards-Version to 3.9.4. No further changes. |
65 | + * Revert the changes in 3.6.1-1 which bumped the build-dependencies to force |
66 | + the use of the versions in experimental. |
67 | + * Revert the changes in 3.6.2-1. We want a strict dependency on |
68 | + cheese-common for the gsettings schema. |
69 | + |
70 | + -- Michael Biebl <biebl@debian.org> Tue, 27 Aug 2013 11:07:57 +0200 |
71 | + |
72 | cheese (3.8.3-0ubuntu1) saucy; urgency=low |
73 | |
74 | * New upstream release |
75 | |
76 | === modified file 'debian/control' |
77 | --- debian/control 2013-12-15 20:29:26 +0000 |
78 | +++ debian/control 2013-12-16 00:16:37 +0000 |
79 | @@ -7,11 +7,10 @@ |
80 | Priority: optional |
81 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
82 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
83 | -Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>, Sjoerd Simons <sjoerd@debian.org> |
84 | -Standards-Version: 3.9.3 |
85 | +Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org> |
86 | +Standards-Version: 3.9.4 |
87 | Homepage: http://projects.gnome.org/cheese/ |
88 | -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/ |
89 | -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/cheese/ |
90 | +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu |
91 | Build-Depends: cdbs (>= 0.4.93~), |
92 | debhelper (>= 9), |
93 | dh-autoreconf, |
94 | @@ -22,18 +21,18 @@ |
95 | intltool (>= 0.50.0), |
96 | rarian-compat, |
97 | valac (>= 0.18), |
98 | - libglib2.0-dev (>= 2.34.0), |
99 | + libglib2.0-dev (>= 2.32.0), |
100 | libgdk-pixbuf2.0-dev, |
101 | - libgtk-3-dev (>= 3.6), |
102 | - libgnome-desktop-3-dev (>= 3.6), |
103 | + libgtk-3-dev (>= 3.4.4), |
104 | + libgnome-desktop-3-dev (>= 2.91.6), |
105 | libgstreamer1.0-dev (>= 0.11.0), |
106 | libgstreamer-plugins-base1.0-dev (>= 0.11.0), |
107 | libgstreamer-plugins-good1.0-dev (>= 0.11.0), |
108 | libcairo2-dev (>= 1.10.0), |
109 | libpango1.0-dev (>= 1.28.0), |
110 | librsvg2-dev (>= 2.32.0), |
111 | - libclutter-1.0-dev (>= 1.13.0), |
112 | - libclutter-gtk-1.0-dev (>= 1.4.0), |
113 | + libclutter-1.0-dev (>= 1.13.2), |
114 | + libclutter-gtk-1.0-dev (>= 0.91.8), |
115 | libclutter-gst-2.0-dev (>= 1.9.0), |
116 | x11proto-core-dev, |
117 | libcanberra-gtk3-dev (>= 0.26), |
118 | @@ -49,15 +48,15 @@ |
119 | Architecture: any |
120 | Depends: ${shlibs:Depends}, |
121 | ${misc:Depends}, |
122 | - cheese-common (>= 3.4), |
123 | + cheese-common (= ${source:Version}), |
124 | gnome-video-effects |
125 | Recommends: gvfs, |
126 | gnome-icon-theme, |
127 | hicolor-icon-theme, |
128 | nautilus-sendto, |
129 | yelp |
130 | -Suggests: gnome-video-effects-extra, |
131 | - gnome-video-effects-frei0r |
132 | +Suggests: gnome-video-effects-frei0r, |
133 | + gnome-video-effects-extra |
134 | Description: tool to take pictures and videos from your webcam |
135 | A webcam application that supports image and video capture. Makes |
136 | it easy to take photos and videos of you, your friends, pets or whatever |
137 | @@ -85,7 +84,7 @@ |
138 | Section: libs |
139 | Depends: ${shlibs:Depends}, |
140 | ${misc:Depends}, |
141 | - cheese-common (>= 3.4) |
142 | + cheese-common (= ${source:Version}) |
143 | Pre-Depends: ${misc:Pre-Depends} |
144 | Multi-Arch: same |
145 | Description: tool to take pictures and videos from your webcam - widgets |
146 | @@ -124,7 +123,8 @@ |
147 | Section: libs |
148 | Depends: ${shlibs:Depends}, |
149 | ${misc:Depends}, |
150 | - cheese-common (>= 3.4), |
151 | + cheese-common (= ${source:Version}), |
152 | + gstreamer1.0-clutter, |
153 | gstreamer1.0-plugins-base (>= 0.11.0), |
154 | gstreamer1.0-plugins-good (>= 0.11.0), |
155 | gstreamer1.0-x |
156 | |
157 | === modified file 'debian/control.in' |
158 | --- debian/control.in 2013-12-15 20:29:26 +0000 |
159 | +++ debian/control.in 2013-12-16 00:16:37 +0000 |
160 | @@ -4,10 +4,9 @@ |
161 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
162 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
163 | Uploaders: @GNOME_TEAM@ |
164 | -Standards-Version: 3.9.3 |
165 | +Standards-Version: 3.9.4 |
166 | Homepage: http://projects.gnome.org/cheese/ |
167 | -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/ |
168 | -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/cheese/ |
169 | +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu |
170 | Build-Depends: cdbs (>= 0.4.93~), |
171 | debhelper (>= 9), |
172 | dh-autoreconf, |
173 | @@ -18,18 +17,18 @@ |
174 | intltool (>= 0.50.0), |
175 | rarian-compat, |
176 | valac (>= 0.18), |
177 | - libglib2.0-dev (>= 2.34.0), |
178 | + libglib2.0-dev (>= 2.32.0), |
179 | libgdk-pixbuf2.0-dev, |
180 | - libgtk-3-dev (>= 3.6), |
181 | - libgnome-desktop-3-dev (>= 3.6), |
182 | + libgtk-3-dev (>= 3.4.4), |
183 | + libgnome-desktop-3-dev (>= 2.91.6), |
184 | libgstreamer1.0-dev (>= 0.11.0), |
185 | libgstreamer-plugins-base1.0-dev (>= 0.11.0), |
186 | libgstreamer-plugins-good1.0-dev (>= 0.11.0), |
187 | libcairo2-dev (>= 1.10.0), |
188 | libpango1.0-dev (>= 1.28.0), |
189 | librsvg2-dev (>= 2.32.0), |
190 | - libclutter-1.0-dev (>= 1.13.0), |
191 | - libclutter-gtk-1.0-dev (>= 1.4.0), |
192 | + libclutter-1.0-dev (>= 1.13.2), |
193 | + libclutter-gtk-1.0-dev (>= 0.91.8), |
194 | libclutter-gst-2.0-dev (>= 1.9.0), |
195 | x11proto-core-dev, |
196 | libcanberra-gtk3-dev (>= 0.26), |
197 | @@ -45,15 +44,15 @@ |
198 | Architecture: any |
199 | Depends: ${shlibs:Depends}, |
200 | ${misc:Depends}, |
201 | - cheese-common (>= 3.4), |
202 | + cheese-common (= ${source:Version}), |
203 | gnome-video-effects |
204 | Recommends: gvfs, |
205 | gnome-icon-theme, |
206 | hicolor-icon-theme, |
207 | nautilus-sendto, |
208 | yelp |
209 | -Suggests: gnome-video-effects-extra, |
210 | - gnome-video-effects-frei0r |
211 | +Suggests: gnome-video-effects-frei0r, |
212 | + gnome-video-effects-extra |
213 | Description: tool to take pictures and videos from your webcam |
214 | A webcam application that supports image and video capture. Makes |
215 | it easy to take photos and videos of you, your friends, pets or whatever |
216 | @@ -81,7 +80,7 @@ |
217 | Section: libs |
218 | Depends: ${shlibs:Depends}, |
219 | ${misc:Depends}, |
220 | - cheese-common (>= 3.4) |
221 | + cheese-common (= ${source:Version}) |
222 | Pre-Depends: ${misc:Pre-Depends} |
223 | Multi-Arch: same |
224 | Description: tool to take pictures and videos from your webcam - widgets |
225 | @@ -120,7 +119,8 @@ |
226 | Section: libs |
227 | Depends: ${shlibs:Depends}, |
228 | ${misc:Depends}, |
229 | - cheese-common (>= 3.4), |
230 | + cheese-common (= ${source:Version}), |
231 | + gstreamer1.0-clutter, |
232 | gstreamer1.0-plugins-base (>= 0.11.0), |
233 | gstreamer1.0-plugins-good (>= 0.11.0), |
234 | gstreamer1.0-x |
235 | |
236 | === removed file 'debian/patches/99_ltmain_as-needed.patch' |
237 | --- debian/patches/99_ltmain_as-needed.patch 2011-12-27 20:09:40 +0000 |
238 | +++ debian/patches/99_ltmain_as-needed.patch 1970-01-01 00:00:00 +0000 |
239 | @@ -1,32 +0,0 @@ |
240 | -Index: cheese-3.2.1/ltmain.sh |
241 | -=================================================================== |
242 | ---- cheese-3.2.1.orig/ltmain.sh 2011-10-17 22:20:56.000000000 +0200 |
243 | -+++ cheese-3.2.1/ltmain.sh 2011-11-13 14:07:28.230942270 +0100 |
244 | -@@ -5787,6 +5787,11 @@ |
245 | - arg=$func_stripname_result |
246 | - ;; |
247 | - |
248 | -+ -Wl,--as-needed) |
249 | -+ deplibs="$deplibs $arg" |
250 | -+ continue |
251 | -+ ;; |
252 | -+ |
253 | - -Wl,*) |
254 | - func_stripname '-Wl,' '' "$arg" |
255 | - args=$func_stripname_result |
256 | -@@ -6147,6 +6152,15 @@ |
257 | - lib= |
258 | - found=no |
259 | - case $deplib in |
260 | -+ -Wl,--as-needed) |
261 | -+ if test "$linkmode,$pass" = "prog,link"; then |
262 | -+ compile_deplibs="$deplib $compile_deplibs" |
263 | -+ finalize_deplibs="$deplib $finalize_deplibs" |
264 | -+ else |
265 | -+ deplibs="$deplib $deplibs" |
266 | -+ fi |
267 | -+ continue |
268 | -+ ;; |
269 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
270 | - if test "$linkmode,$pass" = "prog,link"; then |
271 | - compile_deplibs="$deplib $compile_deplibs" |
272 | |
273 | === removed file 'debian/patches/fix-help-license.patch' |
274 | --- debian/patches/fix-help-license.patch 2013-12-15 20:29:26 +0000 |
275 | +++ debian/patches/fix-help-license.patch 1970-01-01 00:00:00 +0000 |
276 | @@ -1,247 +0,0 @@ |
277 | -From a4dbb82074231322d099c9943d7f2929dc711173 Mon Sep 17 00:00:00 2001 |
278 | -From: David King <amigadave@amigadave.com> |
279 | -Date: Fri, 28 Jun 2013 13:20:02 +0100 |
280 | -Subject: [PATCH] License help under CC-BY-SA 3.0 Unported |
281 | - |
282 | -The help was not explicitly under a license, as described in bug 703238. |
283 | -Specify the license as CC-BY-SA 3.0 to match with other GNOME help: |
284 | - |
285 | -https://wiki.gnome.org/DocumentationProject/Licensing |
286 | - |
287 | -License clarification approved by help contributors (found with |
288 | -"git shortlog help/C/*.page") as listed below: |
289 | - |
290 | -Signed-off-by: Jeremy Bicha <jbicha@ubuntu.com> |
291 | -Signed-off-by: Ekaterina Gerasimova <kittykat3756@gmail.com> |
292 | -Signed-off-by: Michael Hill <mdhill@gnome.org> |
293 | -Signed-off-by: Tiffany Ann Antopolski <tiffany.antopolski@gmail.com> |
294 | -Signed-off-by: Julita Inca <jinca@gnome.org> |
295 | ---- |
296 | - help/C/burst-mode.page | 2 ++ |
297 | - help/C/effects-apply.page | 2 ++ |
298 | - help/C/index.page | 2 ++ |
299 | - help/C/introduction.page | 2 ++ |
300 | - help/C/legal.xml | 8 ++++++++ |
301 | - help/C/photo-delete.page | 2 ++ |
302 | - help/C/photo-save.page | 2 ++ |
303 | - help/C/photo-take.page | 2 ++ |
304 | - help/C/photo-view.page | 2 ++ |
305 | - help/C/pref-countdown.page | 2 ++ |
306 | - help/C/pref-flash.page | 2 ++ |
307 | - help/C/pref-fullscreen.page | 2 ++ |
308 | - help/C/pref-image-properties.page | 2 ++ |
309 | - help/C/pref-resolution.page | 2 ++ |
310 | - help/C/video-record.page | 2 ++ |
311 | - help/Makefile.am | 1 + |
312 | - 21 files changed, 47 insertions(+) |
313 | - create mode 100644 help/C/legal.xml |
314 | - |
315 | -diff --git a/help/C/burst-mode.page b/help/C/burst-mode.page |
316 | -index c0d64ed..c53593b 100644 |
317 | ---- a/help/C/burst-mode.page |
318 | -+++ b/help/C/burst-mode.page |
319 | -@@ -20,6 +20,8 @@ |
320 | - <email its:translate="no">kittykat3756@gmail.com</email> |
321 | - </credit> |
322 | - |
323 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
324 | -+ |
325 | - <desc><gui>Burst mode</gui> takes several photos rapidly. Change your pose |
326 | - in between each shot!</desc> |
327 | - </info> |
328 | - |
329 | -diff --git a/help/C/effects-apply.page b/help/C/effects-apply.page |
330 | -index 9c36128..73a0014 100644 |
331 | ---- a/help/C/effects-apply.page |
332 | -+++ b/help/C/effects-apply.page |
333 | -@@ -15,6 +15,8 @@ |
334 | - <email>kittykat3756@gmail.com</email> |
335 | - </credit> |
336 | - |
337 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
338 | -+ |
339 | - <desc>Add fun effects to your photos and videos, like turning yourself green |
340 | - or distorting the picture like a funhouse mirror.</desc> |
341 | - </info> |
342 | -diff --git a/help/C/index.page b/help/C/index.page |
343 | -index bfa126c..d2a0a79 100644 |
344 | ---- a/help/C/index.page |
345 | -+++ b/help/C/index.page |
346 | -@@ -16,6 +16,8 @@ |
347 | - <email>kittykat3756@gmail.com</email> |
348 | - </credit> |
349 | - |
350 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
351 | -+ |
352 | - <desc>Cheese lets you take photos and videos using your webcam. You can |
353 | - even add special effects!</desc> |
354 | - |
355 | -diff --git a/help/C/introduction.page b/help/C/introduction.page |
356 | -index da21997..7b5e355 100644 |
357 | ---- a/help/C/introduction.page |
358 | -+++ b/help/C/introduction.page |
359 | -@@ -20,6 +20,8 @@ |
360 | - <email its:translate="no">kittykat3756@gmail.com</email> |
361 | - </credit> |
362 | - |
363 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
364 | -+ |
365 | - <desc>Introduction to the <app>Cheese</app> webcam application.</desc> |
366 | - </info> |
367 | - |
368 | -diff --git a/help/C/legal.xml b/help/C/legal.xml |
369 | -new file mode 100644 |
370 | -index 0000000..aa36246 |
371 | ---- /dev/null |
372 | -+++ b/help/C/legal.xml |
373 | -@@ -0,0 +1,8 @@ |
374 | -+<license xmlns="http://projectmallard.org/1.0/" |
375 | -+ href="http://creativecommons.org/licenses/by-sa/3.0/"> |
376 | -+ |
377 | -+ <p>This work is licensed under a |
378 | -+ <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons |
379 | -+ Attribution-ShareAlike 3.0 Unported License</link>.</p> |
380 | -+ |
381 | -+</license> |
382 | -diff --git a/help/C/photo-delete.page b/help/C/photo-delete.page |
383 | -index 987d5bd..416f167 100644 |
384 | ---- a/help/C/photo-delete.page |
385 | -+++ b/help/C/photo-delete.page |
386 | -@@ -16,6 +16,8 @@ |
387 | - <email>kittykat3756@gmail.com</email> |
388 | - </credit> |
389 | - |
390 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
391 | -+ |
392 | - <desc>Remove photos and videos that you no longer want to keep.</desc> |
393 | - </info> |
394 | - |
395 | -diff --git a/help/C/photo-save.page b/help/C/photo-save.page |
396 | -index c396043..11e83e1 100644 |
397 | ---- a/help/C/photo-save.page |
398 | -+++ b/help/C/photo-save.page |
399 | -@@ -16,6 +16,8 @@ |
400 | - <email>kittykat3756@gmail.com</email> |
401 | - </credit> |
402 | - |
403 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
404 | -+ |
405 | - <desc>Save a photo or video in a different folder.</desc> |
406 | - </info> |
407 | - |
408 | -diff --git a/help/C/photo-take.page b/help/C/photo-take.page |
409 | -index 64be7ec..c3fbcce 100644 |
410 | ---- a/help/C/photo-take.page |
411 | -+++ b/help/C/photo-take.page |
412 | -@@ -24,6 +24,8 @@ |
413 | - <email its:translate="no">kittykat3756@gmail.com</email> |
414 | - </credit> |
415 | - |
416 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
417 | -+ |
418 | - <desc>Use your webcam to take photos instead of videos.</desc> |
419 | - </info> |
420 | - |
421 | -diff --git a/help/C/photo-view.page b/help/C/photo-view.page |
422 | -index b0198ca..a133aff 100644 |
423 | ---- a/help/C/photo-view.page |
424 | -+++ b/help/C/photo-view.page |
425 | -@@ -16,6 +16,8 @@ |
426 | - <email>kittykat3756@gmail.com</email> |
427 | - </credit> |
428 | - |
429 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
430 | -+ |
431 | - <desc>Photos and videos will automatically appear in the photo stream.</desc> |
432 | - </info> |
433 | - |
434 | -diff --git a/help/C/pref-countdown.page b/help/C/pref-countdown.page |
435 | -index 976c390..8c0e38a 100644 |
436 | ---- a/help/C/pref-countdown.page |
437 | -+++ b/help/C/pref-countdown.page |
438 | -@@ -19,6 +19,8 @@ |
439 | - <email its:translate="no">kittykat3756@gmail.com</email> |
440 | - </credit> |
441 | - |
442 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
443 | -+ |
444 | - <desc>Remove the countdown so that photos are taken instantly.</desc> |
445 | - </info> |
446 | - |
447 | -diff --git a/help/C/pref-flash.page b/help/C/pref-flash.page |
448 | -index 5ec3f8e..5faa86e 100644 |
449 | ---- a/help/C/pref-flash.page |
450 | -+++ b/help/C/pref-flash.page |
451 | -@@ -19,6 +19,8 @@ |
452 | - <email its:translate="no">kittykat3756@gmail.com</email> |
453 | - </credit> |
454 | - |
455 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
456 | -+ |
457 | - <desc>Stop the screen from flashing white when taking a photo.</desc> |
458 | - </info> |
459 | - |
460 | -diff --git a/help/C/pref-fullscreen.page b/help/C/pref-fullscreen.page |
461 | -index ca3ad63..c6901be 100644 |
462 | ---- a/help/C/pref-fullscreen.page |
463 | -+++ b/help/C/pref-fullscreen.page |
464 | -@@ -10,6 +10,8 @@ |
465 | - <email>kittykat3756@gmail.com</email> |
466 | - </credit> |
467 | - |
468 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
469 | -+ |
470 | - <desc>Enable and disable fullscreen mode</desc> |
471 | - </info> |
472 | - |
473 | -diff --git a/help/C/pref-image-properties.page b/help/C/pref-image-properties.page |
474 | -index 8f32188..02daa79 100644 |
475 | ---- a/help/C/pref-image-properties.page |
476 | -+++ b/help/C/pref-image-properties.page |
477 | -@@ -20,6 +20,8 @@ |
478 | - <email its:translate="no">kittykat3756@gmail.com</email> |
479 | - </credit> |
480 | - |
481 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
482 | -+ |
483 | - <desc>Adjust the saturation, contrast, brightness and hue to make photos and videos look better.</desc> |
484 | - </info> |
485 | - |
486 | -diff --git a/help/C/pref-resolution.page b/help/C/pref-resolution.page |
487 | -index 26bdf87..956c53c 100644 |
488 | ---- a/help/C/pref-resolution.page |
489 | -+++ b/help/C/pref-resolution.page |
490 | -@@ -18,6 +18,8 @@ |
491 | - <email its:translate="no">kittykat3756@gmail.com</email> |
492 | - </credit> |
493 | - |
494 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
495 | -+ |
496 | - <desc>The resolution of a video or photo determines how much detail you can |
497 | - see in it, changing it will affect the file size.</desc> |
498 | - |
499 | -diff --git a/help/C/video-record.page b/help/C/video-record.page |
500 | -index 315304a..f4b01bd 100644 |
501 | ---- a/help/C/video-record.page |
502 | -+++ b/help/C/video-record.page |
503 | -@@ -19,6 +19,8 @@ |
504 | - <email its:translate="no">kittykat3756@gmail.com</email> |
505 | - </credit> |
506 | - |
507 | -+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> |
508 | -+ |
509 | - <desc>Use your webcam to record short movies for sharing with friends.</desc> |
510 | - </info> |
511 | - |
512 | -diff --git a/help/Makefile.am b/help/Makefile.am |
513 | -index 60d2703..76529d6 100644 |
514 | ---- a/help/Makefile.am |
515 | -+++ b/help/Makefile.am |
516 | -@@ -19,6 +19,7 @@ HELP_FILES = \ |
517 | - effects-apply.page \ |
518 | - index.page \ |
519 | - introduction.page \ |
520 | -+ legal.xml \ |
521 | - photo-delete.page \ |
522 | - photo-save.page \ |
523 | - photo-take.page \ |
524 | |
525 | === removed file 'debian/patches/fix-um-crop-license.patch' |
526 | --- debian/patches/fix-um-crop-license.patch 2013-12-15 20:29:26 +0000 |
527 | +++ debian/patches/fix-um-crop-license.patch 1970-01-01 00:00:00 +0000 |
528 | @@ -1,24 +0,0 @@ |
529 | -From 7aab154c74ee9a6487e38300d907bd797fd5ba0e Mon Sep 17 00:00:00 2001 |
530 | -From: Matthias Clasen <mclasen@redhat.com> |
531 | -Date: Sun, 30 Jun 2013 01:40:26 +0000 |
532 | -Subject: um-crop-area.c: Relicense to GPLv2+ |
533 | - |
534 | -This makes the file fit in better with the rest of Cheese, |
535 | -license-wise. |
536 | - |
537 | -https://bugzilla.gnome.org/show_bug.cgi?id=703239 |
538 | ---- |
539 | -diff --git a/libcheese/um-crop-area.c b/libcheese/um-crop-area.c |
540 | -index 8b9323d..60ca9be 100644 |
541 | ---- a/libcheese/um-crop-area.c |
542 | -+++ b/libcheese/um-crop-area.c |
543 | -@@ -4,7 +4,7 @@ |
544 | - * |
545 | - * This program is free software; you can redistribute it and/or modify |
546 | - * it under the terms of the GNU General Public License as published by |
547 | -- * the Free Software Foundation; either version 3 of the License, or |
548 | -+ * the Free Software Foundation; either version 2 of the License, or |
549 | - * (at your option) any later version. |
550 | - * |
551 | - * This program is distributed in the hope that it will be useful, |
552 | - |
553 | |
554 | === modified file 'debian/patches/series' |
555 | --- debian/patches/series 2013-12-15 20:29:26 +0000 |
556 | +++ debian/patches/series 2013-12-16 00:16:37 +0000 |
557 | @@ -1,4 +1,1 @@ |
558 | -#99_ltmain_as-needed.patch |
559 | use-plugins-good |
560 | -fix-help-license.patch |
561 | -fix-um-crop-license.patch |
562 | |
563 | === modified file 'debian/patches/use-plugins-good' |
564 | --- debian/patches/use-plugins-good 2013-12-15 20:29:26 +0000 |
565 | +++ debian/patches/use-plugins-good 2013-12-16 00:16:37 +0000 |
566 | @@ -1,12 +1,12 @@ |
567 | Description: Look for -plugins-good as camerabin has moved there from -bad (Ubuntu local change, for now) |
568 | Author: Iain Lane <iain.lane@canonical.com> |
569 | Forwarded: not-needed |
570 | +Last-Update: 2013-12-15 |
571 | |
572 | -Index: cheese-3.8.1/configure.ac |
573 | -=================================================================== |
574 | ---- cheese-3.8.1.orig/configure.ac 2013-04-27 11:08:35.486714948 -0400 |
575 | -+++ cheese-3.8.1/configure.ac 2013-04-27 11:08:51.234714290 -0400 |
576 | -@@ -65,8 +65,8 @@ |
577 | +diff -pruN -x '*~' cheese-3.10.1.orig/configure.ac cheese-3.10.1/configure.ac |
578 | +--- cheese-3.10.1.orig/configure.ac 2013-10-14 16:15:17.000000000 +0200 |
579 | ++++ cheese-3.10.1/configure.ac 2013-12-15 03:53:25.000000000 +0100 |
580 | +@@ -65,8 +65,8 @@ GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0" |
581 | LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0 >= 2.91.6" |
582 | GSTREAMER_VERSION=0.11.0 |
583 | GSTREAMER_REQUIRED="gstreamer-plugins-base-1.0 >= $GSTREAMER_VERSION gstreamer-1.0 >= $GSTREAMER_VERSION gstreamer-pbutils-1.0 >= $GSTREAMER_VERSION" |
584 | @@ -17,7 +17,7 @@ |
585 | CAIRO_REQUIRED="cairo >= 1.10.0" |
586 | PANGOCAIRO_REQUIRED="pangocairo >= 1.28.0" |
587 | LIBRSVG_REQUIRED="librsvg-2.0 >= 2.32.0" |
588 | -@@ -108,7 +108,7 @@ |
589 | +@@ -108,7 +108,7 @@ PKG_CHECK_MODULES([CHEESE], |
590 | $GOBJECT_REQUIRED |
591 | $GDK_PIXBUF_REQUIRED |
592 | $GSTREAMER_REQUIRED |