← Back to branch summary

~darkxst/cheese/lp1372346

« back to all changes in this revision

Viewing changes to debian/patches/fix-help-license.patch

  • Committer: Robert Ancell
  • Date: 2013-12-15 20:29:26 UTC
  • Revision ID: robert.ancell@canonical.com-20131215202926-gvss1ki0yjq2e96r
* New upstream release
* debian/patches/fix-help-license.patch:
  - Clarify that the help files are under the CC-BY-SA 3.0 license
* debian/patches/fix-um-crop-license.patch:
  - Backport git commit relicensing this file as GPL-2+ instead of GPL-3+
* debian/copyright:
  - Updated and converted to the 1.0 copyright format
* Don't have libcheese7 depend on gstreamer1.0-plugins-bad
* Suggest gnome-video-effects-extra or gnome-video-effects-frei0r
* New upstream release.
* debian/control.in:
  - Drop alternate build-depends on valac-0.18
  - Use the same clutter dependency as Debian
* No-change rebuild against latest gnome-desktop3 
* Sync with Debian. Remaining changes: 
  - Add apport hook
  - debian/control.in:
    + Bump conflicts/replaces since we didn't take the libcheese-gtk-dev/
      libcheese-doc split until raring
    + Build-depend on good gstreamer plugins instead of bad
  - debian/patches/use-plugins-good:
    + The camerabin plugin is part of the good gstreamer plugins in Ubuntu
    + Refreshed
* New upstream release
* debian/control.in:
  - Drop build-depends on libgee-dev
  - Lower clutter dependency to version available in Ubuntu
[ Thomas Bechtold ]
* New upstream release.
* New upstream release
* New upstream release
* Bump clutter to help with the cogl transition
* New upstream release
* debian/control.in: Loosen dependency on cheese-common to 3.4 to allow
  libcheese* from unstable & experimental to be installed at the same time

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-help-license.patch
 
1
From a4dbb82074231322d099c9943d7f2929dc711173 Mon Sep 17 00:00:00 2001
 
2
From: David King <amigadave@amigadave.com>
 
3
Date: Fri, 28 Jun 2013 13:20:02 +0100
 
4
Subject: [PATCH] License help under CC-BY-SA 3.0 Unported
 
5
 
 
6
The help was not explicitly under a license, as described in bug 703238.
 
7
Specify the license as CC-BY-SA 3.0 to match with other GNOME help:
 
8
 
 
9
https://wiki.gnome.org/DocumentationProject/Licensing
 
10
 
 
11
License clarification approved by help contributors (found with
 
12
"git shortlog help/C/*.page") as listed below:
 
13
 
 
14
Signed-off-by: Jeremy Bicha <jbicha@ubuntu.com>
 
15
Signed-off-by: Ekaterina Gerasimova <kittykat3756@gmail.com>
 
16
Signed-off-by: Michael Hill <mdhill@gnome.org>
 
17
Signed-off-by: Tiffany Ann Antopolski <tiffany.antopolski@gmail.com>
 
18
Signed-off-by: Julita Inca <jinca@gnome.org>
 
19
---
 
20
 help/C/burst-mode.page            | 2 ++
 
21
 help/C/effects-apply.page         | 2 ++
 
22
 help/C/index.page                 | 2 ++
 
23
 help/C/introduction.page          | 2 ++
 
24
 help/C/legal.xml                  | 8 ++++++++
 
25
 help/C/photo-delete.page          | 2 ++
 
26
 help/C/photo-save.page            | 2 ++
 
27
 help/C/photo-take.page            | 2 ++
 
28
 help/C/photo-view.page            | 2 ++
 
29
 help/C/pref-countdown.page        | 2 ++
 
30
 help/C/pref-flash.page            | 2 ++
 
31
 help/C/pref-fullscreen.page       | 2 ++
 
32
 help/C/pref-image-properties.page | 2 ++
 
33
 help/C/pref-resolution.page       | 2 ++
 
34
 help/C/video-record.page          | 2 ++
 
35
 help/Makefile.am                  | 1 +
 
36
 21 files changed, 47 insertions(+)
 
37
 create mode 100644 help/C/legal.xml
 
38
 
 
39
diff --git a/help/C/burst-mode.page b/help/C/burst-mode.page
 
40
index c0d64ed..c53593b 100644
 
41
--- a/help/C/burst-mode.page
 
42
+++ b/help/C/burst-mode.page
 
43
@@ -20,6 +20,8 @@
 
44
       <email its:translate="no">kittykat3756@gmail.com</email>
 
45
     </credit>
 
46
 
 
47
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
48
+
 
49
     <desc><gui>Burst mode</gui> takes several photos rapidly. Change your pose
 
50
     in between each shot!</desc>
 
51
   </info>
 
52
 
 
53
diff --git a/help/C/effects-apply.page b/help/C/effects-apply.page
 
54
index 9c36128..73a0014 100644
 
55
--- a/help/C/effects-apply.page
 
56
+++ b/help/C/effects-apply.page
 
57
@@ -15,6 +15,8 @@
 
58
       <email>kittykat3756@gmail.com</email>
 
59
     </credit>
 
60
 
 
61
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
62
+
 
63
     <desc>Add fun effects to your photos and videos, like turning yourself green
 
64
     or distorting the picture like a funhouse mirror.</desc>
 
65
   </info>
 
66
diff --git a/help/C/index.page b/help/C/index.page
 
67
index bfa126c..d2a0a79 100644
 
68
--- a/help/C/index.page
 
69
+++ b/help/C/index.page
 
70
@@ -16,6 +16,8 @@
 
71
       <email>kittykat3756@gmail.com</email>
 
72
     </credit>
 
73
 
 
74
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
75
+
 
76
     <desc>Cheese lets you take photos and videos using your webcam. You can
 
77
     even add special effects!</desc>
 
78
 
 
79
diff --git a/help/C/introduction.page b/help/C/introduction.page
 
80
index da21997..7b5e355 100644
 
81
--- a/help/C/introduction.page
 
82
+++ b/help/C/introduction.page
 
83
@@ -20,6 +20,8 @@
 
84
       <email its:translate="no">kittykat3756@gmail.com</email>
 
85
     </credit>
 
86
 
 
87
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
88
+
 
89
     <desc>Introduction to the <app>Cheese</app> webcam application.</desc>
 
90
   </info>
 
91
 
 
92
diff --git a/help/C/legal.xml b/help/C/legal.xml
 
93
new file mode 100644
 
94
index 0000000..aa36246
 
95
--- /dev/null
 
96
+++ b/help/C/legal.xml
 
97
@@ -0,0 +1,8 @@
 
98
+<license xmlns="http://projectmallard.org/1.0/"
 
99
+         href="http://creativecommons.org/licenses/by-sa/3.0/">
 
100
+
 
101
+  <p>This work is licensed under a
 
102
+  <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
 
103
+  Attribution-ShareAlike 3.0 Unported License</link>.</p>
 
104
+
 
105
+</license>
 
106
diff --git a/help/C/photo-delete.page b/help/C/photo-delete.page
 
107
index 987d5bd..416f167 100644
 
108
--- a/help/C/photo-delete.page
 
109
+++ b/help/C/photo-delete.page
 
110
@@ -16,6 +16,8 @@
 
111
       <email>kittykat3756@gmail.com</email>
 
112
     </credit>
 
113
 
 
114
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
115
+
 
116
     <desc>Remove photos and videos that you no longer want to keep.</desc>
 
117
   </info>
 
118
 
 
119
diff --git a/help/C/photo-save.page b/help/C/photo-save.page
 
120
index c396043..11e83e1 100644
 
121
--- a/help/C/photo-save.page
 
122
+++ b/help/C/photo-save.page
 
123
@@ -16,6 +16,8 @@
 
124
       <email>kittykat3756@gmail.com</email>
 
125
     </credit>
 
126
 
 
127
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
128
+
 
129
     <desc>Save a photo or video in a different folder.</desc>
 
130
   </info>
 
131
 
 
132
diff --git a/help/C/photo-take.page b/help/C/photo-take.page
 
133
index 64be7ec..c3fbcce 100644
 
134
--- a/help/C/photo-take.page
 
135
+++ b/help/C/photo-take.page
 
136
@@ -24,6 +24,8 @@
 
137
       <email its:translate="no">kittykat3756@gmail.com</email>
 
138
     </credit>
 
139
 
 
140
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
141
+
 
142
     <desc>Use your webcam to take photos instead of videos.</desc>
 
143
   </info>
 
144
 
 
145
diff --git a/help/C/photo-view.page b/help/C/photo-view.page
 
146
index b0198ca..a133aff 100644
 
147
--- a/help/C/photo-view.page
 
148
+++ b/help/C/photo-view.page
 
149
@@ -16,6 +16,8 @@
 
150
       <email>kittykat3756@gmail.com</email>
 
151
     </credit>
 
152
 
 
153
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
154
+
 
155
     <desc>Photos and videos will automatically appear in the photo stream.</desc>
 
156
   </info>
 
157
 
 
158
diff --git a/help/C/pref-countdown.page b/help/C/pref-countdown.page
 
159
index 976c390..8c0e38a 100644
 
160
--- a/help/C/pref-countdown.page
 
161
+++ b/help/C/pref-countdown.page
 
162
@@ -19,6 +19,8 @@
 
163
       <email its:translate="no">kittykat3756@gmail.com</email>
 
164
     </credit>
 
165
 
 
166
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
167
+
 
168
     <desc>Remove the countdown so that photos are taken instantly.</desc>
 
169
   </info>
 
170
 
 
171
diff --git a/help/C/pref-flash.page b/help/C/pref-flash.page
 
172
index 5ec3f8e..5faa86e 100644
 
173
--- a/help/C/pref-flash.page
 
174
+++ b/help/C/pref-flash.page
 
175
@@ -19,6 +19,8 @@
 
176
       <email its:translate="no">kittykat3756@gmail.com</email>
 
177
     </credit>
 
178
 
 
179
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
180
+
 
181
     <desc>Stop the screen from flashing white when taking a photo.</desc>
 
182
   </info>
 
183
 
 
184
diff --git a/help/C/pref-fullscreen.page b/help/C/pref-fullscreen.page
 
185
index ca3ad63..c6901be 100644
 
186
--- a/help/C/pref-fullscreen.page
 
187
+++ b/help/C/pref-fullscreen.page
 
188
@@ -10,6 +10,8 @@
 
189
       <email>kittykat3756@gmail.com</email>
 
190
     </credit>
 
191
 
 
192
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
193
+
 
194
     <desc>Enable and disable fullscreen mode</desc>
 
195
   </info>
 
196
 
 
197
diff --git a/help/C/pref-image-properties.page b/help/C/pref-image-properties.page
 
198
index 8f32188..02daa79 100644
 
199
--- a/help/C/pref-image-properties.page
 
200
+++ b/help/C/pref-image-properties.page
 
201
@@ -20,6 +20,8 @@
 
202
       <email its:translate="no">kittykat3756@gmail.com</email>
 
203
     </credit>
 
204
 
 
205
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
206
+
 
207
     <desc>Adjust the saturation, contrast, brightness and hue to make photos and videos look better.</desc>
 
208
   </info>
 
209
 
 
210
diff --git a/help/C/pref-resolution.page b/help/C/pref-resolution.page
 
211
index 26bdf87..956c53c 100644
 
212
--- a/help/C/pref-resolution.page
 
213
+++ b/help/C/pref-resolution.page
 
214
@@ -18,6 +18,8 @@
 
215
       <email its:translate="no">kittykat3756@gmail.com</email>
 
216
     </credit>
 
217
 
 
218
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
219
+
 
220
     <desc>The resolution of a video or photo determines how much detail you can
 
221
     see in it, changing it will affect the file size.</desc>
 
222
 
 
223
diff --git a/help/C/video-record.page b/help/C/video-record.page
 
224
index 315304a..f4b01bd 100644
 
225
--- a/help/C/video-record.page
 
226
+++ b/help/C/video-record.page
 
227
@@ -19,6 +19,8 @@
 
228
       <email its:translate="no">kittykat3756@gmail.com</email>
 
229
     </credit>
 
230
 
 
231
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
232
+
 
233
     <desc>Use your webcam to record short movies for sharing with friends.</desc>
 
234
   </info>
 
235
 
 
236
diff --git a/help/Makefile.am b/help/Makefile.am
 
237
index 60d2703..76529d6 100644
 
238
--- a/help/Makefile.am
 
239
+++ b/help/Makefile.am
 
240
@@ -19,6 +19,7 @@ HELP_FILES = \
 
241
        effects-apply.page \
 
242
        index.page \
 
243
        introduction.page \
 
244
+       legal.xml \
 
245
        photo-delete.page \
 
246
        photo-save.page \
 
247
        photo-take.page \