]> err.no Git - util-linux/commitdiff
build: convert to debhelper, deliver more stuff that was being built.
authorLaMont Jones <lamont@mmjgroup.com>
Sat, 25 Aug 2007 05:37:41 +0000 (23:37 -0600)
committerLaMont Jones <lamont@mmjgroup.com>
Sat, 25 Aug 2007 06:00:29 +0000 (00:00 -0600)
30 files changed:
debian/bsdutils.dirs [new file with mode: 0644]
debian/bsdutils.docs [new file with mode: 0644]
debian/bsdutils.files [new file with mode: 0644]
debian/bsdutils.postinst
debian/bsdutils.prerm
debian/cfdisk-udeb.dirs [new file with mode: 0644]
debian/changelog
debian/compat [new file with mode: 0644]
debian/control
debian/control.in
debian/fdisk-udeb.dirs [new file with mode: 0644]
debian/hwclock.sh
debian/mount.dirs [new file with mode: 0644]
debian/mount.docs [new file with mode: 0644]
debian/mount.files [new file with mode: 0644]
debian/mount.postinst
debian/mount.preinst
debian/mount.prerm
debian/postinst
debian/postrm
debian/preinst
debian/prerm
debian/rules
debian/util-linux-locales.dirs [new file with mode: 0644]
debian/util-linux-locales.files [new file with mode: 0644]
debian/util-linux-locales.postinst
debian/util-linux-locales.prerm
debian/util-linux.dirs [new file with mode: 0644]
debian/util-linux.docs [new file with mode: 0644]
debian/util-linux.examples [new file with mode: 0644]

diff --git a/debian/bsdutils.dirs b/debian/bsdutils.dirs
new file mode 100644 (file)
index 0000000..57a1105
--- /dev/null
@@ -0,0 +1,9 @@
+bin/
+usr/
+usr/bin/
+usr/share/
+usr/share/man/
+usr/share/man/man8/
+usr/share/man/man1/
+usr/share/doc/
+usr/share/doc/bsdutils/
diff --git a/debian/bsdutils.docs b/debian/bsdutils.docs
new file mode 100644 (file)
index 0000000..edfa774
--- /dev/null
@@ -0,0 +1 @@
+debian/README.script
diff --git a/debian/bsdutils.files b/debian/bsdutils.files
new file mode 100644 (file)
index 0000000..eff8464
--- /dev/null
@@ -0,0 +1,26 @@
+usr/bin/cal
+usr/bin/col
+usr/bin/colcrt
+usr/bin/colrm
+usr/bin/column
+usr/bin/hexdump
+usr/bin/logger
+usr/bin/look
+usr/bin/renice
+usr/bin/script
+usr/bin/scriptreplay
+usr/bin/ul
+usr/bin/wall
+usr/share/man/man1/cal.1
+usr/share/man/man1/col.1
+usr/share/man/man1/colcrt.1
+usr/share/man/man1/colrm.1
+usr/share/man/man1/column.1
+usr/share/man/man1/hexdump.1
+usr/share/man/man1/logger.1
+usr/share/man/man1/look.1
+usr/share/man/man1/renice.1
+usr/share/man/man1/script.1
+usr/share/man/man1/scriptreplay.1
+usr/share/man/man1/ul.1
+usr/share/man/man1/wall.1
index b50b46e554427343efc50c06ae87abbdc59e6cf8..ebf9fef3168dbb95c7e29bb010d8cbaa2af27357 100644 (file)
@@ -4,3 +4,5 @@ if [ -L /usr/doc/bsdutils ] ; then
     rm -f /usr/doc/bsdutils
 fi
 
+
+#DEBHELPER#
index 7149e64719bd57f73d894ba4130e2c565a204a6f..50e87247ef8f5f4ea2386343445be7038ec8ccb0 100644 (file)
@@ -3,3 +3,5 @@
 if [ -L /usr/doc/bsdutils ] ; then
        rm -f /usr/doc/bsdutils
 fi
+
+#DEBHELPER#
diff --git a/debian/cfdisk-udeb.dirs b/debian/cfdisk-udeb.dirs
new file mode 100644 (file)
index 0000000..f3a32b9
--- /dev/null
@@ -0,0 +1,43 @@
+usr/
+usr/sbin/
+usr/share/
+usr/share/locale/
+usr/share/locale/
+usr/share/locale/ca/
+usr/share/locale/ca/LC_MESSAGES/
+usr/share/locale/cs/
+usr/share/locale/cs/LC_MESSAGES/
+usr/share/locale/da/
+usr/share/locale/da/LC_MESSAGES/
+usr/share/locale/de/
+usr/share/locale/de/LC_MESSAGES/
+usr/share/locale/es/
+usr/share/locale/es/LC_MESSAGES/
+usr/share/locale/et/
+usr/share/locale/et/LC_MESSAGES/
+usr/share/locale/fi/
+usr/share/locale/fi/LC_MESSAGES/
+usr/share/locale/fr/
+usr/share/locale/fr/LC_MESSAGES/
+usr/share/locale/it/
+usr/share/locale/it/LC_MESSAGES/
+usr/share/locale/ja/
+usr/share/locale/ja/LC_MESSAGES/
+usr/share/locale/nl/
+usr/share/locale/nl/LC_MESSAGES/
+usr/share/locale/pt_BR/
+usr/share/locale/pt_BR/LC_MESSAGES/
+usr/share/locale/sl/
+usr/share/locale/sl/LC_MESSAGES/
+usr/share/locale/sv/
+usr/share/locale/sv/LC_MESSAGES/
+usr/share/locale/tr/
+usr/share/locale/tr/LC_MESSAGES/
+usr/share/locale/id/
+usr/share/locale/id/LC_MESSAGES/
+usr/share/locale/ru/
+usr/share/locale/ru/LC_MESSAGES/
+usr/share/locale/uk/
+usr/share/locale/uk/LC_MESSAGES/
+usr/share/locale/vi/
+usr/share/locale/vi/LC_MESSAGES/
index 4859f843a01d1768b1b5bd6d63f5cb5d1bba0ef5..a893932108226f29ccce4eebd12156c1d252e9aa 100644 (file)
@@ -1,11 +1,14 @@
-util-linux (2.13~rc3-7) unstable-UNRELEASED; urgency=low
+util-linux (2.13~rc3-7) unstable; urgency=low
 
   * Document git repository location
   * cytune.8: make the oneliner more specific the cyclades hw in question
     Closes: #375150
   * control: Extend package descriptions.  Closes: #384072
+  * Switch to debhelper, clean up delivery of binaries.
+  * bsdutils: deliver more stuff that we build.  Now partly
+    Replaces: bsdmainutils.
 
- -- LaMont Jones <lamont@debian.org>  Thu, 23 Aug 2007 08:12:59 -0600
+ -- LaMont Jones <lamont@debian.org>  Fri, 24 Aug 2007 23:27:19 -0600
 
 util-linux (2.13~rc3-6) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
@@ -0,0 +1 @@
+5
index fac405f93d8c2f15f1be36a1017f5b5ef344a551..06d4909c72be05234816362467c9d9434efe9cb5 100644 (file)
@@ -1,7 +1,7 @@
 Source: util-linux
 Section: base
 Priority: required
-Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>=0.113-2), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>=0.113-2), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5)
 Maintainer: LaMont Jones <lamont@debian.org>
 Standards-Version: 3.7.2.0
 
@@ -11,65 +11,16 @@ Section: utils
 Priority: required
 Essential: yes
 Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2)
-Pre-Depends: ${util-linux:Depends}
+Pre-Depends: ${shlibs:Depends}
 Suggests: util-linux-locales, kbd | console-tools, dosfstools
-Replaces: schedutils, miscutils, setterm, fdisk, ${util-linux:Conflicts}
+Replaces: schedutils, miscutils, setterm, fdisk, linux32, ${util-linux:Conflicts}
 Conflicts: schedutils, setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), ${util-linux:Conflicts}
 Provides: schedutils
 Description: Miscellaneous system utilities
- This package contains a number of important utilities, most of which are
- oriented towards maintenance of your system.  Some of the more important
- utilities included in this package allow you to partition your hard disk,
- view kernel messages, and create new filesystems.
- .
- The following programs are included in this package:
-  * arch - print machine architecture
-  * blockdev - call block device ioctl()s from the command line (*)
-  * cfdisk - manipulate partition tables using a curses-based interface (*)
-  * chkdupexe - find duplicate executables
-  * cytune - tune Linux Cyclades driver parameters
-  * ddate - convert Gregorian dates to Discordian dates
-  * fdisk - manipulate partition tables interactively
-  * dmesg - print or control kernel ring buffer (*)
-  * elvtune - tune Linux I/O elevator (*)
-  * fdformat - perform low-level format of a floppy diskette (*)
-  * fsck.cramfs - check consistency of compressed ROM filesystems
-  * fsck.minix - check consistency of Minix filesystems
-  * getopt - parse command-line arguments
-  * getty - prompt for login on a TTY port
-  * hwclock - query and set the hardware real-time clock (RTC) (*)
-  * ipcrm - remove an IPC message queue, semaphore set, or shared memory ID
-  * ipcs - provide information on IPC facilities
-  * isosize  - output the length of an ISO 9660 filesystem (*)
-  * line - read one line
-  * mcookie - generate magic cookies for xauth
-  * mkfs - build a Linux filesystem
-  * mkswap - set up a Linux swap area
-  * more - browse pagewise through text files
-  * namei - follow a pathname until a terminal point is found
-  * pg - browse pagewise through text files
-  * pivot_root - change the root filesystem
-  * raw - bind a Linux raw character device to a block device (*)
-  * readprofile - read Linux kernel profiling information (*)
-  * rdev, ramsize, rootflags, vidmode - query/set image root device, RAM disk
-      size, or video mode (*)
-  * rev - reverse lines of a file
-  * setsid - run a program in a new session
-  * setterm - set terminal attributes
-  * sfdisk - manipulate partition tables (*)
-  * tunelp - set various parameters for the lp device
-  * whereis - locate the binary, source, and manual page files for a command
- .
- Programs marked with a an asterisk in parentheses (*) are not available on
- all Debian platforms, because they are utilities for manipulating hardware or
- kernel interfaces that do not exist on some systems.
- .
- Futhermore, some of the above programs are installed with different names on
- certain Debian platforms.
- * "fdisk" is called "ddisk" on PowerPC (and PPC64) systems to emphasize its
-   nature as an editor for DOS parition tables.
- * "mkfs" is called "mkfs.linux" on GNU/Hurd systems.
- * "getty" is called "agetty" on GNU/Hurd systems.
+ This package contains a number of important utilities, most of which
+ are oriented towards maintenance of your system.  Some of the more
+ important utilities included in this package allow you to partition
+ your hard disk, view kernel messages, and create new filesystems.
 
 Package: util-linux-locales
 Architecture: all
@@ -88,44 +39,33 @@ Package: mount
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh s390 sparc sparc64
 Essential: yes
 Section: admin
-Depends: ${mount:Depends}
+Depends: ${shlibs:Depends}
 Suggests: nfs-common (>=1:1.1.0-13)
 Breaks: nfs-common (<<1:1.1.0-7)
 Description: Tools for mounting and manipulating filesystems
- This package provides the following commands:
-  * mount - mount a filesystem
-  * umount - unmount a filesystem (*)
-  * swapon - enable devices and files for paging and swapping
-  * swapoff - disable devices and files for paging and swapping
-  * losetup - set up and control loop devices (*)
- .
- Programs marked with a an asterisk in parentheses (*) are not available on
- all Debian platforms, because they are utilities for manipulating hardware or
- kernel interfaces that do not exist on some systems.
+ This package provides the mount(8), umount(8), swapon(8),
+ swapoff(8), and losetup(8) commands.
 
 Package: bsdutils
 Architecture: any
 Essential: yes
 Section: utils
-Depends: ${bsdutils:Depends}
+Depends: ${shlibs:Depends}
 Recommends: bsdmainutils
+Replaces: bsdmainutils
 Description: Basic utilities from 4.4BSD-Lite
- This package contains the bare minimum number of BSD utilities needed to boot
- a Debian system.  You should probably also install bsdmainutils to get the
- remaining standard BSD utilities.
+ This package contains the bare minimum number of BSD utilities needed
+ to boot a Debian system.  You should probably also install
bsdmainutils to get the remaining standard BSD utilities.
  .
- This package provides the following commands:
-  * logger - make entries in the system log
-  * renice - alter priority of running processes
-  * script - make typescript of terminal session
-  * scriptreplay - play back typescripts using timing information
-  * wall - write a message to users
+ Included are: logger, renice, replay, script, wall
 
 Package: fdisk-udeb
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sparc s390
 Priority: extra
 Section: debian-installer
-Depends: ${fdisk-udeb:Depends}
+Depends: ${shlibs:Depends}
+XC-Package-Type: udeb
 Description: Partition a hard drive (manual)
  fdisk package
 
@@ -133,6 +73,7 @@ Package: cfdisk-udeb
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 s390
 Priority: extra
 Section: debian-installer
-Depends: ${cfdisk-udeb:Depends}
+Depends: ${shlibs:Depends}
+XC-Package-Type: udeb
 Description: Partition a hard drive (cfdisk)
  Cfdisk package
index 698ca9654bc46ad044cc11346aceeaf3c8b83c6b..06d4909c72be05234816362467c9d9434efe9cb5 100644 (file)
@@ -1,7 +1,7 @@
 Source: util-linux
 Section: base
 Priority: required
-Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>=0.113-2), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>=0.113-2), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5)
 Maintainer: LaMont Jones <lamont@debian.org>
 Standards-Version: 3.7.2.0
 
@@ -11,9 +11,9 @@ Section: utils
 Priority: required
 Essential: yes
 Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2)
-Pre-Depends: ${util-linux:Depends}
+Pre-Depends: ${shlibs:Depends}
 Suggests: util-linux-locales, kbd | console-tools, dosfstools
-Replaces: schedutils, miscutils, setterm, fdisk, ${util-linux:Conflicts}
+Replaces: schedutils, miscutils, setterm, fdisk, linux32, ${util-linux:Conflicts}
 Conflicts: schedutils, setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), ${util-linux:Conflicts}
 Provides: schedutils
 Description: Miscellaneous system utilities
@@ -39,7 +39,7 @@ Package: mount
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh s390 sparc sparc64
 Essential: yes
 Section: admin
-Depends: ${mount:Depends}
+Depends: ${shlibs:Depends}
 Suggests: nfs-common (>=1:1.1.0-13)
 Breaks: nfs-common (<<1:1.1.0-7)
 Description: Tools for mounting and manipulating filesystems
@@ -50,8 +50,9 @@ Package: bsdutils
 Architecture: any
 Essential: yes
 Section: utils
-Depends: ${bsdutils:Depends}
+Depends: ${shlibs:Depends}
 Recommends: bsdmainutils
+Replaces: bsdmainutils
 Description: Basic utilities from 4.4BSD-Lite
  This package contains the bare minimum number of BSD utilities needed
  to boot a Debian system.  You should probably also install
@@ -63,7 +64,8 @@ Package: fdisk-udeb
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sparc s390
 Priority: extra
 Section: debian-installer
-Depends: ${fdisk-udeb:Depends}
+Depends: ${shlibs:Depends}
+XC-Package-Type: udeb
 Description: Partition a hard drive (manual)
  fdisk package
 
@@ -71,6 +73,7 @@ Package: cfdisk-udeb
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 s390
 Priority: extra
 Section: debian-installer
-Depends: ${cfdisk-udeb:Depends}
+Depends: ${shlibs:Depends}
+XC-Package-Type: udeb
 Description: Partition a hard drive (cfdisk)
  Cfdisk package
diff --git a/debian/fdisk-udeb.dirs b/debian/fdisk-udeb.dirs
new file mode 100644 (file)
index 0000000..1bb4703
--- /dev/null
@@ -0,0 +1,2 @@
+usr/
+usr/sbin/
index f1c10c6c0b707eb3436494fc9cb97cd5256755c5..69f45f94889b9bba8274931b00c2e425c38f403c 100644 (file)
@@ -13,6 +13,7 @@
 #                 and discourage tampering without proper doc reading.
 
 # WARNING:     Please read /usr/share/doc/util-linux/README.Debian.hwclock.gz
+#              or /usr/share/doc/util-linux/README.Debian.hwclock
 #              before changing this file. You risk serious clock
 #              misbehaviour otherwise.
 
diff --git a/debian/mount.dirs b/debian/mount.dirs
new file mode 100644 (file)
index 0000000..d96dbaa
--- /dev/null
@@ -0,0 +1,10 @@
+bin/
+sbin/
+usr/
+usr/share/
+usr/share/man/
+usr/share/man/man8/
+usr/share/man/man5/
+usr/share/doc/
+usr/share/doc/mount/
+usr/share/doc/mount/examples/
diff --git a/debian/mount.docs b/debian/mount.docs
new file mode 100644 (file)
index 0000000..5ca3a35
--- /dev/null
@@ -0,0 +1 @@
+mount/README.mount
diff --git a/debian/mount.files b/debian/mount.files
new file mode 100644 (file)
index 0000000..45ca119
--- /dev/null
@@ -0,0 +1,11 @@
+bin/mount
+bin/umount
+sbin/swapon
+sbin/losetup
+usr/share/man/man8/swapoff.8
+usr/share/man/man8/umount.8
+usr/share/man/man8/swapon.8
+usr/share/man/man8/losetup.8
+usr/share/man/man8/mount.8
+usr/share/man/man5/fstab.5
+sbin/swapoff
index 6407fa9d3c4a2eed129d3a0cf056bb0da15c5961..705a16810e55b0823b46bf6be66bd1154b25b1f4 100644 (file)
@@ -3,3 +3,5 @@
 if [ -L /usr/doc/mount ] ; then
     rm -f /usr/doc/mount
 fi
+
+#DEBHELPER#
index 583749ef14fd12f140c5ae7d1d26cacb5e35cbc3..9e613f1398ddc36730c2707bf32c8ca7428f9ffd 100644 (file)
@@ -48,3 +48,5 @@ EOF
        ;;
 esac
 
+
+#DEBHELPER#
index 0675656229f5205a1ad46fcd5260a1e643bf4473..07f6705bb2b1b5df805e73f6d1aaeb6a1eec70cb 100644 (file)
@@ -3,3 +3,5 @@
 if [ -L /usr/doc/mount ] ; then
         rm -f /usr/doc/mount
 fi
+
+#DEBHELPER#
index ff53539d0a653f6e3d4659d9d1c4f8e4c61817c0..7886e9ae23ee45d33d1782339847edb4adbc75aa 100644 (file)
@@ -38,3 +38,5 @@ fi
 if [ -L /usr/doc/util-linux ] ; then
     rm -f /usr/doc/util-linux
 fi
+
+#DEBHELPER#
index 01d7f2facfc0596c8ec6e66e2ffc36165c0cf35f..804cadfecd6ef02a7db02f5fd63a70da7fcb3d76 100644 (file)
@@ -15,3 +15,5 @@ if [ -x /usr/sbin/update-mime ]; then
        update-mime
 fi
 
+
+#DEBHELPER#
index 6253ff7dbece4045c37f9be78f6f5370d304d1a3..2df76e6e68644dede298dd425908aece249324a6 100644 (file)
@@ -11,3 +11,5 @@ dpkg --assert-support-predepends ||
 #
 #EOF
 
+
+#DEBHELPER#
index c4b35071d284f690456052dcdf209a4171a39e0e..81490969698ba176bcf3032dec55fac061d5954e 100644 (file)
@@ -13,3 +13,5 @@ case "$1" in
                ;;
 esac
 
+
+#DEBHELPER#
index 9ab68540f2ab1dc3853f9cd54585811b190953da..b2440b59ad6ae19e47bfc678e8ebf20aac1202d0 100755 (executable)
@@ -1,7 +1,9 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-SHELL = bash
-PACKAGE = util-linux
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 DISTRO=$(shell lsb_release -is 2>/dev/null || echo Debian)
 
@@ -10,364 +12,150 @@ DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture)
 DEB_HOST_ARCH = $(DEB_BUILD_ARCH)
 endif
 
-ifndef DEB_HOST_GNU_SYSTEM
-DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-endif
-
 ifndef DEB_HOST_ARCH_OS
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 endif
 
-
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
-# Take account of old dpkg-architecture output.
-DEB_HOST_GNU_SYSTEM := linux-gnu
-endif
-
 export arch = $(DEB_HOST_ARCH)
 version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog)
-
-fdisk_arch = $(findstring $(arch),alpha i386 powerpc ppc64 arm armeb armel m32r mips mipsel hppa ia64 hurd-i386 amd64 s390 lpia)
-rdev_arch = $(findstring $(arch),i386 amd64 lpia)
-sparc = $(findstring $(arch),sparc sparc64)
-nohwclock = $(findstring $(arch),s390)
-
-ifneq ($(DEB_HOST_ARCH_OS),linux)
-util-linux_Conflicts = getty
-endif
-
-CFDISK_PO_DIR=cfdisk-po
-CFDISK_POT=$(CFDISK_PO_DIR)/cfdisk.pot
-HISTORY=docs/v2.13-ReleaseNotes 
+Upstream := $(shell sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog)
 
 CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-fsprobe=volume_id --with-slang
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 CONFOPTS += --with-selinux
 endif
 
-build: 
-       $(checkdir)
+HISTORY=docs/v2.13-ReleaseNotes 
+
+configure: configure-stamp
+configure-stamp:
+       dh_testdir
        ./configure $(CONFOPTS)
+       touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+       dh_testdir
        $(MAKE) all CPU=$(arch) arch=$(arch)
-       touch build
+       touch build-stamp
 
-clean:
-       $(checkdir)
-       rm -f build sys-utils/rdev
-       #rm make_include
+autofiles:
+       AM_OPTS=--copy ./autogen.sh
+       rm -rf autom4te.cache
+
+clean-preunpatch: 
+       dh_testdir
+       dh_testroot
+       dh_clean
+       test ! -d ${base} || rm -rf ${base}
        -$(MAKE) distclean
-       find . -name '*~' -print0 | xargs -0r rm
-       find . -name '*.orig' -print0 | xargs -0r rm
-       find . -name '*.rej' -print0 | xargs -0r rm
-       rm -rf debian/tmp* debian/files* debian/substvars po/messages
-       rm -rf $(CFDISK_PO_DIR)
+
+clean: clean-preunpatch
+       find . -name \*.o -exec rm {} \;
+       rm -f build-stamp configure-stamp
 ifeq ($(DISTRO),Debian)
        sed '/^Breaks:/d' debian/control.in > debian/control
 else
        cp debian/control.in debian/control
 endif
 
-# Architecture independant stuff
-
-SUIDFILES = debian/tmp-mount/bin/{u,}mount
-BINFILES  = text-utils/{more,tailf}
-UBINFILES = sys-utils/{flock,ipcs,ipcrm,setsid,setarch} \
-       misc-utils/{namei,setterm,mcookie,whereis,ddate} \
-       getopt/getopt text-utils/{rev,line,pg} \
-       schedutils/{chrt,ionice,taskset} \
-       partx/{addpart,delpart,partx}
-SBINFILES = disk-utils/mkswap
-
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+       $(MAKE) install DESTDIR=`pwd`/debian/util-linux
+       dh_installdocs -i -a
+       install -m 644 login-utils/README.modems-with-agetty debian/util-linux/usr/share/doc/util-linux/README.modems-with-getty
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-ifneq ($(arch),$(nohwclock))
-INITFILES = debian/hwclock.sh
-SBINFILES += hwclock/hwclock
-endif
-BINFILES  += sys-utils/dmesg
-SBINFILES += disk-utils/{blockdev,raw,isosize} mount/pivot_root login-utils/agetty
-UBINFILES += disk-utils/fdformat
-USBINFILES = sys-utils/readprofile # disk-utils/elvtune disk-utils/setfdprm
-endif
-
-UBINFILES2= misc-utils/chkdupexe # debian/fdformat # don't strip these
-
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-MOUNTBINFILES  = mount/mount mount/umount
-MOUNTSBINFILES = mount/swapon mount/losetup
-endif
-
-#BSDBINFILES = # misc-utils/kill
-BSDUBINFILES = misc-utils/script misc-utils/logger sys-utils/renice \
-               login-utils/wall
-BSDUBINSCRIPT = misc-utils/scriptreplay
-BSDMAN1FILES = login-utils/wall.1 misc-utils/script.1 sys-utils/renice.1 \
-               misc-utils/logger.1 misc-utils/scriptreplay.1 # misc-utils/kill.1
-BSDMAN8FILES =
-BSDDOCFILES = debian/README.script
-
-# Architecture independant docs
-
-MAN1FILES = text-utils/{pg,tailf,more,line,rev}.1 \
-           misc-utils/{namei,mcookie,chkdupexe,setterm,whereis,ddate}.1 \
-           sys-utils/{flock,ipcrm,ipcs,setsid}.1 getopt/getopt.1 \
-           schedutils/{chrt,ionice,taskset}.1
-MAN8FILES = disk-utils/mkswap.8 partx/{addpart,delpart,partx}.8 sys-utils/setarch.8
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-ifneq ($(arch),$(nohwclock))
-MAN8FILES += hwclock/hwclock.8
-endif
-MAN1FILES += sys-utils/dmesg.1 sys-utils/readprofile.1
-MAN8FILES += login-utils/agetty.8 disk-utils/{blockdev.8,elvtune.8,isosize.8} \
-            mount/pivot_root.8 \
-            disk-utils/fdformat.8 disk-utils/raw.8 # disk-utils/setfdprm.8
-endif
-
-
-EXAMPLES = fdisk/sfdisk.examples getopt/getopt-{test,parse}.{ba,tc}sh
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-EXAMPLES += debian/fstab.example2
-endif
-
-INFOFILES = sys-utils/ipc.info
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-DOCFILES  = login-utils/{README.getty,README.modems-with-agetty,README.poeigl}
-ifneq ($(arch),$(nohwclock))
-DOCFILES += debian/README.Debian.hwclock
-endif
-endif
-
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-MOUNTMAN5FILES = mount/fstab.5
-MOUNTMAN8FILES = mount/losetup.8 mount/swapoff.8 mount/umount.8 \
-                mount/mount.8 mount/swapon.8
-MOUNTDOCFILES  = mount/README.mount
-endif
-
-ifneq ($(arch),$(sparc))
-SBINFILES := $(SBINFILES) disk-utils/{{fsck,mkfs}.{minix,cramfs},mkfs}
-MAN8FILES := $(MAN8FILES) disk-utils/{{fsck,mkfs}.minix.8,mkfs.8}      # no cramfs man
-endif
-ifeq ($(arch),$(fdisk_arch))
-SBINFILES := $(SBINFILES) fdisk/{cfdisk,fdisk,sfdisk}
-MAN8FILES := $(MAN8FILES) fdisk/{cfdisk.8,fdisk.8,sfdisk.8}
-DOCFILES  := $(DOCFILES) fdisk/README.{c,}fdisk
+       perl -pi.bak -e 's/agetty/getty/g' debian/util-linux/usr/share/man/man8/getty.8 \
+                 debian/util-linux/usr/share/doc/util-linux/README.*
+       rm `find debian/util-linux/usr -name \*.bak`
+endif
+       dh_installexamples -i -a
+       dh_installmenu -i -a
+       dh_installcron -i -a
+       dh_installinfo -i -a
+       dh_installchangelogs $(HISTORY) -i -a
+       dh_movefiles --sourcedir=debian/util-linux -i -a
+       #
+       # XXX - push things to where debian has always(?) had them...
+       mv debian/util-linux/usr/sbin/*part* debian/util-linux/usr/bin
+       mv debian/util-linux/usr/bin/tailf debian/util-linux/bin
+       mv debian/util-linux/usr/bin/isosize debian/util-linux/sbin
+       mv debian/util-linux/usr/bin/cytune debian/util-linux/usr/sbin
+       rm -f debian/bsdutils/usr/bin/look debian/bsdutils/usr/share/man/man1/look.1
+       #
+       #
+       mv debian/util-linux/usr/share/getopt/* debian/util-linux/usr/share/doc/util-linux/examples
+       rmdir  debian/util-linux/usr/share/getopt
+       install -m 644 debian/lintian-override debian/util-linux/usr/share/lintian/overrides/util-linux
+       install -m 644 debian/mime.util-linux debian/util-linux/usr/lib/mime/packages/util-linux
+       if [ -f debian/util-linux/sbin/hwclock ] ; then \
+           install -m 755 debian/hwclock.sh debian/util-linux/etc/init.d/hwclock.sh; \
+       fi
+ifneq ($(DISTRO),Debian)
+       if [ -f debian/util-linux/sbin/hwclock ] ; then \
+           install -m 755 debian/hwclock.udev debian/util-linux/lib/udev/set_hwclock && \
+           install -m 644 debian/hwclock.rules debian/util-linux/etc/udev/rules.d/85-hwclock.rules; \
+       fi
+endif
+       ln debian/util-linux/sbin/*fdisk debian/fdisk-udeb/usr/sbin
+       mv debian/fdisk-udeb/usr/sbin/cfdisk debian/cfdisk-udeb/usr/sbin
+       cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-USBINFILES:= $(USBINFILES) sys-utils/{tunelp,cytune}
-MAN8FILES := $(MAN8FILES) sys-utils/{tunelp.8,cytune.8}
-endif
-endif
-ifeq ($(arch),$(sparc))
-SBINFILES := $(SBINFILES) fdisk/fdisk
-MAN8FILES := $(MAN8FILES) fdisk/fdisk.8
-DOCFILES  := $(DOCFILES) fdisk/README.fdisk
-endif
-ifeq ($(arch),$(rdev_arch))
-USBINFILES:= $(USBINFILES) sys-utils/rdev
-MAN8FILES := $(MAN8FILES) sys-utils/{rdev.8,vidmode.8} \
-               sys-utils/{ramsize.8,rootflags.8}
-endif
-
-install:
-
-binary-indep:  checkroot build binary-arch
-       $(checkdir)
-       # This assumes non-native, and only one hyphen in the version number.
-       dpkg-gencontrol -isp -putil-linux-locales -Pdebian/tmp-util-linux-locales -VUpstream=$$(sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog)
-       dpkg --build debian/tmp-util-linux-locales ..
-
-binary-arch:   checkroot build $(INITFILES)
-       rm -rf debian/tmp*
-       install -d debian/tmp/{DEBIAN,bin,sbin,etc/init.d,usr/{bin,sbin,lib/mime/packages,share/{locale/{ca,cs,da,de,es,et,fi,fr,it,ja,nl,pt_BR,sl,sv,tr}/LC_MESSAGES,man/{man1,man8},info,$(PACKAGE),doc/$(PACKAGE)/examples,lintian/overrides}}}
-
-       install -s $(BINFILES)  debian/tmp/bin
-       install -s $(SBINFILES) debian/tmp/sbin
-       install -s $(UBINFILES) debian/tmp/usr/bin
-       install    $(UBINFILES2) debian/tmp/usr/bin
-ifneq ($(USBINFILES),)
-       install -s $(USBINFILES) debian/tmp/usr/sbin
-ifeq ($(arch),$(rdev_arch))
-       ln -s rdev debian/tmp/usr/sbin/ramsize
-       ln -s rdev debian/tmp/usr/sbin/vidmode
-       ln -s rdev debian/tmp/usr/sbin/rootflags
-endif
-endif
-ifneq ($(INITFILES),)
-       install -m 755 $(INITFILES) debian/tmp/etc/init.d
-endif
-       install -m 644 $(MAN1FILES) debian/tmp/usr/share/man/man1
-       install -m 644 $(MAN8FILES) debian/tmp/usr/share/man/man8
-       install -m 644 $(INFOFILES) debian/tmp/usr/share/info
-       install -m 644 debian/lintian-override debian/tmp/usr/share/lintian/overrides/$(PACKAGE)
-       cd po && make install DESTDIR=../debian/tmp
-ifneq ($(DOCFILES),)
-       install -m 644 $(DOCFILES)  debian/tmp/usr/share/doc/$(PACKAGE)
-endif
-       install -m 644 $(EXAMPLES)  debian/tmp/usr/share/doc/$(PACKAGE)/examples
 ifeq ($(arch),$(findstring $(arch),powerpc ppc64))
-       mv -f debian/tmp/sbin/fdisk debian/tmp/sbin/ddisk
-       mv -f debian/tmp/usr/share/man/man8/fdisk.8 debian/tmp/usr/share/man/man8/ddisk.8
-endif
-ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
-       (cd debian/tmp/sbin ; mv mkswap mkswap.linux)
-       (cd debian/tmp/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8)
-endif
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-       (cd debian/tmp/sbin ; mv agetty getty)
-       (cd debian/tmp/usr/share/man/man8 ; mv agetty.8 getty.8)
-ifneq ($(arch), $(nohwclock))
-ifneq ($(arch),$(findstring $(arch),powerpc ppc64))
-       (cd debian/tmp/usr/share/man/man8 && ln -s hwclock.8.gz clock.8.gz)
-endif
-endif
-       (cd debian/tmp/usr/share/doc/$(PACKAGE) ; mv README.modems-with-agetty README.modems-with-getty )
-       perl -pi.bak -e 's/agetty/getty/g' debian/tmp/usr/share/man/man8/getty.8 \
-       debian/tmp/usr/share/doc/$(PACKAGE)/README.getty \
-       debian/tmp/usr/share/doc/$(PACKAGE)/README.modems-with-getty
-       rm `find debian/tmp/usr -name \*.bak`
-endif
-       install -m 644 debian/changelog \
-         debian/tmp/usr/share/doc/$(PACKAGE)/changelog.Debian
-       install -m 644 $(HISTORY) debian/tmp/usr/share/doc/$(PACKAGE)/changelog
-       find debian/tmp/usr/share/{info,doc,man} -type f | xargs gzip -9
-       install -m 644 debian/mime.$(PACKAGE) debian/tmp/usr/lib/mime/packages/$(PACKAGE)
-       install -m 644 debian/copyright debian/tmp/usr/share/doc/$(PACKAGE)/copyright
-       install -m 644 AUTHORS debian/tmp/usr/share/doc/$(PACKAGE)/AUTHORS
-       install debian/{preinst,postinst,prerm,postrm} debian/tmp/DEBIAN/
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-ifneq ($(arch),$(nohwclock))
-       install -m 644 debian/conffiles debian/tmp/DEBIAN/
-
-ifneq ($(DISTRO),Debian)
-       install -d -m 755 debian/tmp/lib/udev
-       install -m 755 debian/hwclock.udev debian/tmp/lib/udev/set_hwclock
-
-       install -d -m 755 debian/tmp/etc/udev/rules.d
-       install -m 644 debian/hwclock.rules debian/tmp/etc/udev/rules.d/85-hwclock.rules
-endif
-endif
-endif
-       ls debian/tmp/{bin,sbin,usr/{bin,sbin}}/* | xargs dpkg-shlibdeps -putil-linux
-       install -d debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales
-       install -d debian/tmp-util-linux-locales/DEBIAN
-       install -m 755 debian/util-linux-locales.postinst debian/tmp-util-linux-locales/DEBIAN/postinst
-       install -m 755 debian/util-linux-locales.prerm debian/tmp-util-linux-locales/DEBIAN/prerm
-       mv debian/tmp/usr/share/locale debian/tmp-util-linux-locales/usr/share/
-       install -m 644 $(HISTORY) debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales/changelog
-       install -m 644 debian/changelog debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales/changelog.Debian
-       find debian/tmp-util-linux-locales/usr/share/doc -type f | xargs gzip -9
-       install -m 644 debian/copyright debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales/copyright
-       dpkg-gencontrol -isp -putil-linux -Vutil-linux:Conflicts="$(util-linux_Conflicts)"
-       dpkg --build debian/tmp ..
-
-ifeq ($(arch),$(fdisk_arch))
-# Do the udeb
-       install -d debian/tmp-{c,}fdisk-udeb/usr/sbin
-       install -d debian/tmp-{c,}fdisk-udeb/DEBIAN
-       install -m 755 fdisk/cfdisk debian/tmp-cfdisk-udeb/usr/sbin
-       install -m 755 fdisk/fdisk fdisk/sfdisk debian/tmp-fdisk-udeb/usr/sbin
-       strip --remove-section=.comment --remove-section=.note \
-                       debian/tmp-{c,}fdisk-udeb/usr/sbin/*
-
-       # Generate a po translations needed for cfdisk
-       mkdir $(CFDISK_PO_DIR)
-       xgettext --default-domain=util-linux -C --keyword=_ --keyword=N_ -o $(CFDISK_POT) fdisk/*.c
-       for po in po/*.po ; do  \
-               LANG=`basename $$po | cut -f1 -d.` ; \
-               msgmerge $$po $(CFDISK_POT)  > $(CFDISK_PO_DIR)/$$LANG.po ; \
-               msgfmt $(CFDISK_PO_DIR)/$$LANG.po -o $(CFDISK_PO_DIR)/$$LANG.gmo ; \
-               mkdir -p debian/tmp-cfdisk-udeb/usr/share/locale/$$LANG/LC_MESSAGES ; \
-               cp $(CFDISK_PO_DIR)/$$LANG.gmo debian/tmp-cfdisk-udeb/usr/share/locale/$$LANG/LC_MESSAGES/util-linux.mo ; \
-       done
-
-       ls debian/tmp-fdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pfdisk-udeb -tudeb
-       dpkg-gencontrol -isp -pfdisk-udeb -Pdebian/tmp-fdisk-udeb -fdebian/files~
-       dpkg-distaddfile fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb debian-installer extra
-       dpkg --build debian/tmp-fdisk-udeb ../fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb
-
-       ls debian/tmp-cfdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pcfdisk-udeb -tudeb
-       dpkg-gencontrol -isp -pcfdisk-udeb -Pdebian/tmp-cfdisk-udeb -fdebian/files~
-       dpkg-distaddfile cfdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb debian-installer extra
-       dpkg --build debian/tmp-cfdisk-udeb ../cfdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb
-endif
-ifeq ($(arch),$(sparc))
-# Do the udeb
-       install -d debian/tmp-fdisk-udeb/usr/sbin
-       install -d debian/tmp-fdisk-udeb/DEBIAN
-       install -m 755 fdisk/fdisk debian/tmp-fdisk-udeb/usr/sbin
-       strip --remove-section=.comment --remove-section=.note \
-                       debian/tmp-fdisk-udeb/usr/sbin/*
-
-       ls debian/tmp-fdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pfdisk-udeb
-       dpkg-gencontrol -isp -pfdisk-udeb -Pdebian/tmp-fdisk-udeb -fdebian/files~
-       dpkg-distaddfile fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb debian-installer extra
-       dpkg --build debian/tmp-fdisk-udeb ../fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb
+       mv -f debian/util-linux/sbin/fdisk debian/util-linux/sbin/ddisk
+       mv -f debian/util-linux/usr/share/man/man8/fdisk.8 debian/util-linux/usr/share/man/man8/ddisk.8
+else
+       (cd debian/util-linux && if [ -f sbin/hwclock ] ; then ln -sf hwclock.8.gz usr/share/man/man8/clock.8.gz; fi)
 endif
-
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-       # Mount
-       install -d debian/tmp-mount/{DEBIAN,bin,sbin,usr/share/{man/{man8,man5},doc/mount/examples}}
-       install -m 4755 -o root -s $(MOUNTBINFILES) debian/tmp-mount/bin/.
-       install -m 755 -s $(MOUNTSBINFILES) debian/tmp-mount/sbin/.
-       install -m 644 $(MOUNTMAN8FILES) debian/tmp-mount/usr/share/man/man8
-       install -m 644 $(MOUNTMAN5FILES) debian/tmp-mount/usr/share/man/man5
-       install -m 644 $(MOUNTDOCFILES) debian/tmp-mount/usr/share/doc/mount
-       (cd debian/tmp-mount/sbin ; ln -s swapon swapoff)
-       install -m 644 debian/mount.fstab \
-         debian/tmp-mount/usr/share/doc/mount/examples/fstab
-       install -m 644 debian/changelog \
-         debian/tmp-mount/usr/share/doc/mount/changelog.Debian
-       install -m 644 debian/changelog.Debian-mount.old \
-         debian/tmp-mount/usr/share/doc/mount/changelog.Debian-mount.old
-       install -m 644 $(HISTORY) debian/tmp-mount/usr/share/doc/mount/changelog
-       find debian/tmp-mount/usr/share/{doc,man} -type f | xargs gzip -9
-       install -m 644 debian/copyright debian/tmp-mount/usr/share/doc/mount/copyright
-       install debian/mount.preinst   debian/tmp-mount/DEBIAN/preinst
-       install debian/mount.prerm   debian/tmp-mount/DEBIAN/prerm
-       install debian/mount.postinst debian/tmp-mount/DEBIAN/postinst
-       ls debian/tmp-mount/{bin,sbin}/* | xargs dpkg-shlibdeps -pmount
-       dpkg-gencontrol -isp -pmount -Pdebian/tmp-mount
-       dpkg --build debian/tmp-mount ..
+       (cd debian/util-linux/sbin ; mv agetty getty)
+       (cd debian/util-linux/usr/share/man/man8 ; mv agetty.8 getty.8)
+       install -m 644 debian/mount.fstab debian/mount/usr/share/doc/mount/examples/fstab
 endif
-
-       # Bsdutils
-       install -d debian/tmp-bsd/{DEBIAN,bin,usr/{bin,share/man/{man8,man1},share/doc/bsdutils}}
-       # install -m 755 -o root -s $(BSDBINFILES) debian/tmp-bsd/bin/.
-       install -m 755 -s $(BSDUBINFILES) debian/tmp-bsd/usr/bin/.
-       install -m 755 $(BSDUBINSCRIPT) debian/tmp-bsd/usr/bin/.
-ifneq ($(BSDMAN8FILES),)
-       install -m 644 $(BSDMAN8FILES) debian/tmp-bsd/usr/share/man/man8
-       mv debian/tmp-bsd/usr/share/man/man8/renice.8 debian/tmp-bsd/usr/share/man/man1/renice.1
+ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
+       (cd debian/util-linux/sbin ; mv mkswap mkswap.linux)
+       (cd debian/util-linux/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8)
+endif
+       dh_compress -i -a
+       dh_fixperms -i -a -Xusr/bin/wall -Xbin/mount -Xbin/umount
+       rm -rf debian/*-udeb/usr/share/doc
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+       dh_testdir -i
+       dh_testroot -i
+       dh_link -i
+       dh_installdeb -i
+       #for i in $$(sed -n '/^Package:/s/^.* //p' debian/control); do cat debian/vars.in >> debian/$$i.substvars; done
+       #cat debian/vars.in >> debian/substvars
+       dh_gencontrol -i -- -VUpstream=$(Upstream)
+       dh_md5sums -i
+       dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+       dh_testdir -a
+       dh_testroot -a
+       dh_installinit -a -- defaults 15 85
+       dh_link -a
+       dh_strip -a
+       dh_makeshlibs -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       #for i in $$(sed -n '/^Package:/s/^.* //p' debian/control); do cat debian/vars.in >> debian/$$i.substvars; done
+       #cat debian/vars.in >> debian/substvars
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+       echo util-linux:Conflicts=getty >> debian/util-linux.substvars
 endif
-       install -m 644 $(BSDMAN1FILES) debian/tmp-bsd/usr/share/man/man1
-       install -m 644 $(BSDDOCFILES) debian/tmp-bsd/usr/share/doc/bsdutils
-       chown root:tty debian/tmp-bsd/usr/bin/wall
-       chmod g+s debian/tmp-bsd/usr/bin/wall
-       install -m 644 debian/changelog \
-         debian/tmp-bsd/usr/share/doc/bsdutils/changelog.Debian
-       install -m 644 $(HISTORY) debian/tmp-bsd/usr/share/doc/bsdutils/changelog
-       find debian/tmp-bsd/usr/share/{doc,man} -type f | xargs gzip -9
-       install -m 644 debian/copyright debian/tmp-bsd/usr/share/doc/bsdutils/copyright
-       install debian/bsdutils.postinst debian/tmp-bsd/DEBIAN/postinst
-       install debian/bsdutils.prerm   debian/tmp-bsd/DEBIAN/prerm
-       ls debian/tmp-bsd/usr/bin/* | xargs dpkg-shlibdeps -pbsdutils
-       dpkg-gencontrol -isp -pbsdutils -Pdebian/tmp-bsd -v1:$(version)
-       dpkg --build debian/tmp-bsd ..
-
-define checkdir
-       test -f fdisk/fdisk.c -a -f debian/rules
-endef
-
-binary:                binary-indep binary-arch
-
-source diff:
-       @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-checkroot:
-       $(checkdir)
-       test root = "`whoami`"
+       dh_gencontrol -a -Xbsdutils
+       dh_gencontrol -pbsdutils -u-v1:$(version)
+       dh_md5sums -a
+       rm -f debian/*-udeb/DEBIAN/md5sums
+       dh_builddeb -a
 
-.PHONY: binary binary-arch binary-indep clean checkroot
 
-# Local Variables:
-# mode:Makefile
-# End:
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/util-linux-locales.dirs b/debian/util-linux-locales.dirs
new file mode 100644 (file)
index 0000000..5677832
--- /dev/null
@@ -0,0 +1,43 @@
+usr/
+usr/share/
+usr/share/doc/
+usr/share/doc/util-linux-locales/
+usr/share/locale/
+usr/share/locale/ca/
+usr/share/locale/ca/LC_MESSAGES/
+usr/share/locale/cs/
+usr/share/locale/cs/LC_MESSAGES/
+usr/share/locale/da/
+usr/share/locale/da/LC_MESSAGES/
+usr/share/locale/de/
+usr/share/locale/de/LC_MESSAGES/
+usr/share/locale/es/
+usr/share/locale/es/LC_MESSAGES/
+usr/share/locale/et/
+usr/share/locale/et/LC_MESSAGES/
+usr/share/locale/fi/
+usr/share/locale/fi/LC_MESSAGES/
+usr/share/locale/fr/
+usr/share/locale/fr/LC_MESSAGES/
+usr/share/locale/it/
+usr/share/locale/it/LC_MESSAGES/
+usr/share/locale/ja/
+usr/share/locale/ja/LC_MESSAGES/
+usr/share/locale/nl/
+usr/share/locale/nl/LC_MESSAGES/
+usr/share/locale/pt_BR/
+usr/share/locale/pt_BR/LC_MESSAGES/
+usr/share/locale/sl/
+usr/share/locale/sl/LC_MESSAGES/
+usr/share/locale/sv/
+usr/share/locale/sv/LC_MESSAGES/
+usr/share/locale/tr/
+usr/share/locale/tr/LC_MESSAGES/
+usr/share/locale/id/
+usr/share/locale/id/LC_MESSAGES/
+usr/share/locale/ru/
+usr/share/locale/ru/LC_MESSAGES/
+usr/share/locale/uk/
+usr/share/locale/uk/LC_MESSAGES/
+usr/share/locale/vi/
+usr/share/locale/vi/LC_MESSAGES/
diff --git a/debian/util-linux-locales.files b/debian/util-linux-locales.files
new file mode 100644 (file)
index 0000000..af062df
--- /dev/null
@@ -0,0 +1,19 @@
+usr/share/locale/ca/LC_MESSAGES/util-linux.mo
+usr/share/locale/cs/LC_MESSAGES/util-linux.mo
+usr/share/locale/da/LC_MESSAGES/util-linux.mo
+usr/share/locale/de/LC_MESSAGES/util-linux.mo
+usr/share/locale/es/LC_MESSAGES/util-linux.mo
+usr/share/locale/et/LC_MESSAGES/util-linux.mo
+usr/share/locale/fi/LC_MESSAGES/util-linux.mo
+usr/share/locale/fr/LC_MESSAGES/util-linux.mo
+usr/share/locale/it/LC_MESSAGES/util-linux.mo
+usr/share/locale/ja/LC_MESSAGES/util-linux.mo
+usr/share/locale/nl/LC_MESSAGES/util-linux.mo
+usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo
+usr/share/locale/sl/LC_MESSAGES/util-linux.mo
+usr/share/locale/sv/LC_MESSAGES/util-linux.mo
+usr/share/locale/tr/LC_MESSAGES/util-linux.mo
+usr/share/locale/id/LC_MESSAGES/util-linux.mo
+usr/share/locale/ru/LC_MESSAGES/util-linux.mo
+usr/share/locale/uk/LC_MESSAGES/util-linux.mo
+usr/share/locale/vi/LC_MESSAGES/util-linux.mo
index 802aa39c767fd6ea131a84357a722ac192efb27b..62f75dc7320de444790cfcc158978a7ff1bafdb0 100644 (file)
@@ -3,3 +3,5 @@
 if [ -L /usr/doc/util-linux-locales ] ; then
     rm -f /usr/doc/util-linux-locales
 fi
+
+#DEBHELPER#
index 1f1b756a2bb76aed8b2829509d03e26a15c50707..d148debdec1c28fa557afd1719791a5f2a8e0f25 100644 (file)
@@ -12,3 +12,5 @@ case "$1" in
                ;;
 esac
 
+
+#DEBHELPER#
diff --git a/debian/util-linux.dirs b/debian/util-linux.dirs
new file mode 100644 (file)
index 0000000..5d17f14
--- /dev/null
@@ -0,0 +1,25 @@
+bin/
+sbin/
+etc/
+etc/init.d/
+etc/udev/
+etc/udev/rules.d/
+usr/
+usr/bin/
+usr/sbin/
+usr/lib/
+usr/lib/mime/
+usr/lib/mime/packages/
+usr/share/
+usr/share/man/
+usr/share/man/man1/
+usr/share/man/man8/
+usr/share/info/
+usr/share/util-linux/
+usr/share/doc/
+usr/share/doc/util-linux/
+usr/share/doc/util-linux/examples/
+usr/share/lintian/
+usr/share/lintian/overrides/
+lib/
+lib/udev/
diff --git a/debian/util-linux.docs b/debian/util-linux.docs
new file mode 100644 (file)
index 0000000..1f442b8
--- /dev/null
@@ -0,0 +1,6 @@
+login-utils/README.getty
+login-utils/README.poeigl
+debian/README.Debian.hwclock
+fdisk/README.cfdisk
+fdisk/README.fdisk
+AUTHORS
diff --git a/debian/util-linux.examples b/debian/util-linux.examples
new file mode 100644 (file)
index 0000000..8a6aea2
--- /dev/null
@@ -0,0 +1,2 @@
+fdisk/sfdisk.examples
+debian/fstab.example2