Merge lp:~noskcaj/deja-dup/merge into lp:~ubuntu-desktop/deja-dup/ubuntu
- merge
- Merge into ubuntu
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merged at revision: | 43 |
Proposed branch: | lp:~noskcaj/deja-dup/merge |
Merge into: | lp:~ubuntu-desktop/deja-dup/ubuntu |
Diff against target: |
687 lines (+424/-87) 9 files modified
debian/changelog (+294/-0) debian/control (+12/-9) debian/control.in (+89/-0) debian/copyright (+19/-57) debian/gbp.conf (+8/-0) debian/patches/0001-fix-appdata-validate-ftbs.patch (+0/-17) debian/patches/series (+0/-1) debian/rules (+1/-2) debian/watch (+1/-1) |
To merge this branch: | bzr merge lp:~noskcaj/deja-dup/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+263823@code.launchpad.net |
Commit message
Description of the change
Merge from debian. This leaves us with a package mostly the same as our old one, so there are probably some changes that can be dropped.
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 2015-02-23 16:26:53 +0000 |
3 | +++ debian/changelog 2015-07-04 05:02:31 +0000 |
4 | @@ -1,3 +1,49 @@ |
5 | +deja-dup (34.0-1ubuntu1) wily; urgency=low |
6 | + |
7 | + * Merge from debian. Remaining changes: |
8 | + - debian/control: |
9 | + + Add appdata-tools to Build-Deps to validate appdata file |
10 | + + Add dbus-x11, python3 and desktop-file-utils as Build-Depends for tests |
11 | + + Use dh-translations |
12 | + + Change yelp-tools Build-Depend to just itstool, as that's all |
13 | + that is needed |
14 | + + Build-depend on gnome-control-center, unity-control-center, libunity |
15 | + + Add XS-Testsuite: Autopkgtest |
16 | + + Use ubuntu vcs |
17 | + + Use ${misc:Pre-Depends} |
18 | + + Depend on adwaita-icon-theme |
19 | + + Don't recommend an ssh client |
20 | + + Reccomend policykit-1 |
21 | + + Improve descriptions |
22 | + + Split backends into different packages |
23 | + + Drop dbg package |
24 | + - debian/rules: |
25 | + + Add --with translations to configure |
26 | + + Enable CCPANEL, UNITY, UNITY_CCPANEL |
27 | + + Use multiarch libs |
28 | + + Don't make a dbg package |
29 | + + Run dh_auto_test |
30 | + + Don't override dh_makeshlibs |
31 | + - Add autopkgtest |
32 | + |
33 | + -- Jackson Doak <noskcaj@ubuntu.com> Sat, 04 Jul 2015 13:39:47 +1000 |
34 | + |
35 | +deja-dup (34.0-1) unstable; urgency=medium |
36 | + |
37 | + * Team upload. |
38 | + * New upstraem release. |
39 | + * Update outdated section names in debian/gbp.conf. |
40 | + |
41 | + -- Michael Biebl <biebl@debian.org> Tue, 16 Jun 2015 16:54:00 +0200 |
42 | + |
43 | +deja-dup (32.0-1) unstable; urgency=medium |
44 | + |
45 | + * New upstream release |
46 | + * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes) |
47 | + * debian/copyright: Fix copyright file, files have been moved around |
48 | + |
49 | + -- Laurent Bigonville <bigon@debian.org> Sun, 12 Oct 2014 10:51:13 +0200 |
50 | + |
51 | deja-dup (32.0-0ubuntu5) vivid; urgency=medium |
52 | |
53 | * debian/patches/0001-fix-appdata-validate-ftbs.patch: |
54 | @@ -36,6 +82,15 @@ |
55 | |
56 | -- Michael Terry <mterry@ubuntu.com> Sat, 20 Sep 2014 11:35:28 -0400 |
57 | |
58 | +deja-dup (30.0-1) unstable; urgency=medium |
59 | + |
60 | + * New upstream release |
61 | + - Drop debian/patches/01_CMP0004_OLD.patch: Fixed upstream |
62 | + * Add debian/gbp.conf file |
63 | + * debian/control.in: Re-add the Vcs-* fields with the new URL's |
64 | + |
65 | + -- Laurent Bigonville <bigon@debian.org> Fri, 11 Apr 2014 22:21:25 +0200 |
66 | + |
67 | deja-dup (30.0-0ubuntu7) utopic; urgency=medium |
68 | |
69 | * debian/patches/deprecated-property.patch: |
70 | @@ -92,6 +147,25 @@ |
71 | |
72 | -- Michael Terry <mterry@ubuntu.com> Fri, 28 Mar 2014 09:03:56 -0400 |
73 | |
74 | +deja-dup (29.5-1) unstable; urgency=low |
75 | + |
76 | + * New upstream release (Closes: #667722, #671479) |
77 | + - Adjust the {build-}dependencies |
78 | + - debian/rules, debian/control: deja-dup is now using cmake |
79 | + * Adopt deja-dup by the GNOME team (Closes: #740924) |
80 | + * debian/control: Bump Standards-Version to 3.9.5 (no further changes) |
81 | + * Add debian/patches/01_CMP0004_OLD.patch: Fix FTBFS due to changes in cmake |
82 | + * debian/rules: Drop the override_dh_builddeb target, this is not needed |
83 | + anymore |
84 | + * Fix the debian/watch URL |
85 | + * Bump debhelper compatibility to 9 to get the hardening flags for free |
86 | + * debian/rules: Properly exclude nautilus plugin from dh_makeshlibs call |
87 | + (Closes: #651279) |
88 | + * debian/control: Adjust the recommends, add gvfs-backends and rename |
89 | + python-rackspace-cloudfiles to python-cloudfiles (Closes: #669045, #732730) |
90 | + |
91 | + -- Laurent Bigonville <bigon@debian.org> Thu, 06 Mar 2014 22:11:37 +0100 |
92 | + |
93 | deja-dup (29.5-0ubuntu2) trusty; urgency=medium |
94 | |
95 | * debian/patches/rm-full-path.patch: |
96 | @@ -366,6 +440,54 @@ |
97 | |
98 | -- Michael Terry <mterry@ubuntu.com> Mon, 24 Oct 2011 13:49:53 -0400 |
99 | |
100 | +deja-dup (20.2-2.1) unstable; urgency=low |
101 | + |
102 | + * Non-maintainer upload. |
103 | + * Fix "configure:3028: error: xmllint not found": |
104 | + change build dependency from itstool to yelp-tools; thanks, Michael Biebl. |
105 | + (Closes: #666225) |
106 | + |
107 | + -- gregor herrmann <gregoa@debian.org> Sun, 03 Jun 2012 16:37:10 +0200 |
108 | + |
109 | +deja-dup (20.2-2) unstable; urgency=low |
110 | + |
111 | + * ACK previous NMU (Closes: #651257) |
112 | + * Delete old unused patch (Closes: #651258) |
113 | + * Drop gnome-control-center support as Gnome 3 upstream don't want 3rd |
114 | + party applications to be installed there (Closes: #650142) |
115 | + |
116 | + -- Jose Carlos Garcia Sogo <jsogo@debian.org> Thu, 08 Dec 2011 12:15:32 +0100 |
117 | + |
118 | +deja-dup (20.2-1.1) unstable; urgency=low |
119 | + |
120 | + * Non-maintainer upload. |
121 | + * debian/control: Drop libdbusmenu-gtk3-dev Build-dep, the package is only |
122 | + available in experimental for now (Closes: #651257) |
123 | + |
124 | + -- Laurent Bigonville <bigon@debian.org> Wed, 07 Dec 2011 11:54:25 +0100 |
125 | + |
126 | +deja-dup (20.2-1) unstable; urgency=low |
127 | + |
128 | + * New upstream release (Closes: #613336, #632568) |
129 | + - Fixed GPG error during restore (Closes: #624598) |
130 | + - Transitioned to use nautilus 3 (Closes: #637312) |
131 | + * Remove .la files (Closes: #621293) |
132 | + * debian/rules: |
133 | + - Convert to dh8 |
134 | + * debian/source/format: |
135 | + - Convert to 3.0 (quilt) |
136 | + * debian/control: |
137 | + - Update description |
138 | + - Needs libnotify >= 0.7.0 |
139 | + * debian/copyright: |
140 | + - Update from upstream AUTHORS |
141 | + - Standards-Version: bump to 3.9.2, no changes needed. |
142 | + - Change yelp Build-Dep to just itstool |
143 | + |
144 | + (These changes where taken from Ubuntu package, thanks to Michael Terry) |
145 | + |
146 | + -- Jose Carlos Garcia Sogo <jsogo@debian.org> Fri, 25 Nov 2011 21:11:10 +0100 |
147 | + |
148 | deja-dup (20.1-0ubuntu1) precise; urgency=low |
149 | |
150 | * New upstream bug fix release |
151 | @@ -724,6 +846,14 @@ |
152 | |
153 | -- Michael Terry <michael.terry@canonical.com> Tue, 04 May 2010 15:57:37 -0400 |
154 | |
155 | +deja-dup (14.2-1) unstable; urgency=low |
156 | + |
157 | + * New upstream release |
158 | + + Fixes problem to external disks (Closes: #583218) |
159 | + * Bump dependency in duplicity to 0.6.07 (Closes: #546520) |
160 | + |
161 | + -- Jose Carlos Garcia Sogo <jsogo@debian.org> Thu, 08 Jul 2010 16:46:39 +0200 |
162 | + |
163 | deja-dup (14.0.3-0ubuntu1) lucid; urgency=low |
164 | |
165 | * New upstream release |
166 | @@ -747,6 +877,12 @@ |
167 | |
168 | -- Michael Terry <mike@mterry.name> Sat, 03 Apr 2010 07:18:59 -0400 |
169 | |
170 | +deja-dup (14.0-1) unstable; urgency=low |
171 | + |
172 | + * New upstream version (Closes: #574938) |
173 | + |
174 | + -- Jose Carlos Garcia Sogo <jsogo@debian.org> Thu, 01 Apr 2010 11:55:08 +0200 |
175 | + |
176 | deja-dup (14.0-0ubuntu1) lucid; urgency=low |
177 | |
178 | * New upstream bug-fix release |
179 | @@ -772,6 +908,15 @@ |
180 | |
181 | -- Michael Terry <michael.terry@canonical.com> Mon, 08 Feb 2010 17:44:05 -0500 |
182 | |
183 | +deja-dup (13.6-1) unstable; urgency=low |
184 | + |
185 | + * New upstream release (Closes: #567124) |
186 | + + Adds menu entry to System category (Closes: #544455) |
187 | + * Depends on gvfs-fuse (Closes: #546506) |
188 | + * Bump Standards-Version to 3.8.4. No changes needed. |
189 | + |
190 | + -- Jose Carlos Garcia Sogo <jsogo@debian.org> Thu, 28 Jan 2010 00:13:03 +0100 |
191 | + |
192 | deja-dup (13.6-0ubuntu2) lucid; urgency=low |
193 | |
194 | * Build-depend on libappindicator-dev (>= 0.0.11), in order to switch over |
195 | @@ -820,6 +965,22 @@ |
196 | |
197 | -- Michael Terry <mike@mterry.name> Mon, 12 Oct 2009 11:01:41 -0400 |
198 | |
199 | +deja-dup (10.1-2) unstable; urgency=low |
200 | + |
201 | + * intltool is a build-dependency (Closes: #544451) |
202 | + * Bump Standards-Version to 3.8.1. No changes needed. |
203 | + * Add to debian/copyright file every (C) bit in sources. |
204 | + Thanks to Torsten Werner. |
205 | + |
206 | + -- Jose Carlos Garcia Sogo <jsogo@debian.org> Mon, 31 Aug 2009 23:16:58 +0200 |
207 | + |
208 | +deja-dup (10.1-1) unstable; urgency=low |
209 | + |
210 | + * New Upstream Version |
211 | + * Docs have been relicensed to GPLv3. |
212 | + |
213 | + -- Jose Carlos Garcia Sogo <jsogo@debian.org> Tue, 04 Aug 2009 23:34:17 +0200 |
214 | + |
215 | deja-dup (10.0-0ubuntu1) karmic; urgency=low |
216 | |
217 | * New upstream release (LP: #384067, LP: #353838, LP: #333126) |
218 | @@ -834,6 +995,46 @@ |
219 | |
220 | -- Michael Terry <michael.terry@canonical.com> Fri, 05 Jun 2009 16:09:45 -0400 |
221 | |
222 | +deja-dup (9.1-1) unstable; urgency=low |
223 | + |
224 | + * New Upstream Version |
225 | + |
226 | + -- Jose Carlos Garcia Sogo <jsogo@debian.org> Tue, 28 Apr 2009 23:47:27 +0200 |
227 | + |
228 | +deja-dup (8.1-1) unstable; urgency=low |
229 | + |
230 | + * Inital Debian release, based on Ubuntu packages (Closes: #506590) |
231 | + * debian/control: |
232 | + - Change maintainer to me. |
233 | + - Bump Standards-Version to 3.8.1. No changes needed. |
234 | + - Move -dbg package to 'debug' section. |
235 | + |
236 | + -- Jose Carlos Garcia Sogo <jsogo@debian.org> Tue, 14 Apr 2009 00:19:30 +0200 |
237 | + |
238 | +deja-dup (8.1-0intrepid1) intrepid; urgency=low |
239 | + |
240 | + * New upstream release |
241 | + |
242 | + -- Michael Terry <mike@mterry.name> Fri, 03 Apr 2009 17:59:44 -0400 |
243 | + |
244 | +deja-dup (8.1-0hardy1) hardy; urgency=low |
245 | + |
246 | + * New upstream release |
247 | + |
248 | + -- Michael Terry <mike@mterry.name> Fri, 03 Apr 2009 17:58:44 -0400 |
249 | + |
250 | +deja-dup (8.0-0intrepid1) intrepid; urgency=low |
251 | + |
252 | + * New upstream release |
253 | + |
254 | + -- Michael Terry <mike@mterry.name> Sun, 29 Mar 2009 11:53:45 -0400 |
255 | + |
256 | +deja-dup (8.0-0hardy1) hardy; urgency=low |
257 | + |
258 | + * Initial hardy release |
259 | + |
260 | + -- Michael Terry <mike@mterry.name> Sun, 29 Mar 2009 11:43:28 -0400 |
261 | + |
262 | deja-dup (7.4-0ubuntu2) jaunty; urgency=low |
263 | |
264 | * debian/control: |
265 | @@ -852,3 +1053,96 @@ |
266 | * Initial release (LP: #324388) |
267 | |
268 | -- Michael Terry <mike@mterry.name> Thu, 12 Feb 2009 07:18:01 -0500 |
269 | + |
270 | +deja-dup (7.4-0~intrepid1) intrepid; urgency=low |
271 | + |
272 | + * New upstream release |
273 | + |
274 | + -- Michael Terry <mike@mterry.name> Wed, 11 Feb 2009 21:17:47 -0500 |
275 | + |
276 | +deja-dup (7.3-0~intrepid1) intrepid; urgency=low |
277 | + |
278 | + * New upstream release |
279 | + |
280 | + -- Michael Terry <mike@mterry.name> Tue, 03 Feb 2009 20:40:01 -0500 |
281 | + |
282 | +deja-dup (7.2-0~intrepid1) intrepid; urgency=low |
283 | + |
284 | + * New upstream release |
285 | + |
286 | + -- Michael Terry <mike@mterry.name> Mon, 02 Feb 2009 20:49:16 -0500 |
287 | + |
288 | +deja-dup (7.1-0~intrepid1) intrepid; urgency=low |
289 | + |
290 | + * New upstream release |
291 | + |
292 | + -- Michael Terry <mike@mterry.name> Thu, 29 Jan 2009 15:54:19 -0500 |
293 | + |
294 | +deja-dup (7.0-0~intrepid1) intrepid; urgency=low |
295 | + |
296 | + * New upstream release |
297 | + * debian/control: |
298 | + - Add Build-Depend on libnautilus-extension-dev |
299 | + |
300 | + -- Michael Terry <mike@mterry.name> Thu, 29 Jan 2009 08:07:33 -0500 |
301 | + |
302 | +deja-dup (6.0-0~intrepid1) intrepid; urgency=low |
303 | + |
304 | + * New upstream release |
305 | + |
306 | + -- Michael Terry <mike@mterry.name> Mon, 19 Jan 2009 19:51:28 -0500 |
307 | + |
308 | +deja-dup (5.2-0~intrepid1) intrepid; urgency=low |
309 | + |
310 | + * New upstream release |
311 | + |
312 | + -- Michael Terry <mike@mterry.name> Wed, 07 Jan 2009 21:47:58 -0500 |
313 | + |
314 | +deja-dup (5.1-0~intrepid1) intrepid; urgency=low |
315 | + |
316 | + * New upstream version |
317 | + |
318 | + -- Michael Terry <mike@mterry.name> Wed, 07 Jan 2009 20:54:58 -0500 |
319 | + |
320 | +deja-dup (5.0-0~intrepid1) intrepid; urgency=low |
321 | + |
322 | + * New upstream version |
323 | + |
324 | + -- Michael Terry <mike@mterry.name> Tue, 06 Jan 2009 20:30:09 -0500 |
325 | + |
326 | +deja-dup (4.0-0~intrepid1) intrepid; urgency=low |
327 | + |
328 | + * New upstream version |
329 | + * debian/control: |
330 | + - Add dbg package |
331 | + - Recommend util-linux, for ionice |
332 | + - Dropped valac from Build-Depends, not needed |
333 | + |
334 | + -- Michael Terry <michael.terry@canonical.com> Mon, 29 Dec 2008 23:19:56 -0500 |
335 | + |
336 | +deja-dup (3.0~ppa1) intrepid; urgency=low |
337 | + |
338 | + * New upstream version |
339 | + * debian/control: |
340 | + - Add libunique-dev and libnotify-dev to Build-Depends |
341 | + |
342 | + -- Michael Terry <mike@mterry.name> Thu, 04 Dec 2008 22:28:24 -0500 |
343 | + |
344 | +deja-dup (2.1-0ubuntu1~ppa1) intrepid; urgency=low |
345 | + |
346 | + * New upstream version |
347 | + |
348 | + -- Michael Terry <mike@mterry.name> Mon, 01 Dec 2008 21:09:29 -0500 |
349 | + |
350 | +deja-dup (2.0-0ubuntu1~ppa1) intrepid; urgency=low |
351 | + |
352 | + * New upstream version |
353 | + |
354 | + -- Michael Terry <mike@mterry.name> Sat, 22 Nov 2008 08:20:04 -0500 |
355 | + |
356 | +deja-dup (1.0-0ubuntu1~ppa1) intrepid; urgency=low |
357 | + |
358 | + * Initial Release. |
359 | + |
360 | + -- Michael Terry <michael.terry@canonical.com> Mon, 20 Oct 2008 13:00:47 -0400 |
361 | + |
362 | |
363 | === modified file 'debian/control' |
364 | --- debian/control 2015-02-23 16:02:45 +0000 |
365 | +++ debian/control 2015-07-04 05:02:31 +0000 |
366 | @@ -1,39 +1,42 @@ |
367 | +# This file is autogenerated. DO NOT EDIT! |
368 | +# |
369 | +# Modifications should be made to debian/control.in instead. |
370 | +# This file is regenerated automatically in the clean target. |
371 | Source: deja-dup |
372 | Section: utils |
373 | Priority: optional |
374 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
375 | -XSBC-Original-Maintainer: Jose Carlos Garcia Sogo <jsogo@debian.org> |
376 | +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
377 | +Uploaders: Iain Lane <iain@orangesquash.org.uk>, Jackson Doak <noskcaj@ubuntu.com>, Laurent Bigonville <bigon@debian.org>, Louis Bouchard <louis.bouchard@ubuntu.com>, Michael Biebl <biebl@debian.org>, Michael Terry <mterry@ubuntu.com> |
378 | Homepage: https://launchpad.net/deja-dup |
379 | Build-Depends: appstream-util, |
380 | cmake, |
381 | dbus-x11, |
382 | debhelper (>= 9), |
383 | desktop-file-utils, |
384 | - dh-translations, |
385 | + gnome-pkg-tools, |
386 | intltool (>= 0.40), |
387 | itstool, |
388 | libglib2.0-dev (>= 2.34), |
389 | libgnome-control-center-dev (>= 3.4), |
390 | libgtk-3-dev (>= 3.6), |
391 | - libnautilus-extension-dev (>= 3.0), |
392 | + libnautilus-extension-dev, |
393 | libnotify-dev (>= 0.7), |
394 | libpeas-dev, |
395 | libsecret-1-dev, |
396 | libunity-control-center-dev, |
397 | libunity-dev (>= 5.0.0), |
398 | - libxml2-utils, |
399 | pkg-config, |
400 | python3, |
401 | - valac (>= 0.22), |
402 | + valac (>= 0.20) |
403 | +Standards-Version: 3.9.6 |
404 | XS-Testsuite: autopkgtest |
405 | -Standards-Version: 3.9.3 |
406 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/deja-dup/ubuntu |
407 | |
408 | Package: deja-dup |
409 | Architecture: any |
410 | -Pre-Depends: ${misc:Pre-Depends}, |
411 | -Depends: ${misc:Depends}, |
412 | - ${shlibs:Depends}, |
413 | +Depends: ${shlibs:Depends}, |
414 | + ${misc:Depends}, |
415 | duplicity (>= 0.6.23), |
416 | adwaita-icon-theme |
417 | Recommends: deja-dup-backend-gvfs, |
418 | |
419 | === added file 'debian/control.in' |
420 | --- debian/control.in 1970-01-01 00:00:00 +0000 |
421 | +++ debian/control.in 2015-07-04 05:02:31 +0000 |
422 | @@ -0,0 +1,89 @@ |
423 | +Source: deja-dup |
424 | +Section: utils |
425 | +Priority: optional |
426 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
427 | +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
428 | +Uploaders: @GNOME_TEAM@ |
429 | +Homepage: https://launchpad.net/deja-dup |
430 | +Build-Depends: appstream-util, |
431 | + cmake, |
432 | + dbus-x11, |
433 | + debhelper (>= 9), |
434 | + desktop-file-utils, |
435 | + gnome-pkg-tools, |
436 | + intltool (>= 0.40), |
437 | + itstool, |
438 | + libglib2.0-dev (>= 2.34), |
439 | + libgnome-control-center-dev (>= 3.4), |
440 | + libgtk-3-dev (>= 3.6), |
441 | + libnautilus-extension-dev, |
442 | + libnotify-dev (>= 0.7), |
443 | + libpeas-dev, |
444 | + libsecret-1-dev, |
445 | + libunity-control-center-dev, |
446 | + libunity-dev (>= 5.0.0), |
447 | + pkg-config, |
448 | + python3, |
449 | + valac (>= 0.20) |
450 | +Standards-Version: 3.9.6 |
451 | +XS-Testsuite: autopkgtest |
452 | +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/deja-dup/ubuntu |
453 | + |
454 | +Package: deja-dup |
455 | +Architecture: any |
456 | +Depends: ${shlibs:Depends}, |
457 | + ${misc:Depends}, |
458 | + duplicity (>= 0.6.23), |
459 | + adwaita-icon-theme |
460 | +Recommends: deja-dup-backend-gvfs, |
461 | + policykit-1, |
462 | +Suggests: deja-dup-backend-cloudfiles, |
463 | + deja-dup-backend-s3, |
464 | +Description: Back up your files |
465 | + Déjà Dup is a simple backup tool. It hides the complexity of backing up the |
466 | + Right Way (encrypted, off-site, and regular) and uses duplicity as the |
467 | + backend. |
468 | + . |
469 | + Features: |
470 | + * Support for local, remote, or cloud backup locations, such as Amazon S3, |
471 | + and Rackspace Cloud Files |
472 | + * Securely encrypts and compresses your data |
473 | + * Incrementally backs up, letting you restore from any particular backup |
474 | + * Schedules regular backups |
475 | + * Integrates well into your GNOME desktop |
476 | + |
477 | +Package: deja-dup-backend-gvfs |
478 | +Architecture: all |
479 | +Depends: ${misc:Depends}, |
480 | + deja-dup, |
481 | + gvfs-backends, |
482 | +Description: Remote server support for Déjà Dup |
483 | + Déjà Dup is a simple backup tool. It hides the complexity of backing up the |
484 | + Right Way (encrypted, off-site, and regular) and uses duplicity as the |
485 | + backend. |
486 | + . |
487 | + This package adds FTP, SSH, WebDAV, and Windows Shares support to Déjà Dup. |
488 | + |
489 | +Package: deja-dup-backend-cloudfiles |
490 | +Architecture: all |
491 | +Depends: ${misc:Depends}, |
492 | + deja-dup, |
493 | + python-cloudfiles, |
494 | +Description: Rackspace Cloudfiles support for Déjà Dup |
495 | + Déjà Dup is a simple backup tool. It hides the complexity of backing up the |
496 | + Right Way (encrypted, off-site, and regular) and uses duplicity as the |
497 | + backend. |
498 | + . |
499 | + This package adds Rackspace Cloudfiles support to Déjà Dup. |
500 | + |
501 | +Package: deja-dup-backend-s3 |
502 | +Architecture: all |
503 | +Depends: ${misc:Depends}, |
504 | + deja-dup, |
505 | + python-boto (>= 0.9d), |
506 | +Description: Amazon S3 support for Déjà Dup |
507 | + Déjà Dup is a simple backup tool. It hides the complexity of backing up the |
508 | + Right Way (encrypted, off-site, and regular) and uses duplicity as the |
509 | + backend. |
510 | + . |
511 | + This package adds Amazon S3 support to Déjà Dup. |
512 | |
513 | === modified file 'debian/copyright' |
514 | --- debian/copyright 2012-08-21 20:18:56 +0000 |
515 | +++ debian/copyright 2015-07-04 05:02:31 +0000 |
516 | @@ -1,62 +1,41 @@ |
517 | -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
518 | +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 |
519 | Upstream-Name: Déjà Dup |
520 | Upstream-Contact: Déjà Dup Maintainers <deja-dup-team@lists.launchpad.net> |
521 | Source: https://launchpad.net/deja-dup/+download |
522 | |
523 | Files: * |
524 | -Copyright: 2008–2011 Michael Terry <mike@mterry.name> |
525 | - 2009–2010 Andrew Fister <temposs@gmail.com> |
526 | +Copyright: 2008,2009,2010,2011 Michael Terry <mike@mterry.name> |
527 | + 2009,2010 Andrew Fister <temposs@gmail.com> |
528 | 2010 Michael Vogt <michael.vogt@ubuntu.com> |
529 | 2010 Urban Skudnik <urban.skudnik@gmail.com> |
530 | - 2011 Canonical Ltd |
531 | -Comment: For specific author information, see the bzr logs |
532 | License: GPL-3+ |
533 | |
534 | Files: po/*.po |
535 | -Copyright: 2008–2011 Rosetta Contributors and Canonical Ltd |
536 | -License: GPL-3+ |
537 | - |
538 | -Files: common/uriutils.[ch] |
539 | -Copyright: 2006–2007 Red Hat, Inc |
540 | -License: GPL-3+ |
541 | - |
542 | -Files: nautilus/NautilusExtension.[ch] |
543 | +Copyright: 2008,2009,2010,2011 Rosetta Contributors and Canonical Ltd |
544 | +License: GPL-3+ |
545 | + |
546 | +Files: libdeja/uriutils.[ch] |
547 | +Copyright: 2006-2007 Red Hat, Inc |
548 | +License: GPL-3+ |
549 | + |
550 | +Files: deja-dup/nautilus/NautilusExtension.[ch] |
551 | Copyright: 2004–2005 Free Software Foundation, Inc. |
552 | - 2009–2011 Michael Terry <mike@mterry.name> |
553 | - 2011 Canonical Ltd |
554 | -License: GPL-3+ |
555 | - |
556 | -Files: preferences/PreferencesPanel.c |
557 | -Copyright: 2010 Intel, Inc |
558 | - 2011 Michael Terry <mike@mterry.name> |
559 | -License: GPL-3+ |
560 | - |
561 | -Files: vapi/config.vapi |
562 | -Copyright: 2007–2008 Jaap Haitsma <jaap@haitsma.org> |
563 | -License: GPL-3+ |
564 | - |
565 | -Files: help/C/*.page |
566 | -Copyright: 2010–2011 Michael Terry <mike@mterry.name> |
567 | - 2011 Canonical Ltd |
568 | + 2009 Michael Terry <mike@mterry.name> |
569 | +License: GPL-3+ |
570 | + |
571 | +Files: deja-dup/help/C/*.page |
572 | +Copyright: 2010,2011 Michael Terry <mike@mterry.name> |
573 | License: CC-BY-SA-3.0 |
574 | |
575 | -Files: help/*/*.po |
576 | -Copyright: 2008–2011 Rosetta Contributors and Canonical Ltd |
577 | +Files: deja-dup/help/*/*.po |
578 | +Copyright: 2008,2009,2010,2011 Rosetta Contributors and Canonical Ltd |
579 | License: CC-BY-SA-3.0 |
580 | |
581 | Files: man/help2man |
582 | Copyright: 1997–2005, 2009–2010 Free Software Foundation, Inc. |
583 | License: GPL-3+ |
584 | |
585 | -Files: data/icons/*.png data/icons/source.svg |
586 | -Copyright: 2011 Lapo Calamandrei <calamandrei@gmail.com> |
587 | -License: LGPL-3+ or CC-BY-SA-3.0 |
588 | - |
589 | -Files: data/icons/*/deja-dup-symbolic.svg |
590 | -Copyright: 2011 Michael Terry <mike@mterry.name> |
591 | -License: LGPL-3+ or CC-BY-SA-3.0 |
592 | - |
593 | -Files: data/icons/*/deja-dup-cloud.svg |
594 | +Files: data/icons/*.svg |
595 | Copyright: None |
596 | License: public-domain |
597 | These icons originally came from the Tango project |
598 | @@ -80,23 +59,6 @@ |
599 | On Debian systems, the full text of the GNU General Public License |
600 | version 3 can be found in the file /usr/share/common-licenses/GPL-3. |
601 | |
602 | -License: LGPL-3+ |
603 | - This program is free software: you can redistribute it and/or modify |
604 | - it under the terms of the GNU Lesser General Public License as published by |
605 | - the Free Software Foundation, either version 3 of the License, or |
606 | - (at your option) any later version. |
607 | - . |
608 | - This program is distributed in the hope that it will be useful, |
609 | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
610 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
611 | - GNU General Public License for more details. |
612 | - . |
613 | - You should have received a copy of the GNU Lesser General Public License |
614 | - along with this program. If not, see <http://www.gnu.org/licenses/>. |
615 | - . |
616 | - On Debian systems, the full text of the GNU Lesser General Public License |
617 | - version 3 can be found in the file /usr/share/common-licenses/LGPL-3. |
618 | - |
619 | License: CC-BY-SA-3.0 |
620 | You are free: |
621 | to Share (to copy, distribute and transmit the work) and |
622 | |
623 | === added file 'debian/gbp.conf' |
624 | --- debian/gbp.conf 1970-01-01 00:00:00 +0000 |
625 | +++ debian/gbp.conf 2015-07-04 05:02:31 +0000 |
626 | @@ -0,0 +1,8 @@ |
627 | +[DEFAULT] |
628 | +debian-branch = master |
629 | +upstream-branch = upstream |
630 | +pristine-tar = True |
631 | + |
632 | +[buildpackage] |
633 | +tarball-dir = ../tarballs/ |
634 | +export-dir = ../build-area/ |
635 | |
636 | === removed directory 'debian/patches' |
637 | === removed file 'debian/patches/0001-fix-appdata-validate-ftbs.patch' |
638 | --- debian/patches/0001-fix-appdata-validate-ftbs.patch 2015-02-23 16:26:53 +0000 |
639 | +++ debian/patches/0001-fix-appdata-validate-ftbs.patch 1970-01-01 00:00:00 +0000 |
640 | @@ -1,17 +0,0 @@ |
641 | -Index: deja-dup-32.0/deja-dup/CMakeLists.txt |
642 | -=================================================================== |
643 | ---- deja-dup-32.0.orig/deja-dup/CMakeLists.txt |
644 | -+++ deja-dup-32.0/deja-dup/CMakeLists.txt |
645 | -@@ -40,9 +40,9 @@ install(TARGETS deja-dup DESTINATION bin |
646 | - deja_merge_po(desktop deja-dup.desktop "${CMAKE_INSTALL_FULL_DATADIR}/applications") |
647 | - |
648 | - deja_merge_po(xml deja-dup.appdata.xml "${CMAKE_INSTALL_FULL_DATADIR}/appdata") |
649 | --find_program(APPDATA_VALIDATE appdata-validate) |
650 | --if(APPDATA_VALIDATE) |
651 | -- add_test(validate-deja-dup.appdata.xml appdata-validate --relax "${CMAKE_CURRENT_BINARY_DIR}/deja-dup.appdata.xml") |
652 | -+find_program(APPSTREAM_UTIL appstream-util) |
653 | -+if(APPSTREAM_UTIL) |
654 | -+ add_test(validate-deja-dup.appdata.xml appstream-util --nonet validate-relax "${CMAKE_CURRENT_BINARY_DIR}/deja-dup.appdata.xml") |
655 | - endif() |
656 | - |
657 | - install(DIRECTORY ui DESTINATION "${PKG_DATADIR}") |
658 | |
659 | === removed file 'debian/patches/series' |
660 | --- debian/patches/series 2015-02-23 16:13:17 +0000 |
661 | +++ debian/patches/series 1970-01-01 00:00:00 +0000 |
662 | @@ -1,1 +0,0 @@ |
663 | -0001-fix-appdata-validate-ftbs.patch |
664 | |
665 | === modified file 'debian/rules' |
666 | --- debian/rules 2014-04-02 14:47:01 +0000 |
667 | +++ debian/rules 2015-07-04 05:02:31 +0000 |
668 | @@ -1,10 +1,9 @@ |
669 | #!/usr/bin/make -f |
670 | -# -*- Mode: Makefile; indent-tabs-mode: t; tab-width: 2 -*- |
671 | |
672 | DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) |
673 | |
674 | %: |
675 | - dh $@ --parallel --with translations --buildsystem cmake |
676 | + dh $@ --parallel --buildsystem cmake --with gnome --with translations |
677 | |
678 | override_dh_auto_configure: |
679 | dh_auto_configure -- -DENABLE_CCPANEL=ON \ |
680 | |
681 | === modified file 'debian/watch' |
682 | --- debian/watch 2012-02-23 17:41:45 +0000 |
683 | +++ debian/watch 2015-07-04 05:02:31 +0000 |
684 | @@ -1,2 +1,2 @@ |
685 | version=3 |
686 | -http://launchpad.net/deja-dup/+download .*/deja-dup-(.+)\.tar\.xz |
687 | +https://launchpad.net/deja-dup/+download .*/deja-dup-(.+)\.tar\.xz |