Wrap and sort control files (wrap-and-sort -abst)

debian/changelog

@@ -16,6 +16,7 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
     infrastructure
   * t/img.t: do not spuriously skip
   * tests: consistently use done_testing instead of no_plan
+  * Wrap and sort control files (wrap-and-sort -abst)
 
  -- Simon McVittie <smcv@debian.org>  Mon, 15 Jun 2015 18:13:23 +0100
 

debian/control

@@ -1,18 +1,31 @@
 Source: ikiwiki
 Section: web
 Priority: optional
-Build-Depends: perl, debhelper (>= 9)
+Build-Depends:
-Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
+ debhelper (>= 9),
-  libtext-markdown-discount-perl,
+ perl,
-  libtimedate-perl, libhtml-template-perl,
+Build-Depends-Indep:
-  libhtml-scrubber-perl,
+ dpkg-dev (>= 1.9.0),
-  libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34),
+ ghostscript,
-  libfile-chdir-perl, libyaml-libyaml-perl, librpc-xml-perl,
+ libcgi-formbuilder-perl,
-  libcgi-pm-perl, libcgi-session-perl, ghostscript,
+ libcgi-pm-perl,
-  libmagickcore-6.q16-2-extra | libmagickcore-extra,
+ libcgi-session-perl,
-  libcgi-formbuilder-perl
+ libfile-chdir-perl,
+ libhtml-parser-perl,
+ libhtml-scrubber-perl,
+ libhtml-template-perl,
+ libmagickcore-6.q16-2-extra | libmagickcore-extra,
+ librpc-xml-perl,
+ libtext-markdown-discount-perl,
+ libtimedate-perl,
+ liburi-perl (>= 1.36),
+ libxml-simple-perl,
+ libyaml-libyaml-perl,
+ perlmagick,
+ po4a (>= 0.34),
 Maintainer: Simon McVittie <smcv@debian.org>
-Uploaders: Josh Triplett <josh@freedesktop.org>
+Uploaders:
+ Josh Triplett <josh@freedesktop.org>,
 Standards-Version: 3.9.5
 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
@@ -20,33 +33,73 @@ Testsuite: autopkgtest-pkg-perl
 
 Package: ikiwiki
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends},
+Depends:
-  libtext-markdown-discount-perl,
+ libhtml-parser-perl,
-  libhtml-scrubber-perl, libhtml-template-perl,
+ libhtml-scrubber-perl,
-  libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-libyaml-perl, libjson-perl
+ libhtml-template-perl,
-Recommends: gcc | c-compiler, 
+ libjson-perl,
-  libc6-dev | libc-dev,
+ libtext-markdown-discount-perl,
-  git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
+ liburi-perl (>= 1.36),
-  libxml-simple-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl,
+ libyaml-libyaml-perl,
-  liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-pm-perl,
+ ${misc:Depends},
-  libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
+ ${perl:Depends},
-  libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl,
+Recommends:
-  libgravatar-url-perl, librpc-xml-perl,
+ gcc | c-compiler,
-Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
+ git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
-  xapian-omega (>= 1.0.5), libtext-wikiformat-perl,
+ libauthen-passphrase-perl,
-  python, python-docutils, polygen, tidy, libhtml-tree-perl,
+ libc6-dev | libc-dev,
-  libxml-feed-perl, libmailtools-perl, perlmagick,
+ libcgi-formbuilder-perl (>= 3.05),
-  libfile-mimeinfo-perl, file,
+ libcgi-pm-perl,
-  liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl,
+ libcgi-session-perl (>= 4.14-1),
-  libtext-csv-perl, graphviz, libnet-amazon-s3-perl,
+ libcrypt-ssleay-perl,
-  libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
+ libgravatar-url-perl,
-  libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
+ liblwpx-paranoidagent-perl,
-  po4a (>= 0.35-1), gettext, libnet-inet6glue-perl,
+ libmail-sendmail-perl,
-  libtext-multimarkdown-perl, libxml-writer-perl,
+ libnet-openid-consumer-perl,
-  ghostscript, libmagickcore-extra
+ librpc-xml-perl,
-Conflicts: ikiwiki-plugin-table
+ libterm-readline-gnu-perl,
-Replaces: ikiwiki-plugin-table
+ libtimedate-perl,
-Provides: ikiwiki-plugin-table
+ libxml-simple-perl,
+Suggests:
+ dvipng,
+ file,
+ gettext,
+ ghostscript,
+ graphviz,
+ libfile-mimeinfo-perl,
+ libhighlight-perl,
+ libhtml-tree-perl,
+ liblocale-gettext-perl (>= 1.05-1),
+ libmagickcore-extra,
+ libmailtools-perl,
+ libnet-amazon-s3-perl,
+ libnet-inet6glue-perl,
+ libsearch-xapian-perl,
+ libsort-naturally-perl,
+ libsparkline-php,
+ libtext-csv-perl,
+ libtext-multimarkdown-perl,
+ libtext-textile-perl,
+ libtext-typography-perl,
+ libtext-wikicreole-perl,
+ libtext-wikiformat-perl,
+ libxml-feed-perl,
+ libxml-writer-perl,
+ perlmagick,
+ po4a (>= 0.35-1),
+ polygen,
+ python,
+ python-docutils,
+ texlive,
+ tidy,
+ viewvc | gitweb | viewcvs,
+ xapian-omega (>= 1.0.5),
+Conflicts:
+ ikiwiki-plugin-table,
+Replaces:
+ ikiwiki-plugin-table,
+Provides:
+ ikiwiki-plugin-table,
 Description: a wiki compiler
  Ikiwiki converts a directory full of wiki pages into HTML pages suitable
  for publishing on a website. Unlike many wikis, ikiwiki does not have its

debian/links

@@ -1,2 +1,2 @@
-usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples
 usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL
+usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples