apply wrap-and-sort to control files

diff --git a/debian/altos.install b/debian/altos.install
index 50f21eb1c5adb35f277b11282b8bd5e7dd12122c..626e21e0ce5ee035795fffa5f873e6ca48389341 100644 (file)
--- a/debian/altos.install
+++ b/debian/altos.install
@@ -2,8 +2,8 @@ debian/altusmetrum.xpm  usr/share/pixmaps
 src/*/*.ihx            usr/share/altos
 src/*/*.map            usr/share/altos
 themes/background.png          usr/share/altos/themes
-themes/slim/panel.png          usr/share/slim/themes/altusmetrum
-themes/slim/slim.theme         usr/share/slim/themes/altusmetrum
-themes/gdm/altusmetrum.xml     /usr/share/gdm/themes/altusmetrum
 themes/gdm/GdmGreeterTheme.desktop     /usr/share/gdm/themes/altusmetrum
+themes/gdm/altusmetrum.xml     /usr/share/gdm/themes/altusmetrum
 themes/gdm/screenshot.png      /usr/share/gdm/themes/altusmetrum
+themes/slim/panel.png          usr/share/slim/themes/altusmetrum
+themes/slim/slim.theme         usr/share/slim/themes/altusmetrum

diff --git a/debian/control b/debian/control
index c9b0fa83ec6f5e064a835cc70bf2360f81d7ba68..7fa2029d62a3c4d088af8551622b4a45fc71c411 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,36 @@ Section: electronics
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
 Uploaders: Keith Packard <keithp@keithp.com>
-Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils, graphicsmagick | imagemagick, netpbm, shared-mime-info, libgtk-3-bin
+Build-Depends: autoconf,
+               automake,
+               cc1111,
+               debhelper (>= 7),
+               default-jdk,
+               docbook-xml,
+               docbook-xsl,
+               fop,
+               freetts,
+               gawk,
+               gcc-arm-none-eabi,
+               graphicsmagick | imagemagick,
+               icnsutils,
+               icoutils,
+               libbluetooth-dev,
+               libelf-dev,
+               libgtk-3-bin,
+               libjfreechart-java,
+               libreadline-dev,
+               librsvg2-bin,
+               libssl-dev,
+               libtool,
+               libusb-1.0-0-dev,
+               netpbm,
+               nickle,
+               pkg-config,
+               shared-mime-info,
+               swig,
+               xmlto,
+               xsltproc
 Standards-Version: 3.9.5
 Homepage: http://altusmetrum.org/AltOS
 Vcs-Git: git://git.gag.com/fw/altos -b debian
@@ -11,7 +40,12 @@ Vcs-Browser: http://git.gag.com/?p=fw/altos
 
 Package: altos
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime, freetts, nickle, libjfreechart-java
+Depends: default-jre | java2-runtime,
+         freetts,
+         libjfreechart-java,
+         nickle,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: slim | gdm
 Replaces: altusmetrum-themes, slim-altusmetrum
 Conflicts: altusmetrum-themes, slim-altusmetrum

diff --git a/debian/copyright b/debian/copyright
index 55841bcae7fb0d881c6fd0e4d6a507e5128491f2..f227602e67e8342705d12f93f91a537e6eadfa3f 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ Copyright:
        Copyright © 1996-2000 Grace Development Team
        Copyright © 1984, 1987, 1989, 1995 Stephen L. Moshier
        Copyright © 2003 Maarten Brock, sourceforge.brock@dse.nl
- 
+
 License:
 
     This program is free software; you can redistribute it and/or modify

diff --git a/debian/docs b/debian/docs
index 4a7eba6803404cba8a5821c7402b63ca6791af33..c0a63faf0384b075ec440f2f715d9c0c8163c129 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,12 +1,12 @@
 NEWS
 README
+doc/altos.html
+doc/altos.pdf
 doc/altusmetrum.html
 doc/altusmetrum.pdf
+doc/easymini-outline.pdf
+doc/telemega-outline.pdf
+doc/telemetrum-outline.pdf
 doc/telemetry.html
 doc/telemetry.pdf
-doc/altos.html
-doc/altos.pdf
-doc/telemetrum-outline.pdf
-doc/telemega-outline.pdf
-doc/easymini-outline.pdf
 doc/telemini.pdf