Wrap-and-sort and fix whitespace.

debian/changelog

@@ -1,3 +1,9 @@
+lubuntu-default-settings (0.52) UNRELEASED; urgency=medium
+
+  * Wrap-and-sort and fix whitespace.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 10 Feb 2018 18:32:39 -0600
+
 lubuntu-default-settings (0.51) bionic; urgency=medium
 
   * debian/gbp.conf

debian/control

@@ -2,88 +2,84 @@ Source: lubuntu-default-settings
 Section: x11
 Priority: optional
 Maintainer: Julien Lavergne <gilir@ubuntu.com>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9), intltool
-               intltool
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/~lubuntu-desktop
 Vcs-Browser: https://git.launchpad.net/lubuntu-default-settings?h=master
-Vcs-Git:  https://git.launchpad.net/lubuntu-default-settings
+Vcs-Git: https://git.launchpad.net/lubuntu-default-settings
-
 
 Package: lubuntu-default-settings
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, 
+Depends: lubuntu-artwork (>= 0.4),
-         lubuntu-artwork (>= 0.4), 
          lubuntu-icon-theme,
          pcmanfm (>= 0.9.5) | pcmanfm-qt,
-         ttf-ubuntu-font-family,
          policykit-desktop-privileges,
-         xbacklight
+         ttf-ubuntu-font-family,
+         xbacklight,
+         ${misc:Depends}
 Suggests: amixer,
-          scrot,
+          dmz-cursor-theme,
           galculator,
           lxsession,
           lxsession-logout,
-          xscreensaver,
+          scrot,
-          dmz-cursor-theme
+          xscreensaver
 Description: default settings for Lubuntu
  Various system settings tailored for Lubuntu.
 
 Package: lubuntu-extra-sessions
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
+Depends: lubuntu-default-settings, ${misc:Depends}
-         lubuntu-default-settings
 Breaks: lubuntu-default-settings (<< 0.37)
 Description: extra session for different default settings of Lubuntu
  Various system settings tailored for various version of Lubuntu.
 
 Package: lxgames-default-session
 Architecture: all
-Depends: ${misc:Depends},
+Depends: lightdm (>= 1.9.4),
-         lubuntu-default-settings,
          lightdm-gtk-greeter (>= 2.0.1-1),
-         lightdm (>= 1.9.4),
+         lubuntu-default-settings,
-         lubuntu-extra-sessions
+         lubuntu-extra-sessions,
+         ${misc:Depends}
 Provides: lightdm-gtk-greeter-config
 Description: Set default session to lxgames
  This package sets the default session to lxgames by default.
 
 Package: lubuntu-default-session
 Architecture: all
-Depends: ${misc:Depends},
+Depends: lightdm (>= 1.9.4),
-         lubuntu-default-settings,
          lightdm-gtk-greeter (>= 2.0.1-1),
-         lightdm (>= 1.9.4)
+         lubuntu-default-settings,
+         ${misc:Depends}
 Provides: lightdm-gtk-greeter-config
 Description: Set default session to Lubuntu
  This package sets the default session to Lubuntu by default.
 
 Package: lubuntu-nexus7-default-session
 Architecture: all
-Depends: ${misc:Depends},
+Depends: lightdm (>= 1.9.4),
-         lubuntu-default-settings,
          lightdm-gtk-greeter (>= 2.0.1-1),
-         lightdm (>= 1.9.4),
+         lubuntu-default-settings,
-         lubuntu-extra-sessions
+         lubuntu-extra-sessions,
+         ${misc:Depends}
 Provides: lightdm-gtk-greeter-config
 Description: Set default session to Lubuntu Nexus7 version
  This package sets the default session to Lubuntu Nexus7 version by default.
 
 Package: lubuntu-nexus7-extra-files
 Architecture: all
-Depends: ${misc:Depends},
+Depends: lubuntu-default-settings, ${misc:Depends}
-         lubuntu-default-settings
 Description: Extra files for the nexus7 session
  This package contents extra files for the nexus7 session.
 
 Package: qlubuntu-default-session
 Architecture: all
-Depends: ${misc:Depends},
+Depends: lubuntu-default-settings,
-         lubuntu-default-settings,
+         lubuntu-extra-sessions,
          sddm,
-         lubuntu-extra-sessions
+         ${misc:Depends}
 Provides: razorqt-lightdm-greeter-config
 Description: Set default session to QLubuntu version
  This package sets the default session to QLubuntu version by default.
@@ -91,7 +87,6 @@ Description: Set default session to QLubuntu version
 Package: lubuntu-live-settings
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
+Depends: lubuntu-default-settings, ${misc:Depends}
-         lubuntu-default-settings
 Description: default settings for Lubuntu live ISO
  Various system settings tailored for Lubuntu ISO.

debian/lubuntu-default-settings.install

@@ -5,13 +5,13 @@ etc/xdg/lubuntu/lxdm/
 etc/xdg/lubuntu/lxterminal/
 etc/xdg/lubuntu/menus/lxde-applications.menu
 etc/xdg/lubuntu/menus/lxgames-applications.menu
-etc/xdg/lxsession/Lubuntu/
 etc/xdg/lxsession/Lubuntu-Netbook/
-etc/xdg/xdg-Lubuntu/
+etc/xdg/lxsession/Lubuntu/
 etc/xdg/pcmanfm/
+etc/xdg/xdg-Lubuntu/
 usr/bin/
-usr/share/applications/lubuntu-screenlock.desktop
 usr/share/applications/lubuntu-logout.desktop
+usr/share/applications/lubuntu-screenlock.desktop
 usr/share/gdm/
 usr/share/lubuntu/leafpad/
 usr/share/lubuntu/openbox/menu.xml
@@ -21,5 +21,5 @@ usr/share/lubuntu/qt/Trolltech.conf
 usr/share/lubuntu/xscreensaver/
 usr/share/lxpanel/profile/Lubuntu/
 usr/share/upstart/sessions/
-usr/share/xsessions/Lubuntu.desktop
 usr/share/xsessions/Lubuntu-Netbook.desktop
+usr/share/xsessions/Lubuntu.desktop

debian/lubuntu-extra-sessions.install

@@ -1,12 +1,12 @@
 etc/xdg/lubuntu/menus/desktop-directories/lxqt-settings.directory
 etc/xdg/lubuntu/menus/lubuntu-nexus7-applications.menu
-etc/xdg/lxsession/Lubuntu-Nexus7/
-etc/xdg/lxsession/LX-Games/
-etc/xdg/lxsession/QLubuntu/
 etc/xdg/lubuntu/pcmanfm-qt/
+etc/xdg/lxsession/LX-Games/
+etc/xdg/lxsession/Lubuntu-Nexus7/
+etc/xdg/lxsession/QLubuntu/
 usr/share/lubuntu/openbox/nexus-rc.xml
 usr/share/lubuntu/qt/Trolltech-qt-session.conf
 usr/share/lxpanel/profile/Lubuntu-Nexus7/
-usr/share/xsessions/lubuntu-nexus7.desktop
 usr/share/xsessions/QLubuntu.desktop
+usr/share/xsessions/lubuntu-nexus7.desktop
 usr/share/xsessions/lxgames.desktop