finish merge from ubuntu-v2.13 to master, release

build: merge ubuntu and debian trees, do the right thing at build time
And yes, udev versions differ, so ubuntu's build-depends are a tad broken.  bummer.

control: Depend, not Pre-Depend.  Transition to libc5 is _LONG_ over.

diff --git a/debian/changelog b/debian/changelog
index c4c29644cafcbf79a86d8b00f4f8a87f211efc9a..d60a397908ee834e6ab93ebce2918c64310252a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,4 @@
-util-linux (2.13~rc3-4ubuntu1) gutsy-UNRELEASED; urgency=low
-
-  * Merge from Debian. (LP: #131367)
-  * Remaining Ubuntu changes:
-    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
-      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
-      + debian/rules: Install those.
-
- -- LaMont Jones <lamont@ubuntu.com>  Thu,  9 Aug 2007 15:59:41 -0600
-
-util-linux (2.13~rc3-4) unstable-UNRELEASED; urgency=low
+util-linux (2.13~rc3-4) unstable; urgency=low
 
   * Changes from upstream:
     - po: gettextizing some overlooked messages.
@@ -19,12 +9,15 @@ util-linux (2.13~rc3-4) unstable-UNRELEASED; urgency=low
     - more: fix underlining for multibyte chars
     - login: replace /usr/spool/mail with /var/spool/main in man page
   * mount: make the error message a little more clear when a helper
-    program is missing.
+    program is missing.  (LP #131367)
   * manpages: cleanup of chrt.1 and taskset.1.  Closes: #427267, #265479
   * hwclock.sh: only report hwclock updated if we did that.  Closes: #436873
   * update copyright to reflect README.licensing
+  * Merge ubuntu changes, do the right thing at build time.
+  * Go back to Depends: for the various packages, since the switch to libc5 is
+    long, long over.
 
- -- LaMont Jones <lamont@debian.org>  Tue, 14 Aug 2007 12:22:34 -0600
+ -- LaMont Jones <lamont@debian.org>  Tue, 14 Aug 2007 14:01:11 -0600
 
 util-linux (2.13~rc3-3) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 2430b796c5603397381cd12158273abe913b7ac7..c20f5b44024d521e1e6f769539358b51bd51a051 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,13 @@
 Source: util-linux
 Section: base
 Priority: required
-Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>= 113), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: LaMont Jones <lamont@debian.org>
+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]
+Maintainer: LaMont Jones <lamont@debian.org>
 Standards-Version: 3.7.2.0
 
 Package: util-linux
 Architecture: any
-Pre-Depends: ${util-linux:Depends}
+Depends: ${util-linux:Depends}
 Section: utils
 Priority: required
 Essential: yes
@@ -40,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
-Pre-Depends: ${mount:Depends}
+Depends: ${mount:Depends}
 Suggests: nfs-common (>=1:1.1.0-7)
 Description: Tools for mounting and manipulating filesystems
  This package provides the mount(8), umount(8), swapon(8),
@@ -50,7 +49,7 @@ Package: bsdutils
 Architecture: any
 Essential: yes
 Section: utils
-Pre-Depends: ${bsdutils:Depends}
+Depends: ${bsdutils:Depends}
 Recommends: bsdmainutils
 Description: Basic utilities from 4.4BSD-Lite
  This package contains the bare minimum number of BSD utilities needed

diff --git a/debian/rules b/debian/rules
index 532bcd5378e0f9b1c74d290ebf66011e8963559b..c59c91898e93e0836bf280fe516735ca10582478 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 SHELL = bash
 PACKAGE = util-linux
 
+DISTRO=$(shell lsb_release -is 2>/dev/null || echo Debian);
+
 ifndef DEB_HOST_ARCH
 DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture)
 DEB_HOST_ARCH = $(DEB_BUILD_ARCH)
@@ -230,12 +232,14 @@ 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