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

[Ian Griffin]

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

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

[林博仁(Buo-ren Lin) (brlin)]

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

[Simon Quigley (tsimonq2)]

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 on 2024-11-21

Found one more place the bird was named incorrectly and updated

e4c0467... by Ian Griffin on 2024-11-21

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 on 2024-11-21

Updated bird jpeg

diff --git a/AUTHORS b/AUTHORS
index f0702b5..423f162 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,14 +12,14 @@ And authors of the beautiful pictures:
 
 Oracular
 ========
-Arizona night    by Orbite Lambda
-Einsamer Raum    by Orbite Lambda
-OrioleMascot     by Vladimir Moskalenko
-Oriole 3D        by Dilip
-Oriole           by Julian Tomasini
-Sunset           by Gabriele Fontana
-Ubuntu Legacy    by Aaron J Prisk
-Warty remastered by Romactu
+Arizona night      by Orbite Lambda
+Einsamer Raum      by Orbite Lambda
+OrioleMascot       by Vladimir Moskalenko
+Oriole 3D          by Dilip
+Eurasian Bullfinch by Julian Tomasini
+Sunset             by Gabriele Fontana
+Ubuntu Legacy      by Aaron J Prisk
+Warty remastered   by Romactu
 
 Noble
 =====
diff --git a/Oriole_by_Julian_Tomasini.jpg b/Eurasian_Bullfinch_by_Julian_Tomasini.jpg
similarity index 100%
rename from Oriole_by_Julian_Tomasini.jpg
rename to Eurasian_Bullfinch_by_Julian_Tomasini.jpg
Binary 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 @@
 usr/share/backgrounds/Arizona_night_by_Orbite_Lambda.jpg
 usr/share/backgrounds/Einsamer_Raum_by_Orbite_Lambda.jpg
 usr/share/backgrounds/Oriole_3D_by_Dilip.png
-usr/share/backgrounds/Oriole_by_Julian_Tomasini.jpg
+usr/share/backgrounds/Eurasian_Bullfinch_by_Julian_Tomasini.jpg
 usr/share/backgrounds/OrioleMascot_by_Vladimir_Moskalenko_dark.png
 usr/share/backgrounds/OrioleMascot_by_Vladimir_Moskalenko_light.png
 usr/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 @@
      <shade_type>solid</shade_type>
  </wallpaper>
  <wallpaper>
-     <_name>Oriole</_name>
-     <filename>/usr/share/backgrounds/Oriole_by_Julian_Tomasini.jpg</filename>
+     <_name>Eurasian Bullfinch</_name>
+     <filename>/usr/share/backgrounds/Eurasian_Bullfinch_by_Julian_Tomasini.jpg</filename>
      <options>zoom</options>
      <pcolor>#000000</pcolor>
      <scolor>#000000</scolor>