[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#864911: stretch-pu: package desktop-base/9.0.3+deb9u1



Le 17/06/2017 à 09:35, Adam D. Barratt a écrit :
> Control: tags -1 + moreinfo
>
> On Sat, 2017-06-17 at 00:53 +0200, Aurélien COUDERC wrote:
>> I’d like to push a fix for desktop-base bug #862228 that makes some wallpapers
>> unavailable by default due to a syntax error in their XML descriptor.
>>
>> This fix is made of 2 trivial oneliners.
>>
>> I’m proposing a patch based on desktop-base 9.0.3 that was sitting in unstable
>> since March 23rd without any other new bug being raised.
>> The diff from stretch’s 9.0.2 to 9.0.3 is a bit bigger and cleans some not-so-
>> nice scripting in maintainer scripts in the hope of making them more
>> understandable and maintenable.
>>
>> As I understand you may not want these additional changes, I’m attaching the
>> two debdiffs separately.
>> If the bigger diff isn’t suitable I’ll prepare an upload with the fix to
>> #862228 alone.
> What you actually appear to have attached for the smaller diff is one
> that builds on top of 9.0.3 - i.e. the version in unstable - rather than
> 9.0.2, which is in stretch. Could we have a diff for a package with the
> smaller change that's built on top of stretch, please? :-)
>
> Regards,
>
> Adam
>
Sure, here you go.


Cheers !

--Aurélien

diff -Nru desktop-base-9.0.2/debian/changelog desktop-base-9.0.2+deb9u1/debian/changelog
--- desktop-base-9.0.2/debian/changelog	2017-01-24 23:32:47.000000000 +0100
+++ desktop-base-9.0.2+deb9u1/debian/changelog	2017-06-16 23:43:04.000000000 +0200
@@ -1,3 +1,10 @@
+desktop-base (9.0.2+deb9u1) stretch; urgency=medium
+
+  * Fix XML syntax errors in gnome wallpaper description files making Joy
+    wallpapers unavailable by default. (Closes: #862228)
+
+ -- Aurélien COUDERC <zecoucou@free.fr>  Fri, 16 Jun 2017 23:43:04 +0200
+
 desktop-base (9.0.2) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff -Nru desktop-base-9.0.2/joy-inksplat-theme/gnome-wp-list.xml desktop-base-9.0.2+deb9u1/joy-inksplat-theme/gnome-wp-list.xml
--- desktop-base-9.0.2/joy-inksplat-theme/gnome-wp-list.xml	2017-01-24 23:32:47.000000000 +0100
+++ desktop-base-9.0.2+deb9u1/joy-inksplat-theme/gnome-wp-list.xml	2017-06-16 23:43:04.000000000 +0200
@@ -3,7 +3,6 @@
 <wallpapers>
   <wallpaper>
     <!-- don't include words such as "wallpaper" (avoids translations) -->
-  <wallpaper>
     <name>Joy Inksplat</name>
     <filename>/usr/share/desktop-base/joy-inksplat-theme/wallpaper/gnome-background.xml</filename>
     <options>zoom</options>
diff -Nru desktop-base-9.0.2/joy-theme/gnome-wp-list.xml desktop-base-9.0.2+deb9u1/joy-theme/gnome-wp-list.xml
--- desktop-base-9.0.2/joy-theme/gnome-wp-list.xml	2017-01-24 23:32:47.000000000 +0100
+++ desktop-base-9.0.2+deb9u1/joy-theme/gnome-wp-list.xml	2017-06-16 23:43:04.000000000 +0200
@@ -3,7 +3,6 @@
 <wallpapers>
   <wallpaper>
     <!-- don't include words such as "wallpaper" (avoids translations) -->
-  <wallpaper>
     <name>Joy</name>
     <filename>/usr/share/desktop-base/joy-theme/wallpaper/gnome-background.xml</filename>
     <options>zoom</options>

Reply to: