From: LaMont Jones <lamont@mmjgroup.com>
Date: Sat, 25 Aug 2007 06:20:08 +0000 (-0600)
Subject: build: finish replacing linux32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=246369eee597753fbdaa02f36a5caee9d2e0ac39;p=util-linux

build: finish replacing linux32

- put the man pages where it thinks they belong
- util-linux now Conflicts/Provides: linux32
---

diff --git a/debian/changelog b/debian/changelog
index a8939321..91c0be8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ util-linux (2.13~rc3-7) unstable; urgency=low
   * 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.
+    Replaces: bsdmainutils and completely Replaces: linux32.
 
  -- LaMont Jones <lamont@debian.org>  Fri, 24 Aug 2007 23:27:19 -0600
 
diff --git a/debian/control b/debian/control
index 06d4909c..d6820aaa 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ 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), ${util-linux:Conflicts}
-Provides: schedutils
+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
diff --git a/debian/control.in b/debian/control.in
index 06d4909c..d6820aaa 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,8 +14,8 @@ 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), ${util-linux:Conflicts}
-Provides: schedutils
+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
diff --git a/debian/rules b/debian/rules
index b2440b59..451e7419 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,6 +84,9 @@ endif
 	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
+	mv debian/util-linux/usr/share/man/man8/linux32.8 debian/util-linux/usr/share/man/man1/linux32.1
+	mv debian/util-linux/usr/share/man/man8/linux64.8 debian/util-linux/usr/share/man/man1/linux64.1
+	# the version in bsdmainutils seems newer.
 	rm -f debian/bsdutils/usr/bin/look debian/bsdutils/usr/share/man/man1/look.1
 	#
 	#