normalize fields with wrap-and-sort(1)

4 files changed, 40 insertions, 37 deletions

diff --git a/debian/boxbackup-client.install b/debian/boxbackup-client.install
index 23622cd6..5dbf00bf 100644
--- a/debian/boxbackup-client.install
+++ b/debian/boxbackup-client.install
@@ -1,4 +1,4 @@
-parcels/boxbackup-*-backup-client-*-gnu*/bbackupd /usr/sbin/
 parcels/boxbackup-*-backup-client-*-gnu*/bbackupctl /usr/sbin/
-parcels/boxbackup-*-backup-client-*-gnu*/bbackupquery /usr/sbin/
+parcels/boxbackup-*-backup-client-*-gnu*/bbackupd /usr/sbin/
 parcels/boxbackup-*-backup-client-*-gnu*/bbackupd-config /usr/sbin/
+parcels/boxbackup-*-backup-client-*-gnu*/bbackupquery /usr/sbin/
diff --git a/debian/boxbackup-server.install b/debian/boxbackup-server.install
index c22f83c6..24809064 100644
--- a/debian/boxbackup-server.install
+++ b/debian/boxbackup-server.install
@@ -1,8 +1,8 @@
+
+debian/tmp/etc/logcheck/ignore.d.server/boxbackup-server /etc/logcheck/ignore.d.server
+debian/tmp/etc/logcheck/ignore.d.workstation/boxbackup-server /etc/logcheck/ignore.d.workstation
 parcels/boxbackup-*-backup-server-*-gnu*/bbstoreaccounts /usr/sbin/
 parcels/boxbackup-*-backup-server-*-gnu*/bbstored /usr/sbin/
 parcels/boxbackup-*-backup-server-*-gnu*/bbstored-certs /usr/bin/
 parcels/boxbackup-*-backup-server-*-gnu*/bbstored-config /usr/sbin/
 parcels/boxbackup-*-backup-server-*-gnu*/raidfile-config /usr/sbin/
-debian/tmp/etc/logcheck/ignore.d.workstation/boxbackup-server /etc/logcheck/ignore.d.workstation
-debian/tmp/etc/logcheck/ignore.d.server/boxbackup-server /etc/logcheck/ignore.d.server
-
diff --git a/debian/control b/debian/control
index ef634e90..539df16b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,20 @@ Source: boxbackup
 Section: utils
 Priority: optional
 Maintainer: Reinhard Tartler <siretart@tauware.de>
-Build-Depends: autoconf,
-	       automake,
-	       autotools-dev,
-	       debhelper (>> 7.0.0),
-	       docbook-utils,
-	       docbook-xml,
-	       docbook-xsl,
-	       libdb-dev (>= 4.7),
-	       libedit-dev,
-	       libssl-dev,
-	       quilt,
-	       xsltproc,
-	       zlib1g-dev
+Build-Depends:
+ autoconf,
+ automake,
+ autotools-dev,
+ debhelper (>> 7.0.0),
+ docbook-utils,
+ docbook-xml,
+ docbook-xsl,
+ libdb-dev (>= 4.7),
+ libedit-dev,
+ libssl-dev,
+ quilt,
+ xsltproc,
+ zlib1g-dev
 Standards-Version: 3.9.1
 Homepage: http://boxbackup.org
 Vcs-Bzr: http://bazaar.launchpad.net/~siretart/boxbackup/boxbackup.debian
@@ -22,14 +23,15 @@ Vcs-Browser: http://codebrowse.launchpad.net/~siretart/boxbackup/boxbackup.debia
 
 Package: boxbackup-server
 Architecture: any
-Depends: ${misc:Depends},
-	 ${shlibs:Depends},
-	 adduser,
-	 perl,
-	 gawk,
-	 ucf,
-	 openssl,
-	 debconf | debconf-2.0
+Depends:
+ adduser,
+ debconf | debconf-2.0,
+ gawk,
+ openssl,
+ perl,
+ ucf,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: server for the BoxBackup remote backup system
  BoxBackup is an automatic on-line backup system.
  The server waits for connections from remote clients,
@@ -39,12 +41,13 @@ Description: server for the BoxBackup remote backup system
 
 Package: boxbackup-client
 Architecture: any
-Depends: ${misc:Depends},
-	 ${shlibs:Depends},
-	 ucf,
-	 perl,
-	 openssl,
-	 debconf | debconf-2.0
+Depends:
+ debconf | debconf-2.0,
+ openssl,
+ perl,
+ ucf,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: client for the BoxBackup remote backup system
  BoxBackup is an automatic on-line backup system.
  The client watches for changes on the local file system,
diff --git a/debian/copyright b/debian/copyright
index f2c30c9d..ffb3eead 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,10 @@ It was downloaded from http://boxbackup.org
 Upstream Author: Ben Summers <ben@fluffy.co.uk>
 
 Copyright:
- 
+
 Copyright (c) 2003, 2004
      Ben Summers.  All rights reserved.
- 
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
@@ -18,15 +18,15 @@ are met:
 2. Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-3. All use of this software and associated advertising materials must 
+3. All use of this software and associated advertising materials must
    display the following acknowledgement:
        This product includes software developed by Ben Summers.
 4. The names of the Authors may not be used to endorse or promote
    products derived from this software without specific prior written
    permission.
 
-[Where legally impermissible the Authors do not disclaim liability for 
-direct physical injury or death caused solely by defects in the software 
+[Where legally impermissible the Authors do not disclaim liability for
+direct physical injury or death caused solely by defects in the software
 unless it is modified by a third party.]
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR