Merge ~imgriffin/ubuntu/+source/ubuntu-wallpapers:ubuntu/oracular into ubuntu/+source/ubuntu-wallpapers:ubuntu/oracular

Proposed by Ian Griffin
Status: Needs review
Proposed branch: ~imgriffin/ubuntu/+source/ubuntu-wallpapers:ubuntu/oracular
Merge into: ubuntu/+source/ubuntu-wallpapers:ubuntu/oracular
Diff against target: 60 lines (+11/-11)
3 files modified
AUTHORS (+8/-8)
debian/ubuntu-wallpapers-oracular.install (+1/-1)
oracular-wallpapers.xml.in (+2/-2)
Reviewer Review Type Date Requested Status
Simon Quigley (community) Needs Fixing
林博仁(Buo-ren Lin) (community) Approve
git-ubuntu import Pending
Review via email: mp+476998@code.launchpad.net

This proposal supersedes a proposal from 2024-11-21.

Commit message

Fix for Bug #2088160 With the updated name the wallpaper will show the correct bird

Description of the change

Changed name of bird jpeg from Oriole_by_Julian_Tomasini.jpg to Eurasian_Bullfinch_by_Julian_Tomasini.jpg

To post a comment you must log in.
Revision history for this message
林博仁(Buo-ren Lin) (brlin) wrote :

The diff seems to be all right IMHO. The author of this image should also be notified as the naming of the photo is within their rights as well.

review: Approve
Revision history for this message
Simon Quigley (tsimonq2) wrote :

If you would like this to be uploaded via the sponsorship queue, could you please fill out the SRU template in the bug and add a changelog entry?

review: Needs Fixing

Unmerged commits

31b6048... by Ian Griffin

Found one more place the bird was named incorrectly and updated

e4c0467... by Ian Griffin

Actually took a second to look at the rest of the package and updated the name of the bird in the other places it is incorrect

b6e573a... by Ian Griffin

Updated bird jpeg

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/AUTHORS b/AUTHORS
index f0702b5..423f162 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,14 +12,14 @@ And authors of the beautiful pictures:
1212
13Oracular13Oracular
14========14========
15Arizona night by Orbite Lambda15Arizona night by Orbite Lambda
16Einsamer Raum by Orbite Lambda16Einsamer Raum by Orbite Lambda
17OrioleMascot by Vladimir Moskalenko17OrioleMascot by Vladimir Moskalenko
18Oriole 3D by Dilip18Oriole 3D by Dilip
19Oriole by Julian Tomasini19Eurasian Bullfinch by Julian Tomasini
20Sunset by Gabriele Fontana20Sunset by Gabriele Fontana
21Ubuntu Legacy by Aaron J Prisk21Ubuntu Legacy by Aaron J Prisk
22Warty remastered by Romactu22Warty remastered by Romactu
2323
24Noble24Noble
25=====25=====
diff --git a/Oriole_by_Julian_Tomasini.jpg b/Eurasian_Bullfinch_by_Julian_Tomasini.jpg
26similarity index 100%26similarity index 100%
27rename from Oriole_by_Julian_Tomasini.jpg27rename from Oriole_by_Julian_Tomasini.jpg
28rename to Eurasian_Bullfinch_by_Julian_Tomasini.jpg28rename to Eurasian_Bullfinch_by_Julian_Tomasini.jpg
29Binary files a/Oriole_by_Julian_Tomasini.jpg and b/Eurasian_Bullfinch_by_Julian_Tomasini.jpg differ29Binary files a/Oriole_by_Julian_Tomasini.jpg and b/Eurasian_Bullfinch_by_Julian_Tomasini.jpg differ
diff --git a/debian/ubuntu-wallpapers-oracular.install b/debian/ubuntu-wallpapers-oracular.install
index fe81cf7..6b2ef05 100644
--- a/debian/ubuntu-wallpapers-oracular.install
+++ b/debian/ubuntu-wallpapers-oracular.install
@@ -1,7 +1,7 @@
1usr/share/backgrounds/Arizona_night_by_Orbite_Lambda.jpg1usr/share/backgrounds/Arizona_night_by_Orbite_Lambda.jpg
2usr/share/backgrounds/Einsamer_Raum_by_Orbite_Lambda.jpg2usr/share/backgrounds/Einsamer_Raum_by_Orbite_Lambda.jpg
3usr/share/backgrounds/Oriole_3D_by_Dilip.png3usr/share/backgrounds/Oriole_3D_by_Dilip.png
4usr/share/backgrounds/Oriole_by_Julian_Tomasini.jpg4usr/share/backgrounds/Eurasian_Bullfinch_by_Julian_Tomasini.jpg
5usr/share/backgrounds/OrioleMascot_by_Vladimir_Moskalenko_dark.png5usr/share/backgrounds/OrioleMascot_by_Vladimir_Moskalenko_dark.png
6usr/share/backgrounds/OrioleMascot_by_Vladimir_Moskalenko_light.png6usr/share/backgrounds/OrioleMascot_by_Vladimir_Moskalenko_light.png
7usr/share/backgrounds/Oriole_wallpaper_dimmed_3840x2160.png7usr/share/backgrounds/Oriole_wallpaper_dimmed_3840x2160.png
diff --git a/oracular-wallpapers.xml.in b/oracular-wallpapers.xml.in
index 3de0f60..b075f4e 100644
--- a/oracular-wallpapers.xml.in
+++ b/oracular-wallpapers.xml.in
@@ -23,8 +23,8 @@
23 <shade_type>solid</shade_type>23 <shade_type>solid</shade_type>
24 </wallpaper>24 </wallpaper>
25 <wallpaper>25 <wallpaper>
26 <_name>Oriole</_name>26 <_name>Eurasian Bullfinch</_name>
27 <filename>/usr/share/backgrounds/Oriole_by_Julian_Tomasini.jpg</filename>27 <filename>/usr/share/backgrounds/Eurasian_Bullfinch_by_Julian_Tomasini.jpg</filename>
28 <options>zoom</options>28 <options>zoom</options>
29 <pcolor>#000000</pcolor>29 <pcolor>#000000</pcolor>
30 <scolor>#000000</scolor>30 <scolor>#000000</scolor>

Subscribers

People subscribed via source and target branches