From eaab49ab1859ebe236a201f93b5352e67aa7ed2b Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sun, 16 Aug 2015 17:43:32 +0200 Subject: [PATCH 1/1] apply wrap-and-sort to control files --- debian/altos.install | 6 +++--- debian/control | 38 ++++++++++++++++++++++++++++++++++++-- debian/copyright | 2 +- debian/docs | 10 +++++----- 4 files changed, 45 insertions(+), 11 deletions(-) diff --git a/debian/altos.install b/debian/altos.install index 50f21eb1..626e21e0 100644 --- 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 c9b0fa83..7fa2029d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,36 @@ Section: electronics Priority: optional Maintainer: Bdale Garbee Uploaders: Keith Packard -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 55841bca..f227602e 100644 --- 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 4a7eba68..c0a63faf 100644 --- 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 -- 2.30.2