Run wrap-and-sort -a on debian directory

diff --git a/debian/control b/debian/control
index b3fde18..1399275 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,9 @@ Section: grml
 Priority: extra
 Maintainer: Michael Prokop <mika@grml.org>
 Build-Depends: debhelper (>= 5)
 Priority: extra
 Maintainer: Michael Prokop <mika@grml.org>
 Build-Depends: debhelper (>= 5)

-Build-Depends-Indep: asciidoc, xsltproc, docbook-xsl
+Build-Depends-Indep: asciidoc,
+                     docbook-xsl,
+                     xsltproc

 Standards-Version: 3.9.5
 Homepage: http://grml.org/grml-live/
 Vcs-git: git://git.grml.org/grml-live.git
 Standards-Version: 3.9.5
 Homepage: http://grml.org/grml-live/
 Vcs-git: git://git.grml.org/grml-live.git


@@ -13,9 +15,26 @@ Bugs: mailto:bugs@grml.org
 
 Package: grml-live
 Architecture: all
 
 Package: grml-live
 Architecture: all

-Depends: ${misc:Depends}, bc, bzip2, fai-client (>= 3.4.0), fai-server (>= 3.4.0), xorriso | genisoimage, mksh, moreutils, squashfs-tools (>= 1:4.2-0~bpo60), pciutils, memtest86+, syslinux
-Recommends: grml-live-db, ia32-libs, ipxe, grub-pc-bin, imagemagick
-Suggests: fai-doc, grml-live-addons, grml-live-compat
+Depends: bc,
+         bzip2,
+         fai-client (>= 3.4.0),
+         fai-server (>= 3.4.0),
+         memtest86+,
+         mksh,
+         moreutils,
+         pciutils,
+         squashfs-tools (>= 1:4.2-0~bpo60),
+         syslinux,
+         xorriso | genisoimage,
+         ${misc:Depends}
+Recommends: grml-live-db,
+            grub-pc-bin,
+            ia32-libs,
+            imagemagick,
+            ipxe
+Suggests: fai-doc,
+          grml-live-addons,
+          grml-live-compat

 Description: build system for creating a Grml (based) Linux live system
  This package provides the build system for creating a Debian /
  Grml based Linux live system (also known as live cd). It is
 Description: build system for creating a Grml (based) Linux live system
  This package provides the build system for creating a Debian /
  Grml based Linux live system (also known as live cd). It is


@@ -23,7 +42,12 @@ Description: build system for creating a Grml (based) Linux live system
 
 Package: grml-live-db
 Architecture: all
 
 Package: grml-live-db
 Architecture: all

-Depends: ${misc:Depends}, grml-live, libdbd-sqlite3-perl, libdbi-perl, libtimedate-perl, sqlite3
+Depends: grml-live,
+         libdbd-sqlite3-perl,
+         libdbi-perl,
+         libtimedate-perl,
+         sqlite3,
+         ${misc:Depends}

 Recommends: perl-doc
 Description: log package build information of grml-live to database
  This package provides a database layer for storing build
 Recommends: perl-doc
 Description: log package build information of grml-live to database
  This package provides a database layer for storing build

diff --git a/debian/grml-live.install b/debian/grml-live.install
index cceb5f3..9bb8d9e 100644 (file)
--- a/debian/grml-live.install
+++ b/debian/grml-live.install
@@ -1,12 +1,12 @@
-docs/grml-live.8            usr/share/man/man8/

 docs/grml-live-remaster.8   usr/share/man/man8/
 docs/grml-live-remaster.8   usr/share/man/man8/

+docs/grml-live.8            usr/share/man/man8/

 etc/grml                    etc
 examples                    usr/share/doc/grml-live/
 etc/grml                    etc
 examples                    usr/share/doc/grml-live/

+fonts                       usr/share/grml-live/

 grml-live                   usr/sbin/
 remaster/grml-live-remaster usr/sbin/
 grml-live                   usr/sbin/
 remaster/grml-live-remaster usr/sbin/

-fonts                       usr/share/grml-live/

 scripts                     usr/share/grml-live/
 scripts                     usr/share/grml-live/

+templates/GRML              usr/share/grml-live/templates/

 templates/boot/grub         usr/share/grml-live/templates/boot/
 templates/boot/isolinux     usr/share/grml-live/templates/boot/
 templates/boot/grub         usr/share/grml-live/templates/boot/
 templates/boot/isolinux     usr/share/grml-live/templates/boot/

-templates/GRML              usr/share/grml-live/templates/

 templates/windows           usr/share/grml-live/templates/
 templates/windows           usr/share/grml-live/templates/