debian/{control,copyright,flightcrew.install}: wrap-and-sort maintenance

diff --git a/debian/control b/debian/control
index be847ed932a451d248b8ae096fbcb428745ae8c6..984432227fdfd4846be91e489712c9641900f9de 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,25 @@ Section: text
 Priority: extra
 Standards-Version: 3.9.4
 Maintainer: Don Armstrong <don@debian.org>
-Build-Depends: debhelper (>= 9), cmake, libqt4-dev, zlib-bin, zlib1g-dev, 
-               libxerces-c-dev, libboost-all-dev, libzipios++-dev, google-mock
-Build-Depends-Indep: 
+Build-Depends: cmake,
+               debhelper (>= 9),
+               google-mock,
+               libboost-all-dev,
+               libqt4-dev,
+               libxerces-c-dev,
+               libzipios++-dev,
+               zlib-bin,
+               zlib1g-dev
 Homepage: http://code.google.com/p/flightcrew
 
 Package: flightcrew
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: ${misc:Recommends}, ${shlibs:Recommends}
-Suggests: epub-utils, sigil
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: ${misc:Recommends},
+            ${shlibs:Recommends}
+Suggests: epub-utils,
+          sigil
 Description: C++ epub validator
  FlightCrew is an epub validator written in C++. It is used by sigil
  to validate epub files, and may be generally useful for other epub
@@ -20,9 +29,10 @@ Description: C++ epub validator
 
 Package: libflightcrew0
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: ${misc:Recommends}, ${shlibs:Recommends}
-Suggests: 
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: ${misc:Recommends},
+            ${shlibs:Recommends}
 Description: C++ library for epub validation
  FlightCrew is an epub validator written in C++. It is used by sigil
  to validate epub files, and may be generally useful for other epub
@@ -33,9 +43,10 @@ Description: C++ library for epub validation
 Package: libflightcrew-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: ${misc:Recommends}, ${shlibs:Recommends}
-Suggests: 
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: ${misc:Recommends},
+            ${shlibs:Recommends}
 Description: C++ library development filesfor epub validation
  FlightCrew is an epub validator written in C++. It is used by sigil
  to validate epub files, and may be generally useful for other epub

diff --git a/debian/copyright b/debian/copyright
index 4e3ec4af9e7ad963c82db844c6379d538ac2238d..c878b69bf986b45c59353f41375b22b202ef6e2a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,7 @@ Files: src/*
 Copyright: 2010, Strahinja Markovic
 License: LGPL-3+
 
-Files: 
+Files:
  src/FlightCrew/Schemas/ncx-2005-1.dtd
 Copyright: *No copyright*
 License: UNKNOWN
@@ -22,7 +22,7 @@ Files: src/zipios/*
 Copyright: 2000, Thomas Søndergaard
 License: LGPL-2+
 
-Files: 
+Files:
  src/utf8-cpp/utf8.h
  src/utf8-cpp/utf8/checked.h
  src/utf8-cpp/utf8/core.h
@@ -93,10 +93,10 @@ Files: src/FlightCrew/Schemas/xhtml11-flat.dtd
 Copyright: 1998-2000, World Wide Web Consortium
   holders make no
 License: XHTML DTD
- Permission to use, copy, modify and distribute the XHTML DTD and its 
- accompanying documentation for any purpose and without fee is hereby 
- granted in perpetuity, provided that the above copyright notice and 
- this paragraph appear in all copies.  The copyright holders make no 
+ Permission to use, copy, modify and distribute the XHTML DTD and its
+ accompanying documentation for any purpose and without fee is hereby
+ granted in perpetuity, provided that the above copyright notice and
+ this paragraph appear in all copies.  The copyright holders make no
  representation about the suitability of the DTD for any purpose.
  .
  It is provided "as is" without expressed or implied warranty.
@@ -117,7 +117,7 @@ License: LGPL-2+
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2 can be found at /usr/share/common-licenses/LGPL-2
- 
+
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -136,5 +136,3 @@ License: LGPL-3+
  On Debian systems, the complete text of version 3 of the GNU Lesser
  General Public License can be found in
  `/usr/share/common-licenses/LGPL-3'.
-
-

diff --git a/debian/flightcrew.install b/debian/flightcrew.install
index 356da133aef2fa2aeab37c285ba819e40d52f358..bf79c5f532cfdc9c4b89eb7aca12b3cdf0d9a3e4 100644 (file)
--- a/debian/flightcrew.install
+++ b/debian/flightcrew.install
@@ -1,2 +1,2 @@
-/usr/bin/flightcrew-gui
 /usr/bin/flightcrew-cli
+/usr/bin/flightcrew-gui