Update Debian packaging

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8

diff --git a/debian/control b/debian/control
index aa1f399..96e84f1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: grml-scripts
 Section: utils
 Priority: optional
 Maintainer: Michael Prokop <mika@grml.org>
-Uploaders: Michael Gebetsroither <gebi@grml.org>
-Build-Depends: debhelper (>= 5), dietlibc-dev, xsltproc, docbook-xsl, asciidoc
+Build-Depends: debhelper (>= 8), dietlibc-dev, xsltproc, docbook-xsl, asciidoc
 Standards-Version: 3.9.2
 Homepage: http://git.grml.org/?p=grml-scripts.git
 Vcs-git: git://git.grml.org/grml-scripts.git
@@ -13,17 +12,12 @@ Bugs: mailto:bugs@grml.org
 
 Package: grml-scripts
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, less, dialog, perl, zsh, dash, links | w3m | links2, screen, grml-network, grml-etc-core, lockfile-progs, grml-scripts-core
-Suggests: python, grml-x, ipcalc, hwinfo, grml-etc, grml-rebuildfstab, grml-files, mutt, slrn, grml-docs, grml-autoconfig, dirvish, sudo, idesk, python-dbus, notification-daemon, grml-quickconfig, lzop, alsa-utils
-Breaks: grml-autoconfig (<< 0.9.19)
-Description: Scripts for the Grml system for an easier life
- Some scripts which should make life easier.
- .
+Depends: ${shlibs:Depends}, ${misc:Depends}, dialog, perl, zsh, dash, links | w3m | links2, screen, grml-etc-core
+Suggests: python, grml-rebuildfstab, grml-network, grml-files, mutt, slrn, grml-docs, dirvish, sudo, idesk, python-dbus, notification-daemon, grml-quickconfig, lzop, alsa-utils
+Description: Collection of little tools
  This package contains a lot of scripts and is only really suited for
  full Grml systems. It provides, amongst others: grml-mutt, grml-slrn,
- iimage, make_chroot_jail.
- If you're on a plain Debian system, it's recommended to install
- grml-scripts-core instead.
+ iimage, make_chroot_jail, qma, myip and lodgeit.
  .
  Notice: not all the packages which are required for all the scripts
  are in the "Depends:" line. If you want to get a full featured

diff --git a/debian/rules b/debian/rules
index f9912eb..c3c7f0d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ clean:
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
 
        # Add here commands to install the package into debian/grml-scripts.
@@ -56,14 +56,10 @@ binary-arch: build install
        dh_installdocs
        dh_installwm --priority=20 /usr/bin/wm-ng
        dh_installman $(wildcard doc/*.gz)
-       dh_installman manpages/grml-scripts.1 \
-       manpages/reread_partition_table.8 manpages/random-hostname.1 \
-       manpages/grml-setkeyboard.8 manpages/grml-setlang.8 \
-       manpages/grml-iptstate.8 manpages/qma.1 manpages/grml-swapon.8 \
-       manpages/grml2ram.8 manpages/dirvish-setup.8 manpages/iso-term.1 \
-       manpages/grml-init-multitail.1 manpages/grml-setservices.8
+       dh_installman $(wildcard manpages/*.1) $(wildcard manpages/*.8)
        dh_link /usr/bin/soundtest /usr/bin/grml-soundtest
-       dh_link /usr/sbin/blacklist /usr/sbin/unblacklist \
+       dh_link /usr/sbin/blacklist /usr/sbin/unblacklist
+       dh_link \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/blacklist.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/caps-ctrl.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/dpkg_not_running.1.gz \