Running wrap-and-sort -bast.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 83 insertions, 29 deletions

diff --git a/debian/control b/debian/control
index fdf4f37d..bb56a52d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,10 @@ Source: sisu
 Section: text
 Priority: optional
 Maintainer: SiSU Project <sisu@lists.sisudoc.org>
-Uploaders: Ralph Amissah <ralph@amissah.com>
-Build-Depends: debhelper (>= 11)
+Uploaders:
+ Ralph Amissah <ralph@amissah.com>,
+Build-Depends:
+ debhelper (>= 11),
 Rules-Requires-Root: no
 Standards-Version: 4.1.5
 Homepage: http://www.sisudoc.org/
@@ -12,12 +14,37 @@ Vcs-Git: https://git.sisudoc.org/software/sisu
 
 Package: sisu
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, rsync, unzip, zip, xz-utils
+Depends:
+ rsync,
+ ruby | ruby-interpreter,
+ unzip,
+ xz-utils,
+ zip,
+ ${misc:Depends},
 Recommends:
- sisu-pdf, sisu-sqlite, sisu-postgresql, imagemagick | graphicsmagick, keychain,
- openssh-client | lsh-client, openssl, po4a, qrencode, rake, ruby-rmagick,
- ruby-thor, tidy, tree, vim-addon-manager
-Suggests: sisu-markup-samples, lv, calibre, pinfo, poedit, texinfo, trang
+ imagemagick | graphicsmagick,
+ keychain,
+ openssh-client | lsh-client,
+ openssl,
+ po4a,
+ qrencode,
+ rake,
+ ruby-rmagick,
+ ruby-thor,
+ sisu-pdf,
+ sisu-postgresql,
+ sisu-sqlite,
+ tidy,
+ tree,
+ vim-addon-manager,
+Suggests:
+ calibre,
+ lv,
+ pinfo,
+ poedit,
+ sisu-markup-samples,
+ texinfo,
+ trang,
 Description: documents - structuring, publishing in multiple formats and search
  SiSU is a lightweight markup based, command line oriented, document
  structuring, publishing and search, static content tool for document
@@ -65,11 +92,19 @@ Description: documents - structuring, publishing in multiple formats and search
 Package: sisu-complete
 Architecture: all
 Depends:
- ${misc:Depends}, ruby | ruby-interpreter, sisu (= ${source:Version}),
- sisu-pdf (= ${source:Version}), sisu-postgresql (= ${source:Version}),
- sisu-sqlite (= ${source:Version}), imagemagick | graphicsmagick, openssl,
- qrencode, ruby-thor, tree
-Suggests: sisu-markup-samples
+ imagemagick | graphicsmagick,
+ openssl,
+ qrencode,
+ ruby | ruby-interpreter,
+ ruby-thor,
+ sisu (= ${source:Version}),
+ sisu-pdf (= ${source:Version}),
+ sisu-postgresql (= ${source:Version}),
+ sisu-sqlite (= ${source:Version}),
+ tree,
+ ${misc:Depends},
+Suggests:
+ sisu-markup-samples,
 Description: installs all SiSU related packages
  SiSU is a lightweight markup based document structuring, publishing and search
  framework for document collections.
@@ -82,10 +117,17 @@ Description: installs all SiSU related packages
 Package: sisu-pdf
 Architecture: all
 Depends:
- ${misc:Depends}, ruby | ruby-interpreter, sisu (= ${source:Version}),
- texlive-base, texlive-latex-base, texlive-latex-extra,
- texlive-latex-recommended, texlive-plain-generic, texlive-xetex
-Suggests: evince | pdf-viewer
+ ruby | ruby-interpreter,
+ sisu (= ${source:Version}),
+ texlive-base,
+ texlive-latex-base,
+ texlive-latex-extra,
+ texlive-latex-recommended,
+ texlive-plain-generic,
+ texlive-xetex,
+ ${misc:Depends},
+Suggests:
+ evince | pdf-viewer,
 Description: dependencies to convert SiSU LaTeX output to pdf
  SiSU is a lightweight markup based document structuring, publishing and search
  framework for document collections.
@@ -95,9 +137,16 @@ Description: dependencies to convert SiSU LaTeX output to pdf
 Package: sisu-postgresql
 Architecture: all
 Depends:
- ${misc:Depends}, ruby | ruby-interpreter, sisu (= ${source:Version}),
- postgresql, ruby-pg, ruby-fcgi | libfcgi-ruby
-Suggests: fcgiwrap, httpd, postgresql-contrib
+ postgresql,
+ ruby | ruby-interpreter,
+ ruby-fcgi | libfcgi-ruby,
+ ruby-pg,
+ sisu (= ${source:Version}),
+ ${misc:Depends},
+Suggests:
+ fcgiwrap,
+ httpd,
+ postgresql-contrib,
 Description: SiSU dependencies for use with PostgreSQL database
  SiSU is a lightweight markup based document structuring, publishing and search
  framework for document collections.
@@ -114,9 +163,15 @@ Description: SiSU dependencies for use with PostgreSQL database
 Package: sisu-sqlite
 Architecture: all
 Depends:
- ${misc:Depends}, ruby | ruby-interpreter, sisu (= ${source:Version}), sqlite3,
- ruby-sqlite3, ruby-fcgi | libfcgi-ruby
-Suggests: fcgiwrap, httpd
+ ruby | ruby-interpreter,
+ ruby-fcgi | libfcgi-ruby,
+ ruby-sqlite3,
+ sisu (= ${source:Version}),
+ sqlite3,
+ ${misc:Depends},
+Suggests:
+ fcgiwrap,
+ httpd,
 Description: SiSU dependencies for use with SQLite database
  SiSU is a lightweight markup based document structuring, publishing and search
  framework for document collections.
diff --git a/debian/copyright b/debian/copyright
index 01a5f852..79eac2d7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -83,4 +83,3 @@ License: GFDL-NIV-1.3
  Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the
  license is included in the section entitled "GNU Free Documentation License.
  <http://www.gnu.org/copyleft/fdl.html>
-
diff --git a/debian/sisu-pdf.manpages b/debian/sisu-pdf.manpages
index d11343a5..af8823d6 100644
--- a/debian/sisu-pdf.manpages
+++ b/debian/sisu-pdf.manpages
@@ -1,4 +1,4 @@
-man/man1/sisu-pdf.1
+debian/manpages/sisu-pdf.7
 man/man1/sisu-pdf-landscape.1
 man/man1/sisu-pdf-portrait.1
-debian/manpages/sisu-pdf.7
+man/man1/sisu-pdf.1
diff --git a/debian/sisu-postgresql.manpages b/debian/sisu-postgresql.manpages
index 8c2816b9..d8ce97d7 100644
--- a/debian/sisu-postgresql.manpages
+++ b/debian/sisu-postgresql.manpages
@@ -1,2 +1,2 @@
-man/man1/sisu-pg.1
 debian/manpages/sisu-postgresql.7
+man/man1/sisu-pg.1
diff --git a/debian/sisu-sqlite.manpages b/debian/sisu-sqlite.manpages
index 95221efe..6cbe8a33 100644
--- a/debian/sisu-sqlite.manpages
+++ b/debian/sisu-sqlite.manpages
@@ -1,2 +1,2 @@
-man/man1/sisu-sqlite.1
 debian/manpages/sisu-sqlite.7
+man/man1/sisu-sqlite.1
diff --git a/debian/sisu.manpages b/debian/sisu.manpages
index b2c185cc..16db95f1 100644
--- a/debian/sisu.manpages
+++ b/debian/sisu.manpages
@@ -1,11 +1,11 @@
-man/man1/sisu.1
 man/man1/sisu-concordance.1
 man/man1/sisu-epub.1
 man/man1/sisu-harvest.1
-man/man1/sisu-html.1
 man/man1/sisu-html-scroll.1
 man/man1/sisu-html-seg.1
+man/man1/sisu-html.1
 man/man1/sisu-odf.1
 man/man1/sisu-txt.1
 man/man1/sisu-webrick.1
+man/man1/sisu.1
 man/man7/sisu_vim.7