Various check-all-the-things fixes

4 files changed, 22 insertions, 21 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 5d11c63..8825f92 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -29,7 +29,7 @@ Four theme packs are currently provided:
 
     These themes contain customization for GRUB, Plymouth, login managers like
 SDDM and LightDM, wallpapers and lock screen for desktop environments like
-Gnome, KDE’s Plasma 5, XFCE, Mate…
+GNOME, KDE’s Plasma 5, Xfce, Mate…
 See below for how to switch between themes and a detailed description of the
 theme packs structure.
 
@@ -65,7 +65,7 @@ overridden defaults.
 grub-common to correctly update the GRUB background with the Debian theme when
 running « update-grub ».
 
-- Gnome desktop wallpaper and lock screen:
+- GNOME desktop wallpaper and lock screen:
     /usr/share/glib-2.0/schemas/10_desktop-base.gschema.override
 
 - Plasma 5 desktop wallpaper:
@@ -73,7 +73,7 @@ running « update-grub ».
 
     Plasma ensures this JavaScript script is run for every user once and only
 once for each Plasma version. It is run at user login time. See:
-http://userbase.kde.org/KDE_System_Administration/PlasmaDesktopScripting
+https://userbase.kde.org/KDE_System_Administration/PlasmaDesktopScripting
 
 1.5. Plymouth boot splashes
 
@@ -98,7 +98,7 @@ GRUB_CMDLINE_LINUX_DEFAULT variable. For example:
 elements to a given theme.
 This alternative is called « desktop-theme » and currently supports GRUB
 background, login manager background (SDDM, LightDM), Desktops wallpapers
-(Gnome, Plasma 5, XFCE, Mate…).
+(GNOME, Plasma 5, Xfce, Mate…).
 
 You can change the theme pack selection with:
     update-alternatives --config desktop-theme
@@ -158,7 +158,7 @@ via the desktop-theme alternative.
     /usr/share/images/desktop-base/desktop-background
 
     This is a single SVG file used by desktop environments that don’t require
-a more complex wallpaper setup (XFCE, MATE…).
+a more complex wallpaper setup (Xfce, MATE…).
 It defaults to the 1920x1080 version of the active theme wallpaper selected
 via the desktop-theme alternative.
 
@@ -167,7 +167,7 @@ via the desktop-theme alternative.
 - desktop-lockscreen.xml, alternative for:
     /usr/share/images/desktop-base/desktop-lockscreen.xml
 
-    These two XML files are used by Gnome to set the wallpaper and lock screen
+    These two XML files are used by GNOME to set the wallpaper and lock screen
 for all users who didn’t otherwise chose a wallpaper or lock screen themselves.
 It defaults to the wallpaper and lock screen for the active theme selected via
 the desktop-theme alternative.
@@ -234,9 +234,9 @@ A theme pack should contain the following elements:
 -> To provide the login background alternative for LightDM, SDDM…
 
 ./gnome-wp-list.xml
--> To make the wallpaper and lock screen selectable in Gnome preferences.
+-> To make the wallpaper and lock screen selectable in GNOME preferences.
    This file describes a list of XML files, one for each image packs provided.
-   Gnome uses these image packs to select the most appropriate version of a
+   GNOME uses these image packs to select the most appropriate version of a
    wallpaper depending on the user’s screen resolution.
 
 ./wallpaper/gnome-background.xml
@@ -259,7 +259,7 @@ A theme pack should contain the following elements:
 ./lockscreen/metadata.desktop
 -> Lock screen background image pack.
    The gnome-background.xml describes the available resolutions for the image,
-   for use by Gnome.
+   for use by GNOME.
    The metadata.desktop contains the description and license of the image pack
    for use by Plasma 5.
    The various files in the images folder are the provided resolutions and
@@ -291,7 +291,7 @@ information about what’s going on with desktop themes in Debian.
 
 If you’ve suggestions for a better artwork, create or edit the images and open
 a 'wishlist' bug against desktop-base in our Bug Tracking System
-(http://bugs.debian.org/). Please attach the source file, preferably in SVG or
+(https://bugs.debian.org/). Please attach the source file, preferably in SVG or
 XCF format, and only propose work for which you’re the author.
 
 For us to be able to distribute your work in Debian, it will need to be under
@@ -303,7 +303,7 @@ https://wiki.debian.org/DebianDesktop/Artwork/Requirements
 
 4.2. Desktop environment maintainers
 
-desktop-base is used by Gnome, KDE’s Plasma 5, XFCE, Mate…
+desktop-base is used by GNOME, KDE’s Plasma 5, Xfce, Mate…
 
 If you’re responsible for a desktop environment in Debian and want to use
 desktop-base artwork, improve the support for your DE, or add additional
diff --git a/debian/changelog b/debian/changelog
index abb88b2..367264e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,13 @@ desktop-base (9.0.5) UNRELEASED; urgency=medium
 
   * Ensure postinst doesn’t fails on upgrade even when an incomplete theme pack
     is active. (Closes: #858643)
+  * Various check-all-the-things fixes.
 
  -- Aurélien COUDERC <zecoucou@free.fr>  Sat, 01 Jul 2017 22:08:51 +0200
 
 desktop-base (9.0.4) unstable; urgency=medium
 
-  * Fix XML errors in some gnome wallpaper description files.
+  * Fix XML errors in some GNOME wallpaper description files.
     (Closes: #862228)
   * Build with debhelper, bump compatibility level to 10, drop CDBS build
     dependency.
@@ -92,7 +93,7 @@ desktop-base (9.0.0~exp1) experimental; urgency=medium
   [ Aurélien COUDERC ]
   * Initial support for Soft Waves theme by Juliette Belin.
     - Default theme for GRUB (Closes: #598776, #773369)
-    - Default theme for Gnome wallpaper and lock screen
+    - Default theme for GNOME wallpaper and lock screen
     - Default theme for Plasma 5 wallpaper (Closes: #831730)
     - Theme available for SDDM login and lock screen
     - debian/copyright updated
@@ -107,7 +108,7 @@ desktop-base (9.0.0~exp1) experimental; urgency=medium
     - Can be configured with alternatives (also works in lightdm).
    (Closes: #415064, #608523, #611170, #670866, #762276)
   * Remove deprecated ksplash and kdm from KDE4. (Closes: #607842)
-  * Remove deprecated splash options from Gnome 2.
+  * Remove deprecated splash options from GNOME 2.
   * Some cleanup in maintainer scripts to correctly handle alternatives.
     (Closes: #773404)
 
@@ -193,7 +194,7 @@ desktop-base (7.0.3) unstable; urgency=low
     - Don't cut off the last hostname letter.
     - Adjust font sizes and colors.
   * Ksplash: don't cut off blurred icons.
-  * Reduce opacity of debian swirl in gdm/kdm background to be
+  * Reduce opacity of Debian swirl in gdm/kdm background to be
     less distracting.
 
   [ Paul Tagliamonte ]
@@ -207,7 +208,7 @@ desktop-base (7.0.3) unstable; urgency=low
 
 desktop-base (7.0.2) unstable; urgency=low
 
-  * Droped the ${misc:Depends}, as Yves-Alexis pointed out, it drags in dconf
+  * Dropped the ${misc:Depends}, as Yves-Alexis pointed out, it drags in dconf
     without a reason.
 
  -- Paul Tagliamonte <paultag@debian.org>  Mon, 30 Jul 2012 19:43:20 -0400
@@ -217,7 +218,7 @@ desktop-base (7.0.1) unstable; urgency=low
   [ Eshat Cakar ]
   * Make 1366x768 ksplash background really that resolution. (Closes: #679306)
   * Fix typo in plymouth theme. (Closes: #679357)
-  * Updated ink-splated kde wallpaper, to fix alignment issues.
+  * Updated ink-splated KDE wallpaper, to fix alignment issues.
 
   [ Paul Tagliamonte ]
   * Add ${misc:Depends} to the Depends for the binary package. We're using
@@ -234,7 +235,7 @@ desktop-base (7.0.0) unstable; urgency=low
   * Updated the KDM theme.
   * Updated the ksplash theme.
   * Install Joy wallpapers into /usr/share/wallpapers/
-    This makes them visibile in KDE's wallpaper chooser
+    This makes them visible in KDE's wallpaper chooser
   * Set default wallpaper for new users via plasma scripting
 
   [ Paul Tagliamonte ]
@@ -573,7 +574,7 @@ desktop-base (4.0.4) unstable; urgency=low
 
 desktop-base (4.0.3) unstable; urgency=low
 
-  * Fix kde default wallpaper appearance between kdm to ksplash switch.
+  * Fix KDE default wallpaper appearance between kdm to ksplash switch.
 
  -- Fathi Boudra <fboudra@free.fr>  Thu, 24 May 2007 01:22:06 +0200
 
diff --git a/debian/control b/debian/control
index 481d3bb..2a7215f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Uploaders: Loïc Minier <lool@dooz.org>,
            Aurélien COUDERC <zecoucou@free.fr>
 Build-Depends: debhelper (>= 10), librsvg2-bin
 Standards-Version: 3.9.8
-Homepage: http://www.debian.org/devel/debian-desktop
+Homepage: https://www.debian.org/devel/debian-desktop/
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-desktop/packages/trunk/desktop-base
 Vcs-Svn: svn://anonscm.debian.org/debian-desktop/packages/trunk/desktop-base
 Testsuite: autopkgtest
diff --git a/debian/preinst b/debian/preinst
index 9fa1e6b..34eca75 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -65,7 +65,7 @@ joy-inksplat-wallpaper_1920x1080.svg
 spacefun-wallpaper.svg
 spacefun-wallpaper-widescreen.svg
 EOF
-        # Wallpaper XML descriptions (for Gnome)
+        # Wallpaper XML descriptions (for GNOME)
         while read desktopbackground; do
             update-alternatives --remove \
                 desktop-background.xml \