Merge lp:~cyphermox/ubuntu-mono/dh9-update into lp:~ubuntu-art-pkg/ubuntu-mono/trunk
- dh9-update
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Didier Roche-Tolomelli |
Approved revision: | 162 |
Merged at revision: | 153 |
Proposed branch: | lp:~cyphermox/ubuntu-mono/dh9-update |
Merge into: | lp:~ubuntu-art-pkg/ubuntu-mono/trunk |
Diff against target: |
706 lines (+326/-311) 7 files modified
.bzr-builddeb/default.conf (+2/-0) debian/changelog (+19/-0) debian/compat (+1/-1) debian/control (+10/-6) debian/copyright (+288/-289) debian/rules (+5/-14) scavenge.py (+1/-1) |
To merge this branch: | bzr merge lp:~cyphermox/ubuntu-mono/dh9-update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email:
|
Commit message
Description of the change
Update packaging to dh9 and do some cleanup, run dh_install with --fail-missing.
The end goal of this is to have the package conform to other packages that use autolanding/
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Didier Roche-Tolomelli (didrocks) wrote : | # |
- 156. By Mathieu Trudel-Lapierre
-
Move built copies of the desktop icons from debian/places to places/ where
it belongs; adjust path in debian/rules accordingly.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Didier Roche-Tolomelli (didrocks) wrote : | # |
Still some more work needed :)
So, debian/control:
- I see some tabs in the build-deps, can you please change them to spaces?
debian/rules:
DEBIAN_
-> this is not used
# Pre-cache slow-to-load SVG icons to PNG bitmaps, once, at package-build time
# Go on! Give up; admit defeat by the buildd. Just copy in those locally build copies...
-> can you just change to a better comment for today's copy?
Note linked to this upload, but I don't see a COPYING file for
Files: scavenge.py Makefile
Copyright: Copyright 2011 Canonical Ltd.
License: GPL-3+
(also, it should be GPL-3 only I think)
Once those are changed, I think we can merge this
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Didier Roche-Tolomelli (didrocks) wrote : | # |
ah, also, if I didn't miss something, it's not in split mode, I guess we should put everything in split mode to not miss a thing :)
- 157. By Mathieu Trudel-Lapierre
-
More cleaning up of debian/rules for unused stuff, old comments.
- 158. By Mathieu Trudel-Lapierre
-
Fix spacing in debian/control.
- 159. By Mathieu Trudel-Lapierre
-
debian/copyright: update to DEP-8 format; fix copyright instances to make
sure they are properly listed as GPL-3 where appropriate (instead of 3+),
and CC-BY-SA-3.0. - 160. By Mathieu Trudel-Lapierre
-
Switch to split mode
- 161. By Mathieu Trudel-Lapierre
-
debian/
warty-final- ubuntu. jpg: removed. - 162. By Mathieu Trudel-Lapierre
-
Change version for non-native upload
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Didier Roche-Tolomelli (didrocks) wrote : | # |
Thanks
Preview Diff
1 | === added directory '.bzr-builddeb' | |||
2 | === added file '.bzr-builddeb/default.conf' | |||
3 | --- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000 | |||
4 | +++ .bzr-builddeb/default.conf 2012-12-10 14:55:24 +0000 | |||
5 | @@ -0,0 +1,2 @@ | |||
6 | 1 | [BUILDDEB] | ||
7 | 2 | split = True | ||
8 | 0 | 3 | ||
9 | === modified file 'debian/changelog' | |||
10 | --- debian/changelog 2012-11-27 15:08:02 +0000 | |||
11 | +++ debian/changelog 2012-12-10 14:55:24 +0000 | |||
12 | @@ -1,3 +1,22 @@ | |||
13 | 1 | ubuntu-mono (0.0.51-0ubuntu1) UNRELEASED; urgency=low | ||
14 | 2 | |||
15 | 3 | * debian/control: | ||
16 | 4 | - Bump debhelper Build-Depends to >= 9. | ||
17 | 5 | - Update style to use trailing commas at the end of dependency lists. | ||
18 | 6 | - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. | ||
19 | 7 | * debian/compat: bump to compat level 9. | ||
20 | 8 | * debian/rules: | ||
21 | 9 | - Clean up -- remove commented lines, add some whitespace for clarity. | ||
22 | 10 | - Use dh_install with --fail-missing. | ||
23 | 11 | * debian/copyright: update to DEP-8 format; fix copyright instances to make | ||
24 | 12 | sure they are properly listed as GPL-3 where appropriate (instead of 3+), | ||
25 | 13 | and CC-BY-SA-3.0. | ||
26 | 14 | * debian/warty-final-ubuntu.jpg: removed. | ||
27 | 15 | * Move built copies of the desktop icons from debian/places to places/ where | ||
28 | 16 | it belongs; adjust path in debian/rules accordingly. | ||
29 | 17 | |||
30 | 18 | -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Fri, 07 Dec 2012 16:07:16 -0500 | ||
31 | 19 | |||
32 | 1 | ubuntu-mono (0.0.50) raring; urgency=low | 20 | ubuntu-mono (0.0.50) raring; urgency=low |
33 | 2 | 21 | ||
34 | 3 | * Add missing weather icons for sunny days (LP: #748861) | 22 | * Add missing weather icons for sunny days (LP: #748861) |
35 | 4 | 23 | ||
36 | === modified file 'debian/compat' | |||
37 | --- debian/compat 2010-03-04 11:27:44 +0000 | |||
38 | +++ debian/compat 2012-12-10 14:55:24 +0000 | |||
39 | @@ -1,1 +1,1 @@ | |||
41 | 1 | 7 | 1 | 9 |
42 | 2 | 2 | ||
43 | === modified file 'debian/control' | |||
44 | --- debian/control 2012-07-17 15:37:32 +0000 | |||
45 | +++ debian/control 2012-12-10 14:55:24 +0000 | |||
46 | @@ -2,23 +2,27 @@ | |||
47 | 2 | Section: gnome | 2 | Section: gnome |
48 | 3 | Priority: optional | 3 | Priority: optional |
49 | 4 | Maintainer: Ubuntu Artwork Team <ubuntu-art@lists.ubuntu.com> | 4 | Maintainer: Ubuntu Artwork Team <ubuntu-art@lists.ubuntu.com> |
51 | 5 | Build-Depends: debhelper (>= 7), | 5 | Build-Depends: debhelper (>= 9), |
52 | 6 | icon-naming-utils, | 6 | icon-naming-utils, |
56 | 7 | ubuntu-wallpapers, | 7 | ubuntu-wallpapers, |
57 | 8 | imagemagick, | 8 | imagemagick, |
58 | 9 | libmagickcore5-extra, | 9 | libmagickcore5-extra, |
59 | 10 | python, | 10 | python, |
60 | 11 | python-scour, | 11 | python-scour, |
62 | 12 | python-rsvg | 12 | python-rsvg, |
63 | 13 | Standards-Version: 3.9.3 | 13 | Standards-Version: 3.9.3 |
64 | 14 | # If you aren't a member of ~ubuntu-art-pkg but need to upload | ||
65 | 15 | # packaging changes, just go ahead. ~ubuntu-art-pkg will notice | ||
66 | 16 | # and sync up the code again. | ||
67 | 14 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-art-pkg/ubuntu-mono/trunk | 17 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-art-pkg/ubuntu-mono/trunk |
68 | 18 | Vcs-Browser: https://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-mono/trunk/files | ||
69 | 15 | 19 | ||
70 | 16 | Package: ubuntu-mono | 20 | Package: ubuntu-mono |
71 | 17 | Architecture: all | 21 | Architecture: all |
72 | 18 | Depends: ${misc:Depends}, | 22 | Depends: ${misc:Depends}, |
73 | 19 | humanity-icon-theme, | 23 | humanity-icon-theme, |
74 | 20 | gnome-icon-theme, | 24 | gnome-icon-theme, |
76 | 21 | hicolor-icon-theme | 25 | hicolor-icon-theme, |
77 | 22 | Description: Ubuntu Mono Icon theme | 26 | Description: Ubuntu Mono Icon theme |
78 | 23 | Dark and Light panel icons to make your desktop beautiful | 27 | Dark and Light panel icons to make your desktop beautiful |
79 | 24 | 28 | ||
80 | 25 | 29 | ||
81 | === modified file 'debian/copyright' | |||
82 | --- debian/copyright 2011-01-06 02:39:02 +0000 | |||
83 | +++ debian/copyright 2012-12-10 14:55:24 +0000 | |||
84 | @@ -1,291 +1,290 @@ | |||
371 | 1 | Upstream Author: | 1 | Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
372 | 2 | Daniel Fore <Daniel.P.Fore@gmail.com> | 2 | Upstream-Name: ubuntu-mono |
373 | 3 | Kenneth Wimer <kwwii@ubuntu.com> | 3 | Upstream-Contact: Daniel Fore <Daniel.P.Fore@gmail.com>, |
374 | 4 | K.Vishnoo Charan Reddy<vish@ubuntu.com> | 4 | Kenneth Wimer <kwwii@ubuntu.com>, |
375 | 5 | Otto Greenslade <otto@canonical.com> | 5 | K.Vishnoo Charan Reddy<vish@ubuntu.com>, |
376 | 6 | 6 | Otto Greenslade <otto@canonical.com> | |
377 | 7 | Copyright: | 7 | |
378 | 8 | 8 | Files: * | |
379 | 9 | (c) Canonical Ltd 2004-2011 | 9 | Copyright: 2004-2012, Canonical Ltd |
380 | 10 | 10 | License: CC-BY-SA-3.0 | |
381 | 11 | Unless otherwise indicated, artwork is available under the Creative | 11 | Unless otherwise indicated, artwork is available under the Creative |
382 | 12 | Commons Attribution Share-alike license v3.0 or any later version. To | 12 | Commons Attribution Share-alike license v3.0 or any later version. To |
383 | 13 | view a copy of this license, visit | 13 | view a copy of this license, visit |
384 | 14 | http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to | 14 | http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to |
385 | 15 | Creative Commons, 171 Second Street, Suite 300, San Francisco, | 15 | Creative Commons, 171 Second Street, Suite 300, San Francisco, |
386 | 16 | California, 94105, USA. See below for the full text of the license. | 16 | California, 94105, USA. See below for the full text of the license. |
387 | 17 | 17 | . | |
388 | 18 | Some Rights Reserved: | 18 | Some Rights Reserved: |
389 | 19 | 19 | . | |
390 | 20 | The rights in the trademarks, logos, service marks of Canonical Ltd, | 20 | The rights in the trademarks, logos, service marks of Canonical Ltd, |
391 | 21 | as well as the look and feel of Ubuntu, are not licensed under the | 21 | as well as the look and feel of Ubuntu, are not licensed under the |
392 | 22 | Creative Commons license and are subject to the Canonical Trademark | 22 | Creative Commons license and are subject to the Canonical Trademark |
393 | 23 | Policy at http://www.ubuntu.com/ubuntu/TrademarkPolicy | 23 | Policy at http://www.ubuntu.com/ubuntu/TrademarkPolicy |
394 | 24 | 24 | . | |
395 | 25 | License: | 25 | License: |
396 | 26 | 26 | . | |
397 | 27 | CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE | 27 | CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE |
398 | 28 | LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN | 28 | LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN |
399 | 29 | ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS | 29 | ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS |
400 | 30 | INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES | 30 | INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES |
401 | 31 | REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR | 31 | REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR |
402 | 32 | DAMAGES RESULTING FROM ITS USE. | 32 | DAMAGES RESULTING FROM ITS USE. |
403 | 33 | 33 | . | |
404 | 34 | License | 34 | License |
405 | 35 | 35 | . | |
406 | 36 | THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS | 36 | THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS |
407 | 37 | CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS | 37 | CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS |
408 | 38 | PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE | 38 | PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE |
409 | 39 | WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW | 39 | WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW |
410 | 40 | IS PROHIBITED. | 40 | IS PROHIBITED. |
411 | 41 | 41 | . | |
412 | 42 | BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND | 42 | BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND |
413 | 43 | AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU | 43 | AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU |
414 | 44 | THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH | 44 | THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH |
415 | 45 | TERMS AND CONDITIONS. | 45 | TERMS AND CONDITIONS. |
416 | 46 | 46 | . | |
417 | 47 | 1. Definitions | 47 | 1. Definitions |
418 | 48 | 48 | . | |
419 | 49 | 1. "Collective Work" means a work, such as a periodical issue, | 49 | 1. "Collective Work" means a work, such as a periodical issue, |
420 | 50 | anthology or encyclopedia, in which the Work in its entirety in | 50 | anthology or encyclopedia, in which the Work in its entirety in |
421 | 51 | unmodified form, along with a number of other contributions, | 51 | unmodified form, along with a number of other contributions, |
422 | 52 | constituting separate and independent works in themselves, are | 52 | constituting separate and independent works in themselves, are |
423 | 53 | assembled into a collective whole. A work that constitutes a | 53 | assembled into a collective whole. A work that constitutes a |
424 | 54 | Collective Work will not be considered a Derivative Work | 54 | Collective Work will not be considered a Derivative Work |
425 | 55 | (as defined below) for the purposes of this License. | 55 | (as defined below) for the purposes of this License. |
426 | 56 | 2. "Derivative Work" means a work based upon the Work or upon the | 56 | 2. "Derivative Work" means a work based upon the Work or upon the |
427 | 57 | Work and other pre-existing works, such as a translation, musical | 57 | Work and other pre-existing works, such as a translation, musical |
428 | 58 | arrangement, dramatization, fictionalization, motion picture | 58 | arrangement, dramatization, fictionalization, motion picture |
429 | 59 | version, sound recording, art reproduction, abridgment, | 59 | version, sound recording, art reproduction, abridgment, |
430 | 60 | condensation, or any other form in which the Work may be recast, | 60 | condensation, or any other form in which the Work may be recast, |
431 | 61 | transformed, or adapted, except that a work that constitutes a | 61 | transformed, or adapted, except that a work that constitutes a |
432 | 62 | Collective Work will not be considered a Derivative Work for the | 62 | Collective Work will not be considered a Derivative Work for the |
433 | 63 | purpose of this License. For the avoidance of doubt, where the Work | 63 | purpose of this License. For the avoidance of doubt, where the Work |
434 | 64 | is a musical composition or sound recording, the synchronization of | 64 | is a musical composition or sound recording, the synchronization of |
435 | 65 | the Work in timed-relation with a moving image ("synching") will be | 65 | the Work in timed-relation with a moving image ("synching") will be |
436 | 66 | considered a Derivative Work for the purpose of this License. | 66 | considered a Derivative Work for the purpose of this License. |
437 | 67 | 3. "Licensor" means the individual or entity that offers the Work | 67 | 3. "Licensor" means the individual or entity that offers the Work |
438 | 68 | under the terms of this License. | 68 | under the terms of this License. |
439 | 69 | 4. "Original Author" means the individual or entity who created the | 69 | 4. "Original Author" means the individual or entity who created the |
440 | 70 | Work. | 70 | Work. |
441 | 71 | 5. "Work" means the copyrightable work of authorship offered under | 71 | 5. "Work" means the copyrightable work of authorship offered under |
442 | 72 | the terms of this License. | 72 | the terms of this License. |
443 | 73 | 6. "You" means an individual or entity exercising rights under this | 73 | 6. "You" means an individual or entity exercising rights under this |
444 | 74 | License who has not previously violated the terms of this License | 74 | License who has not previously violated the terms of this License |
445 | 75 | with respect to the Work, or who has received express permission | 75 | with respect to the Work, or who has received express permission |
446 | 76 | from the Licensor to exercise rights under this License despite a | 76 | from the Licensor to exercise rights under this License despite a |
447 | 77 | previous violation. | 77 | previous violation. |
448 | 78 | 7. "License Elements" means the following high-level license | 78 | 7. "License Elements" means the following high-level license |
449 | 79 | attributes as selected by Licensor and indicated in the title of | 79 | attributes as selected by Licensor and indicated in the title of |
450 | 80 | this License: Attribution, ShareAlike. | 80 | this License: Attribution, ShareAlike. |
451 | 81 | 81 | . | |
452 | 82 | 2. Fair Use Rights. Nothing in this license is intended to reduce, | 82 | 2. Fair Use Rights. Nothing in this license is intended to reduce, |
453 | 83 | limit, or restrict any rights arising from fair use, first sale or | 83 | limit, or restrict any rights arising from fair use, first sale or |
454 | 84 | other limitations on the exclusive rights of the copyright owner under | 84 | other limitations on the exclusive rights of the copyright owner under |
455 | 85 | copyright law or other applicable laws. | 85 | copyright law or other applicable laws. |
456 | 86 | 86 | . | |
457 | 87 | 3. License Grant. Subject to the terms and conditions of this License, | 87 | 3. License Grant. Subject to the terms and conditions of this License, |
458 | 88 | Licensor hereby grants You a worldwide, royalty-free, non-exclusive, | 88 | Licensor hereby grants You a worldwide, royalty-free, non-exclusive, |
459 | 89 | perpetual (for the duration of the applicable copyright) license to | 89 | perpetual (for the duration of the applicable copyright) license to |
460 | 90 | exercise the rights in the Work as stated below: | 90 | exercise the rights in the Work as stated below: |
461 | 91 | 91 | . | |
462 | 92 | 1. to reproduce the Work, to incorporate the Work into one or more | 92 | 1. to reproduce the Work, to incorporate the Work into one or more |
463 | 93 | Collective Works, and to reproduce the Work as incorporated in the | 93 | Collective Works, and to reproduce the Work as incorporated in the |
464 | 94 | Collective Works; | 94 | Collective Works; |
465 | 95 | 2. to create and reproduce Derivative Works; | 95 | 2. to create and reproduce Derivative Works; |
466 | 96 | 3. to distribute copies or phonorecords of, display publicly, | 96 | 3. to distribute copies or phonorecords of, display publicly, |
467 | 97 | perform publicly, and perform publicly by means of a digital audio | 97 | perform publicly, and perform publicly by means of a digital audio |
468 | 98 | transmission the Work including as incorporated in Collective Works; | 98 | transmission the Work including as incorporated in Collective Works; |
469 | 99 | 4. to distribute copies or phonorecords of, display publicly, | 99 | 4. to distribute copies or phonorecords of, display publicly, |
470 | 100 | perform publicly, and perform publicly by means of a digital audio | 100 | perform publicly, and perform publicly by means of a digital audio |
471 | 101 | transmission Derivative Works. | 101 | transmission Derivative Works. |
472 | 102 | 5. | 102 | 5. |
473 | 103 | 103 | . | |
474 | 104 | For the avoidance of doubt, where the work is a musical | 104 | For the avoidance of doubt, where the work is a musical |
475 | 105 | composition: | 105 | composition: |
476 | 106 | 1. Performance Royalties Under Blanket Licenses. Licensor | 106 | 1. Performance Royalties Under Blanket Licenses. Licensor |
477 | 107 | waives the exclusive right to collect, whether individually | 107 | waives the exclusive right to collect, whether individually |
478 | 108 | or via a performance rights society (e.g. ASCAP, BMI, SESAC), | 108 | or via a performance rights society (e.g. ASCAP, BMI, SESAC), |
479 | 109 | royalties for the public performance or public digital | 109 | royalties for the public performance or public digital |
480 | 110 | performance (e.g. webcast) of the Work. | 110 | performance (e.g. webcast) of the Work. |
481 | 111 | 2. Mechanical Rights and Statutory Royalties. Licensor waives | 111 | 2. Mechanical Rights and Statutory Royalties. Licensor waives |
482 | 112 | the exclusive right to collect, whether individually or via a | 112 | the exclusive right to collect, whether individually or via a |
483 | 113 | music rights society or designated agent (e.g. Harry Fox | 113 | music rights society or designated agent (e.g. Harry Fox |
484 | 114 | Agency), royalties for any phonorecord You create from the | 114 | Agency), royalties for any phonorecord You create from the |
485 | 115 | Work ("cover version") and distribute, subject to the | 115 | Work ("cover version") and distribute, subject to the |
486 | 116 | compulsory license created by 17 USC Section 115 of the US | 116 | compulsory license created by 17 USC Section 115 of the US |
487 | 117 | Copyright Act (or the equivalent in other jurisdictions). | 117 | Copyright Act (or the equivalent in other jurisdictions). |
488 | 118 | 6. Webcasting Rights and Statutory Royalties. For the avoidance of | 118 | 6. Webcasting Rights and Statutory Royalties. For the avoidance of |
489 | 119 | doubt, where the Work is a sound recording, Licensor waives the | 119 | doubt, where the Work is a sound recording, Licensor waives the |
490 | 120 | exclusive right to collect, whether individually or via a | 120 | exclusive right to collect, whether individually or via a |
491 | 121 | performance-rights society (e.g. SoundExchange), royalties for the | 121 | performance-rights society (e.g. SoundExchange), royalties for the |
492 | 122 | public digital performance (e.g. webcast) of the Work, subject to | 122 | public digital performance (e.g. webcast) of the Work, subject to |
493 | 123 | the compulsory license created by 17 USC Section 114 of the US | 123 | the compulsory license created by 17 USC Section 114 of the US |
494 | 124 | Copyright Act (or the equivalent in other jurisdictions). | 124 | Copyright Act (or the equivalent in other jurisdictions). |
495 | 125 | 125 | . | |
496 | 126 | The above rights may be exercised in all media and formats whether now | 126 | The above rights may be exercised in all media and formats whether now |
497 | 127 | known or hereafter devised. The above rights include the right to make | 127 | known or hereafter devised. The above rights include the right to make |
498 | 128 | such modifications as are technically necessary to exercise the rights | 128 | such modifications as are technically necessary to exercise the rights |
499 | 129 | in other media and formats. All rights not expressly granted by | 129 | in other media and formats. All rights not expressly granted by |
500 | 130 | Licensor are hereby reserved. | 130 | Licensor are hereby reserved. |
501 | 131 | 131 | . | |
502 | 132 | 4. Restrictions.The license granted in Section 3 above is expressly | 132 | 4. Restrictions.The license granted in Section 3 above is expressly |
503 | 133 | made subject to and limited by the following restrictions: | 133 | made subject to and limited by the following restrictions: |
504 | 134 | 134 | . | |
505 | 135 | 1. You may distribute, publicly display, publicly perform, or | 135 | 1. You may distribute, publicly display, publicly perform, or |
506 | 136 | publicly digitally perform the Work only under the terms of this | 136 | publicly digitally perform the Work only under the terms of this |
507 | 137 | License, and You must include a copy of, or the Uniform Resource | 137 | License, and You must include a copy of, or the Uniform Resource |
508 | 138 | Identifier for, this License with every copy or phonorecord of the | 138 | Identifier for, this License with every copy or phonorecord of the |
509 | 139 | Work You distribute, publicly display, publicly perform, or publicly | 139 | Work You distribute, publicly display, publicly perform, or publicly |
510 | 140 | digitally perform. You may not offer or impose any terms on the Work | 140 | digitally perform. You may not offer or impose any terms on the Work |
511 | 141 | that alter or restrict the terms of this License or the recipients' | 141 | that alter or restrict the terms of this License or the recipients' |
512 | 142 | exercise of the rights granted hereunder. You may not sublicense the | 142 | exercise of the rights granted hereunder. You may not sublicense the |
513 | 143 | Work. You must keep intact all notices that refer to this License | 143 | Work. You must keep intact all notices that refer to this License |
514 | 144 | and to the disclaimer of warranties. You may not distribute, | 144 | and to the disclaimer of warranties. You may not distribute, |
515 | 145 | publicly display, publicly perform, or publicly digitally perform | 145 | publicly display, publicly perform, or publicly digitally perform |
516 | 146 | the Work with any technological measures that control access or use | 146 | the Work with any technological measures that control access or use |
517 | 147 | of the Work in a manner inconsistent with the terms of this License | 147 | of the Work in a manner inconsistent with the terms of this License |
518 | 148 | Agreement. The above applies to the Work as incorporated in a | 148 | Agreement. The above applies to the Work as incorporated in a |
519 | 149 | Collective Work, but this does not require the Collective Work apart | 149 | Collective Work, but this does not require the Collective Work apart |
520 | 150 | from the Work itself to be made subject to the terms of this | 150 | from the Work itself to be made subject to the terms of this |
521 | 151 | License. If You create a Collective Work, upon notice from any | 151 | License. If You create a Collective Work, upon notice from any |
522 | 152 | Licensor You must, to the extent practicable, remove from the | 152 | Licensor You must, to the extent practicable, remove from the |
523 | 153 | Collective Work any credit as required by clause 4(c), as requested. | 153 | Collective Work any credit as required by clause 4(c), as requested. |
524 | 154 | If You create a Derivative Work, upon notice from any Licensor You | 154 | If You create a Derivative Work, upon notice from any Licensor You |
525 | 155 | must, to the extent practicable, remove from the Derivative Work | 155 | must, to the extent practicable, remove from the Derivative Work |
526 | 156 | any credit as required by clause 4(c), as requested. | 156 | any credit as required by clause 4(c), as requested. |
527 | 157 | 2. You may distribute, publicly display, publicly perform, or | 157 | 2. You may distribute, publicly display, publicly perform, or |
528 | 158 | publicly digitally perform a Derivative Work only under the terms | 158 | publicly digitally perform a Derivative Work only under the terms |
529 | 159 | of this License, a later version of this License with the same | 159 | of this License, a later version of this License with the same |
530 | 160 | License Elements as this License, or a Creative Commons iCommons | 160 | License Elements as this License, or a Creative Commons iCommons |
531 | 161 | license that contains the same License Elements as this License | 161 | license that contains the same License Elements as this License |
532 | 162 | (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, | 162 | (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, |
533 | 163 | or the Uniform Resource Identifier for, this License or other | 163 | or the Uniform Resource Identifier for, this License or other |
534 | 164 | license specified in the previous sentence with every copy or | 164 | license specified in the previous sentence with every copy or |
535 | 165 | phonorecord of each Derivative Work You distribute, publicly | 165 | phonorecord of each Derivative Work You distribute, publicly |
536 | 166 | display, publicly perform, or publicly digitally perform. You may | 166 | display, publicly perform, or publicly digitally perform. You may |
537 | 167 | not offer or impose any terms on the Derivative Works that alter or | 167 | not offer or impose any terms on the Derivative Works that alter or |
538 | 168 | restrict the terms of this License or the recipients' exercise of | 168 | restrict the terms of this License or the recipients' exercise of |
539 | 169 | the rights granted hereunder, and You must keep intact all notices | 169 | the rights granted hereunder, and You must keep intact all notices |
540 | 170 | that refer to this License and to the disclaimer of warranties. | 170 | that refer to this License and to the disclaimer of warranties. |
541 | 171 | You may not distribute, publicly display, publicly perform, or | 171 | You may not distribute, publicly display, publicly perform, or |
542 | 172 | publicly digitally perform the Derivative Work with any | 172 | publicly digitally perform the Derivative Work with any |
543 | 173 | technological measures that control access or use of the Work in a | 173 | technological measures that control access or use of the Work in a |
544 | 174 | manner inconsistent with the terms of this License Agreement. | 174 | manner inconsistent with the terms of this License Agreement. |
545 | 175 | The above applies to the Derivative Work as incorporated in a | 175 | The above applies to the Derivative Work as incorporated in a |
546 | 176 | Collective Work, but this does not require the Collective Work | 176 | Collective Work, but this does not require the Collective Work |
547 | 177 | apart from the Derivative Work itself to be made subject to the | 177 | apart from the Derivative Work itself to be made subject to the |
548 | 178 | terms of this License. | 178 | terms of this License. |
549 | 179 | 3. If you distribute, publicly display, publicly perform, or | 179 | 3. If you distribute, publicly display, publicly perform, or |
550 | 180 | publicly digitally perform the Work or any Derivative Works or | 180 | publicly digitally perform the Work or any Derivative Works or |
551 | 181 | Collective Works, You must keep intact all copyright notices for | 181 | Collective Works, You must keep intact all copyright notices for |
552 | 182 | the Work and provide, reasonable to the medium or means You are | 182 | the Work and provide, reasonable to the medium or means You are |
553 | 183 | utilizing: (i) the name of the Original Author (or pseudonym, if | 183 | utilizing: (i) the name of the Original Author (or pseudonym, if |
554 | 184 | applicable) if supplied, and/or (ii) if the Original Author and/or | 184 | applicable) if supplied, and/or (ii) if the Original Author and/or |
555 | 185 | Licensor designate another party or parties (e.g. a sponsor | 185 | Licensor designate another party or parties (e.g. a sponsor |
556 | 186 | institute, publishing entity, journal) for attribution in Licensor's | 186 | institute, publishing entity, journal) for attribution in Licensor's |
557 | 187 | copyright notice, terms of service or by other reasonable means, the | 187 | copyright notice, terms of service or by other reasonable means, the |
558 | 188 | name of such party or parties; the title of the Work if supplied; to | 188 | name of such party or parties; the title of the Work if supplied; to |
559 | 189 | the extent reasonably practicable, the Uniform Resource Identifier, | 189 | the extent reasonably practicable, the Uniform Resource Identifier, |
560 | 190 | if any, that Licensor specifies to be associated with the Work, | 190 | if any, that Licensor specifies to be associated with the Work, |
561 | 191 | unless such URI does not refer to the copyright notice or licensing | 191 | unless such URI does not refer to the copyright notice or licensing |
562 | 192 | information for the Work; and in the case of a Derivative Work, a | 192 | information for the Work; and in the case of a Derivative Work, a |
563 | 193 | credit identifying the use of the Work in the Derivative Work (e.g., | 193 | credit identifying the use of the Work in the Derivative Work (e.g., |
564 | 194 | "French translation of the Work by Original Author," or "Screenplay | 194 | "French translation of the Work by Original Author," or "Screenplay |
565 | 195 | based on original Work by Original Author"). Such credit may be | 195 | based on original Work by Original Author"). Such credit may be |
566 | 196 | implemented in any reasonable manner; provided, however, that in the | 196 | implemented in any reasonable manner; provided, however, that in the |
567 | 197 | case of a Derivative Work or Collective Work, at a minimum such | 197 | case of a Derivative Work or Collective Work, at a minimum such |
568 | 198 | credit will appear where any other comparable authorship credit | 198 | credit will appear where any other comparable authorship credit |
569 | 199 | appears and in a manner at least as prominent as such other | 199 | appears and in a manner at least as prominent as such other |
570 | 200 | comparable authorship credit. | 200 | comparable authorship credit. |
571 | 201 | 201 | . | |
572 | 202 | 5. Representations, Warranties and Disclaimer | 202 | 5. Representations, Warranties and Disclaimer |
573 | 203 | 203 | . | |
574 | 204 | UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS | 204 | UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS |
575 | 205 | THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND | 205 | THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND |
576 | 206 | CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, | 206 | CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, |
577 | 207 | INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, | 207 | INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, |
578 | 208 | FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF | 208 | FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF |
579 | 209 | LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF | 209 | LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF |
580 | 210 | ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW | 210 | ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW |
581 | 211 | THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY | 211 | THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY |
582 | 212 | TO YOU. | 212 | TO YOU. |
583 | 213 | 213 | . | |
584 | 214 | 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE | 214 | 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE |
585 | 215 | LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR | 215 | LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR |
586 | 216 | ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES | 216 | ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES |
587 | 217 | ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR | 217 | ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR |
588 | 218 | HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. | 218 | HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. |
589 | 219 | 219 | . | |
590 | 220 | 7. Termination | 220 | 7. Termination |
591 | 221 | 221 | . | |
592 | 222 | 1. This License and the rights granted hereunder will terminate | 222 | 1. This License and the rights granted hereunder will terminate |
593 | 223 | automatically upon any breach by You of the terms of this License. | 223 | automatically upon any breach by You of the terms of this License. |
594 | 224 | Individuals or entities who have received Derivative Works or | 224 | Individuals or entities who have received Derivative Works or |
595 | 225 | Collective Works from You under this License, however, will not have | 225 | Collective Works from You under this License, however, will not have |
596 | 226 | their licenses terminated provided such individuals or entities | 226 | their licenses terminated provided such individuals or entities |
597 | 227 | remain in full compliance with those licenses. Sections 1, 2, 5, 6, | 227 | remain in full compliance with those licenses. Sections 1, 2, 5, 6, |
598 | 228 | 7, and 8 will survive any termination of this License. | 228 | 7, and 8 will survive any termination of this License. |
599 | 229 | 2. Subject to the above terms and conditions, the license granted | 229 | 2. Subject to the above terms and conditions, the license granted |
600 | 230 | here is perpetual (for the duration of the applicable copyright in | 230 | here is perpetual (for the duration of the applicable copyright in |
601 | 231 | the Work). Notwithstanding the above, Licensor reserves the right to | 231 | the Work). Notwithstanding the above, Licensor reserves the right to |
602 | 232 | release the Work under different license terms or to stop | 232 | release the Work under different license terms or to stop |
603 | 233 | distributing the Work at any time; provided, however that any such | 233 | distributing the Work at any time; provided, however that any such |
604 | 234 | election will not serve to withdraw this License (or any other | 234 | election will not serve to withdraw this License (or any other |
605 | 235 | license that has been, or is required to be, granted under the terms | 235 | license that has been, or is required to be, granted under the terms |
606 | 236 | of this License), and this License will continue in full force and | 236 | of this License), and this License will continue in full force and |
607 | 237 | effect unless terminated as stated above. | 237 | effect unless terminated as stated above. |
608 | 238 | 238 | . | |
609 | 239 | 8. Miscellaneous | 239 | 8. Miscellaneous |
610 | 240 | 240 | . | |
611 | 241 | 1. Each time You distribute or publicly digitally perform the Work | 241 | 1. Each time You distribute or publicly digitally perform the Work |
612 | 242 | or a Collective Work, the Licensor offers to the recipient a license | 242 | or a Collective Work, the Licensor offers to the recipient a license |
613 | 243 | to the Work on the same terms and conditions as the license granted | 243 | to the Work on the same terms and conditions as the license granted |
614 | 244 | to You under this License. | 244 | to You under this License. |
615 | 245 | 2. Each time You distribute or publicly digitally perform a | 245 | 2. Each time You distribute or publicly digitally perform a |
616 | 246 | Derivative Work, Licensor offers to the recipient a license to the | 246 | Derivative Work, Licensor offers to the recipient a license to the |
617 | 247 | original Work on the same terms and conditions as the license | 247 | original Work on the same terms and conditions as the license |
618 | 248 | granted to You under this License. | 248 | granted to You under this License. |
619 | 249 | 3. If any provision of this License is invalid or unenforceable under | 249 | 3. If any provision of this License is invalid or unenforceable under |
620 | 250 | applicable law, it shall not affect the validity or enforceability of | 250 | applicable law, it shall not affect the validity or enforceability of |
621 | 251 | the remainder of the terms of this License, and without further | 251 | the remainder of the terms of this License, and without further |
622 | 252 | action by the parties to this agreement, such provision shall be | 252 | action by the parties to this agreement, such provision shall be |
623 | 253 | reformed to the minimum extent necessary to make such provision | 253 | reformed to the minimum extent necessary to make such provision |
624 | 254 | valid and enforceable. | 254 | valid and enforceable. |
625 | 255 | 4. No term or provision of this License shall be deemed waived and | 255 | 4. No term or provision of this License shall be deemed waived and |
626 | 256 | no breach consented to unless such waiver or consent shall be in | 256 | no breach consented to unless such waiver or consent shall be in |
627 | 257 | writing and signed by the party to be charged with such waiver or | 257 | writing and signed by the party to be charged with such waiver or |
628 | 258 | consent. | 258 | consent. |
629 | 259 | 5. This License constitutes the entire agreement between the parties | 259 | 5. This License constitutes the entire agreement between the parties |
630 | 260 | with respect to the Work licensed here. There are no understandings, | 260 | with respect to the Work licensed here. There are no understandings, |
631 | 261 | agreements or representations with respect to the Work not specified | 261 | agreements or representations with respect to the Work not specified |
632 | 262 | here. Licensor shall not be bound by any additional provisions that | 262 | here. Licensor shall not be bound by any additional provisions that |
633 | 263 | may appear in any communication from You. This License may not be | 263 | may appear in any communication from You. This License may not be |
634 | 264 | modified without the mutual written agreement of the Licensor and | 264 | modified without the mutual written agreement of the Licensor and |
635 | 265 | You. | 265 | You. |
636 | 266 | 266 | . | |
637 | 267 | Creative Commons is not a party to this License, and makes no warranty | 267 | Creative Commons is not a party to this License, and makes no warranty |
638 | 268 | whatsoever in connection with the Work. Creative Commons will not be | 268 | whatsoever in connection with the Work. Creative Commons will not be |
639 | 269 | liable to You or any party on any legal theory for any damages | 269 | liable to You or any party on any legal theory for any damages |
640 | 270 | whatsoever, including without limitation any general, special, | 270 | whatsoever, including without limitation any general, special, |
641 | 271 | incidental or consequential damages arising in connection to this | 271 | incidental or consequential damages arising in connection to this |
642 | 272 | license. Notwithstanding the foregoing two (2) sentences, if Creative | 272 | license. Notwithstanding the foregoing two (2) sentences, if Creative |
643 | 273 | Commons has expressly identified itself as the Licensor hereunder, | 273 | Commons has expressly identified itself as the Licensor hereunder, |
644 | 274 | it shall have all rights and obligations of Licensor. | 274 | it shall have all rights and obligations of Licensor. |
645 | 275 | 275 | . | |
646 | 276 | Except for the limited purpose of indicating to the public that the | 276 | Except for the limited purpose of indicating to the public that the |
647 | 277 | Work is licensed under the CCPL, neither party will use the trademark | 277 | Work is licensed under the CCPL, neither party will use the trademark |
648 | 278 | "Creative Commons" or any related trademark or logo of Creative Commons | 278 | "Creative Commons" or any related trademark or logo of Creative Commons |
649 | 279 | without the prior written consent of Creative Commons. Any permitted | 279 | without the prior written consent of Creative Commons. Any permitted |
650 | 280 | use will be in compliance with Creative Commons' then-current trademark | 280 | use will be in compliance with Creative Commons' then-current trademark |
651 | 281 | usage guidelines, as may be published on its website or otherwise made | 281 | usage guidelines, as may be published on its website or otherwise made |
652 | 282 | available upon request from time to time. | 282 | available upon request from time to time. |
653 | 283 | 283 | . | |
654 | 284 | Creative Commons may be contacted at http://creativecommons.org/ | 284 | Creative Commons may be contacted at http://creativecommons.org/ |
655 | 285 | 285 | ||
370 | 286 | |||
656 | 287 | Files: scavenge.py Makefile | 286 | Files: scavenge.py Makefile |
657 | 288 | Copyright: Copyright 2011 Canonical Ltd. | 287 | Copyright: Copyright 2011 Canonical Ltd. |
661 | 289 | License: GPL-3+ | 288 | License: GPL-3 |
662 | 290 | On Debian systems, the full text of the GNU General Public | 289 | On Debian systems, the full text of the GNU General Public |
663 | 291 | License version 3 can be found in /usr/share/common-licenses/GPL-3 | 290 | License version 3 can be found in /usr/share/common-licenses/GPL-3 |
664 | 292 | 291 | ||
665 | === modified file 'debian/rules' | |||
666 | --- debian/rules 2012-03-06 11:49:17 +0000 | |||
667 | +++ debian/rules 2012-12-10 14:55:24 +0000 | |||
668 | @@ -1,19 +1,10 @@ | |||
669 | 1 | #!/usr/bin/make -f | 1 | #!/usr/bin/make -f |
671 | 2 | DEBIAN_DIR=$(CURDIR) | 2 | |
672 | 3 | %: | 3 | %: |
673 | 4 | dh $@ --with scour | 4 | dh $@ --with scour |
674 | 5 | 5 | ||
675 | 6 | override_dh_install: | 6 | override_dh_install: |
689 | 7 | dh_install | 7 | dh_install --fail-missing |
690 | 8 | # Pre-cache slow-to-load SVG icons to PNG bitmaps, once, at package-build time | 8 | |
691 | 9 | 9 | # We ship pre-built copies of the user-desktop icon | |
692 | 10 | # May its because it's a JPEG saved as .png? | 10 | for p in debian/ubuntu-mono/usr/share/icons/ubuntu-mono-* ; do cp -avt $$p places ; done |
680 | 11 | #ls -l /usr/share/backgrounds/warty-final-ubuntu.png $(DEBIAN_DIR)/debian/warty-final-ubuntu.jpg | ||
681 | 12 | #find debian/ -type f -name user-desktop.svg | xargs sed -i -e 'sXfile:///usr/share/backgrounds/warty-final-ubuntu.pngX$(DEBIAN_DIR)/debian/warty-final-ubuntu.jpgXg' | ||
682 | 13 | |||
683 | 14 | #find debian/ -type f -name user-desktop.svg | sed -e 'p;s/svg$$/png/' | xargs -tn2 convert -background none | ||
684 | 15 | #find debian/ -type l -name desktop.svg | sed -e 'sX^.*/usrXusrX;s/desktop.svg/user-desktop.png/;p;s/user-desktop.png/desktop.png/' | xargs -tn2 dh_link | ||
685 | 16 | #find debian/ -type f -name user-desktop.svg -o -type l -name desktop.svg | xargs -t rm | ||
686 | 17 | |||
687 | 18 | # Go on! Give up; admit defeat by the buildd. Just copy in those locally build copies... | ||
688 | 19 | for p in debian/ubuntu-mono/usr/share/icons/ubuntu-mono-* ; do cp -avt $$p debian/places ; done | ||
693 | 20 | 11 | ||
694 | === removed symlink 'debian/warty-final-ubuntu.jpg' | |||
695 | === target was u'/usr/share/backgrounds/warty-final-ubuntu.png' | |||
696 | === renamed directory 'debian/places' => 'places' | |||
697 | === modified file 'scavenge.py' | |||
698 | --- scavenge.py 2011-01-06 02:39:02 +0000 | |||
699 | +++ scavenge.py 2012-12-10 14:55:24 +0000 | |||
700 | @@ -1,5 +1,5 @@ | |||
701 | 1 | #!/usr/bin/env python | 1 | #!/usr/bin/env python |
703 | 2 | # Copyright 2011 Canonical Ltd. Distributed under the terms of the GNU GPLv3 or later. | 2 | # Copyright 2011 Canonical Ltd. Distributed under the terms of the GNU GPLv3. |
704 | 3 | # Combines multiple SVG files into a single SVG in batch mode | 3 | # Combines multiple SVG files into a single SVG in batch mode |
705 | 4 | # 2011-01-04 Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 4 | # 2011-01-04 Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> |
706 | 5 | # 2011-01-05 Paul Sladen <sladen@canonica.com> | 5 | # 2011-01-05 Paul Sladen <sladen@canonica.com> |
Hey Mathieu,
I think we did speak together about the need to move debian/places to the root directory instead and revert to source 1. Can you do this please? :)