From 6b08959e3c047ea4337c4bdb5618ca6971c13655 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Sat, 25 Aug 2007 21:38:50 -0600 Subject: [PATCH] build: switch back to libblkid-dev for Debian. Closes: #439617 --- debian/control | 3 +- debian/control.in | 79 ----------------------------------------------- debian/rules | 14 +++------ 3 files changed, 6 insertions(+), 90 deletions(-) delete mode 100644 debian/control.in diff --git a/debian/control b/debian/control index d6820aaa..6528a715 100644 --- a/debian/control +++ b/debian/control @@ -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], debhelper (>=5) +Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libblkid-dev, uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5) Maintainer: LaMont Jones Standards-Version: 3.7.2.0 @@ -41,7 +41,6 @@ Essential: yes Section: admin 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 mount(8), umount(8), swapon(8), swapoff(8), and losetup(8) commands. diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index d6820aaa..00000000 --- a/debian/control.in +++ /dev/null @@ -1,79 +0,0 @@ -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], debhelper (>=5) -Maintainer: LaMont Jones -Standards-Version: 3.7.2.0 - -Package: util-linux -Architecture: any -Section: utils -Priority: required -Essential: yes -Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2) -Pre-Depends: ${shlibs:Depends} -Suggests: util-linux-locales, kbd | console-tools, dosfstools -Replaces: schedutils, miscutils, setterm, fdisk, linux32, ${util-linux:Conflicts} -Conflicts: schedutils, setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), linux32, ${util-linux:Conflicts} -Provides: schedutils, linux32 -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. - -Package: util-linux-locales -Architecture: all -Section: utils -Priority: optional -Depends: util-linux (>= ${Upstream}-0), util-linux (<< ${Upstream}.0-0) -Replaces: util-linux (<< 2.11b) -Description: Locales files for util-linux - This package contains the internationalization files of for the util-linux - package. - . - They are needed when you want the programs in util-linux to print their - messages in other languages than English. - -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: ${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 mount(8), umount(8), swapon(8), - swapoff(8), and losetup(8) commands. - -Package: bsdutils -Architecture: any -Essential: yes -Section: utils -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. - . - 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: ${shlibs:Depends} -XC-Package-Type: udeb -Description: Partition a hard drive (manual) - fdisk package - -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: ${shlibs:Depends} -XC-Package-Type: udeb -Description: Partition a hard drive (cfdisk) - Cfdisk package diff --git a/debian/rules b/debian/rules index 451e7419..ab26ebb1 100755 --- a/debian/rules +++ b/debian/rules @@ -20,12 +20,13 @@ export arch = $(DEB_HOST_ARCH) version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog) Upstream := $(shell sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog) -CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-fsprobe=volume_id --with-slang +CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang ifeq ($(DEB_HOST_ARCH_OS),linux) CONFOPTS += --with-selinux endif - -HISTORY=docs/v2.13-ReleaseNotes +ifneq($(DISTRO),Debian) +CONFOPTS += --with-fsprobe=volume_id +endif configure: configure-stamp configure-stamp: @@ -53,11 +54,6 @@ clean-preunpatch: 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 install: build dh_testdir @@ -76,7 +72,7 @@ endif dh_installmenu -i -a dh_installcron -i -a dh_installinfo -i -a - dh_installchangelogs $(HISTORY) -i -a + dh_installchangelogs docs/v*-ReleaseNotes -i -a dh_movefiles --sourcedir=debian/util-linux -i -a # # XXX - push things to where debian has always(?) had them... -- 2.39.5