record all those nice NMUs

diff --git a/debian/changelog b/debian/changelog
index 2e8900a02d417a7e751cf39f4c84522bd1b3bac3..6c4423aa5c9f8cdf64a7af88798678cb52868291 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+util-linux (2.17.2-3.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Report correct disk size on GNU/kFreeBSD.  Thanks Tuco.
+    (Closes: #592292)
+
+ -- Robert Millan <rmh@debian.org>  Wed, 29 Sep 2010 09:18:08 +0200
+
+util-linux (2.17.2-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Revert the switch from slang2 to ncurses5.  There is no udeb for ncurses,
+    so that change broke cfdisk-udeb (closes: #593374, reopens: #581631).
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 23 Sep 2010 21:12:33 +0200
+
+util-linux (2.17.2-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Apply trivial patch by Adam D. Barratt (thanks!): Only attempt to link
+    locale-specific files in to the cfdisk-udeb hierarchy if cfdisk-udeb
+    is actually being built.  Closes: #581725
+  * Set urgency to “high” since some packages are waiting for util-linux.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 20 Jun 2010 16:03:46 +0200
+
 util-linux (2.17.2-3) unstable; urgency=low
 
   [LaMont Jones]

diff --git a/debian/control b/debian/control
index e7f23d371e70d99d8030777a33fc534112a58c5c..e915394f49accc04b315190d8a6c53022c264547 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: util-linux
-Build-Depends: libncurses5-dev, libncurses5, gettext, zlib1g-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release, pkg-config
+Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release, pkg-config
 Section: base
 Priority: required
 Uploaders: Scott James Remnant <scott@ubuntu.com>

diff --git a/debian/rules b/debian/rules
index f947f0614aaf124f6a5fa60065cdb5885c900e87..c164ab731bd9d973d4bf75eb9ad22c2f56d88d7f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ 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
+CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 CONFOPTS += --with-selinux
 endif
@@ -137,7 +137,9 @@ endif
            ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
            S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \
        fi
-       cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done
+       if [ -d debian/cfdisk-udeb ]; then \
+               cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done \
+       fi
 ifeq ($(DEB_HOST_ARCH_OS),linux)
        install -m 644 debian/mount.fstab debian/mount/usr/share/doc/mount/examples/fstab
 ifeq ($(arch),$(findstring $(arch),powerpc ppc64))

diff --git a/lib/blkdev.c b/lib/blkdev.c
index 1ca4548bb8488cc2353d5bf07ed9cbd974de8577..0ff9ce3241875de7a941afd65cea0b1e8c33635c 100644 (file)
--- a/lib/blkdev.c
+++ b/lib/blkdev.c
@@ -3,6 +3,10 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#ifdef __FreeBSD_kernel__
+#include <sys/disk.h>
+#endif
+
 #include "blkdev.h"
 #include "linux_version.h"
 
@@ -67,6 +71,17 @@ blkdev_get_size(int fd, unsigned long long *bytes)
        return -1;
 #endif /* BLKGETSIZE */
 
+#ifdef __FreeBSD_kernel__
+       {
+               off_t size;
+
+               if (ioctl(fd, DIOCGMEDIASIZE, &size) >= 0) {
+                       *bytes = size;
+                       return 0;
+               }
+       }
+#endif
+
        *bytes = blkdev_find_size(fd);
        return 0;
 }