Updated debian directory with debian 2.26 package

7c21dd3e · nextime · b3b8d21a · 7c21dd3e · 7c21dd3e · 7c21dd3e
Commit 7c21dd3e authored May 25, 2015 by nextime
11 changed files
--- a/debian/clean
+++ b/debian/clean
 po/*.gmo
+po/stamp-po
--- a/debian/control
+++ b/debian/control
@@ -29,10 +29,20 @@ Architecture: any
 Section: utils
 Essential: yes
 Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends}
-Depends: initscripts, lsb-base (>= 3.0-6), tzdata (>=2006c-2), ${misc:Depends}
+Depends: initscripts (>= 2.88dsf-59.2~), lsb-base (>= 3.0-6), tzdata (>=2006c-2), ${misc:Depends}
+# conceptually a Breaks:, but confuses apt (#786469)
+ , sysvinit-utils (>> 2.88dsf-59.1~)
 Suggests: dosfstools, kbd | console-tools, util-linux-locales
-Replaces: bash-completion (<< 1:2.1-3)
-Breaks: bash-completion (<< 1:2.1-3)
+Replaces: bash-completion (<< 1:2.1-4.1~),
+          sysvinit-utils (<< 2.88dsf-59.1~),
+          initscripts (<< 2.88dsf-59.2~),
+          mount (= 2.26.2-3),
+          mount (= 2.26.2-3ubuntu1)
+Breaks: bash-completion (<< 1:2.1-4.1~),
+          grml-debootstrap (<< 0.68),
+          cloud-utils (<< 0.27-1~),
+          mount (= 2.26.2-3),
+          mount (= 2.26.2-3ubuntu1)
 Multi-Arch: foreign
 Description: Miscellaneous system utilities
 This package contains a number of important utilities, most of which
@@ -72,6 +82,8 @@ Section: utils
 Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends}
 Depends: ${misc:Depends}
 Recommends: bsdmainutils
+Replaces: bash-completion (<< 1:2.1-4.1~)
+Breaks: bash-completion (<< 1:2.1-4.1~)
 Multi-Arch: foreign
 Description: basic utilities from 4.4BSD-Lite
 This package contains the bare minimum of BSD utilities needed for a
@@ -143,6 +155,45 @@ Description: block device id library - headers and static libraries
 .
 This package contains the development environment for the blkid library.

+Package: libfdisk1
+Architecture: any
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
+Description: fdisk partitioning library
+ The libfdisk library is used for manipulating with partition tables.
+ The library is the core of the fdisk, cfdisk and sfdisk tools.
+
+Package: libfdisk1-udeb
+Architecture: any
+Section: debian-installer
+Priority: optional
+Depends: ${misc:Depends}, ${shlibs:Depends}
+XC-Package-Type: udeb
+Description: stripped down fdisk partitioning library, for debian-installer
+ The libfdisk library is used for manipulating with partition tables.
+ The library is the core of the fdisk, cfdisk and sfdisk tools.
+ .
+ This is a minimal package for debian-installer.
+
+Package: libfdisk-dev
+Architecture: any
+Section: libdevel
+Priority: optional
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libfdisk1 (= ${binary:Version}),
+         libc6-dev | libc-dev,
+         libblkid-dev,
+         uuid-dev,
+         ${misc:Depends}
+Multi-Arch: same
+Description: fdisk partitioning library - headers and static libraries
+ The libfdisk library is used for manipulating with partition tables.
+ The library is the core of the fdisk, cfdisk and sfdisk tools.
+ .
+ This package contains the development environment for the fdisk library.
+
 Package: libmount1
 Architecture: any
 Section: libs

--- a/debian/gbp.conf
+++ b/debian/gbp.conf
 [DEFAULT]
-debian-branch = debian-2.25
-upstream-branch = upstream/2.25
+debian-branch = debian-2.26
+upstream-branch = upstream/2.26
 pristine-tar = True
 compression = xz
 sign-tags = True

--- a/debian/libblkid-dev.maintscript
+++ b/debian/libblkid-dev.maintscript
-symlink_to_dir /usr/share/doc/libblkid-dev /usr/share/doc/libblkid 2.25.2-4
+symlink_to_dir /usr/share/doc/libblkid-dev /usr/share/doc/libblkid1 2.25.2-5~
--- a/debian/libmount1.shlibs
+++ b/debian/libmount1.shlibs
-libmount 1 libmount1 (>= 2.25)
-udeb: libmount 1 libmount1-udeb (>= 2.25)
+libmount 1 libmount1 (>= 2.26)
+udeb: libmount 1 libmount1-udeb (>= 2.26)
--- a/debian/libmount1.symbols
+++ b/debian/libmount1.symbols
@@ -6,6 +6,7 @@ libmount.so.1 libmount1 #MINVER#
 MOUNT_2.23@MOUNT_2.23 2.24.2
 MOUNT_2.24@MOUNT_2.24 2.24.2
 MOUNT_2.25@MOUNT_2.25 2.24.2
+ MOUNT_2.26@MOUNT_2.26 2.26.2
 mnt_cache_device_has_tag@MOUNT_2.19 2.19.1
 mnt_cache_find_tag_value@MOUNT_2.19 2.19.1
 mnt_cache_read_tags@MOUNT_2.19 2.19.1
@@ -180,11 +181,19 @@ libmount.so.1 libmount1 #MINVER#
 mnt_mangle@MOUNT_2.19 2.19.1
 mnt_match_fstype@MOUNT_2.19 2.19.1
 mnt_match_options@MOUNT_2.19 2.19.1
+ (arch=linux-any)mnt_monitor_close_fd@MOUNT_2.26 2.26.2
+ (arch=linux-any)mnt_monitor_enable_kernel@MOUNT_2.26 2.26.2
+ (arch=linux-any)mnt_monitor_enable_userspace@MOUNT_2.26 2.26.2
+ (arch=linux-any)mnt_monitor_event_cleanup@MOUNT_2.26 2.26.2
+ (arch=linux-any)mnt_monitor_get_fd@MOUNT_2.26 2.26.2
+ (arch=linux-any)mnt_monitor_next_change@MOUNT_2.26 2.26.2
+ (arch=linux-any)mnt_monitor_wait@MOUNT_2.26 2.26.2
 mnt_new_cache@MOUNT_2.19 2.19.1
 (arch=linux-any)mnt_new_context@MOUNT_2.19 2.19.1
 mnt_new_fs@MOUNT_2.19 2.19.1
 mnt_new_iter@MOUNT_2.19 2.19.1
 mnt_new_lock@MOUNT_2.19 2.19.1
+ (arch=linux-any)mnt_new_monitor@MOUNT_2.26 2.26.2
 mnt_new_tabdiff@MOUNT_2.20 2.20.1
 mnt_new_table@MOUNT_2.19 2.19.1
 mnt_new_table_from_dir@MOUNT_2.19 2.19.1
@@ -204,6 +213,7 @@ libmount.so.1 libmount1 #MINVER#
 mnt_pretty_path@MOUNT_2.20 2.20.1
 mnt_ref_cache@MOUNT_2.24 2.24.2
 mnt_ref_fs@MOUNT_2.24 2.24.2
+ (arch=linux-any)mnt_ref_monitor@MOUNT_2.26 2.26.2
 mnt_ref_table@MOUNT_2.24 2.24.2
 (arch=linux-any)mnt_reset_context@MOUNT_2.19 2.19.1
 mnt_reset_fs@MOUNT_2.19 2.19.1
@@ -261,6 +271,7 @@ libmount.so.1 libmount1 #MINVER#
 mnt_unmangle@MOUNT_2.19 2.19.1
 mnt_unref_cache@MOUNT_2.24 2.24.2
 mnt_unref_fs@MOUNT_2.24 2.24.2
+ (arch=linux-any)mnt_unref_monitor@MOUNT_2.26 2.26.2
 mnt_unref_table@MOUNT_2.24 2.24.2
 mnt_update_force_rdonly@MOUNT_2.19 2.19.1
 mnt_update_get_filename@MOUNT_2.19 2.19.1

--- a/debian/rules
+++ b/debian/rules
@@ -20,17 +20,22 @@ CONFOPTS += --localstatedir=/run
 CONFOPTS += --disable-silent-rules
 CONFOPTS += --without-python

+# never use /etc/mtab, it should be a link to /proc/mounts
+# but in case it isn't - just don't use it, go straight for
+# /proc/self/mountinfo or /proc/mounts.
+CONFOPTS += --enable-libmount-force-mountinfo
+
 # disable utilities shipped by other packages
 # => login
 CONFOPTS += --disable-login
 CONFOPTS += --disable-nologin
 CONFOPTS += --disable-su
 # => sysvinit-utils
-CONFOPTS += --disable-sulogin
-CONFOPTS += --disable-last
-CONFOPTS += --disable-mesg
+#CONFOPTS += --disable-sulogin
+#CONFOPTS += --disable-last
+#CONFOPTS += --disable-mesg
 # => initscripts
-CONFOPTS += --disable-mountpoint
+#CONFOPTS += --disable-mountpoint
 # => procps
 CONFOPTS += --disable-kill
 # => eject
@@ -86,7 +91,8 @@ override_dh_install:
 	#
 	dh_install \
 		-Nfdisk-udeb -Ncfdisk-udeb -Nlibblkid1-udeb \
-		-Nlibsmartcols1-udeb -Nlibuuid1-udeb -Nutil-linux-udeb
+		-Nlibfdisk1-udeb -Nlibsmartcols1-udeb -Nlibuuid1-udeb \
+		-Nutil-linux-udeb
 	dh_install --remaining-packages
 	#
 	# Install bash-completions only for binaries we ship
@@ -107,9 +113,6 @@ override_dh_install:
 		fi; \
 	done; \
 	done
-	# Removed these conflicting ones for now, see Bug#755986
-	rm -f debian/util-linux/usr/share/bash-completion/completions/dmesg
-	rm -f debian/bsdutils/usr/share/bash-completion/completions/renice
 	#
 	rm -rf debian/*-udeb/usr/share/doc

@@ -138,11 +141,13 @@ override_dh_installpam:
 	dh_installpam --package=util-linux --name=runuser-l

 override_dh_makeshlibs:
-	dh_makeshlibs -N libsmartcols1 -N libblkid1 -N libuuid1
+	dh_makeshlibs -N libsmartcols1 -N libblkid1 -N libfdisk1 -N libuuid1
 	dh_makeshlibs -plibsmartcols1 -V \
 		--add-udeb=libsmartcols1-udeb
 	dh_makeshlibs -plibblkid1 -V \
-		--add-udeb=libblkid1-udeb
+		--add-udeb=libblkid1-udeb 
+	dh_makeshlibs -plibfdisk1 -V \
+		--add-udeb=libfdisk1-udeb
 	dh_makeshlibs -plibuuid1 -V \
 		--add-udeb=libuuid1-udeb

@@ -150,5 +155,5 @@ override_dh_fixperms:
 	dh_fixperms -i -s -Xusr/bin/wall -Xbin/mount -Xbin/umount

 override_dh_auto_test:
-	TERM=xterm dh_auto_test || true
+	dh_auto_test || true

--- a/debian/util-linux.install
+++ b/debian/util-linux.install
@@ -3,17 +3,18 @@ debian/hwclock.rules => /lib/udev/rules.d/85-hwclock.rules
 debian/hwclock-set => /lib/udev/hwclock-set
 # perl gets to do rename, not us.
 debian/tmp/usr/bin/rename => /usr/bin/rename.ul
-# Rename fdisk to ddisk on PowerPC
-[powerpc powerpcspe ppc64 ppc64el] debian/tmp/sbin/fdisk => /sbin/ddisk
-[!powerpc !powerpcspe !ppc64 !ppc64el] sbin/fdisk
 # Rename mkswap to mkswap.linux on non-linux.
 [linux-any] sbin/mkswap
 [!linux-any] debian/tmp/sbin/mkswap => /sbin/mkswap.linux
 # weekly fstrim only available on linux
+[linux-any] lib/systemd/system/fstrim.timer => /usr/share/doc/util-linux/examples/fstrim.timer
+[linux-any] lib/systemd/system/fstrim.service => /usr/share/doc/util-linux/examples/fstrim.service
 bin/more
+bin/mountpoint
 sbin/agetty
 sbin/blkid
 sbin/cfdisk
+sbin/fdisk
 sbin/findfs
 sbin/fsck
 sbin/fsck.cramfs
@@ -25,6 +26,7 @@ sbin/mkfs.cramfs
 sbin/mkfs.minix
 sbin/runuser
 sbin/sfdisk                                                     [!sparc]
+sbin/sulogin
 sbin/swaplabel
 sbin/wipefs
 usr/bin/chrt
@@ -35,8 +37,11 @@ usr/bin/ipcmk
 usr/bin/ipcrm
 usr/bin/ipcs
 usr/bin/isosize sbin/
+usr/bin/last
+usr/bin/lastb
 usr/bin/line
 usr/bin/mcookie
+usr/bin/mesg
 usr/bin/mips                                                    [mips mipsel]
 usr/bin/mips32                                                  [mips mipsel]
 usr/bin/mips64                                                  [mips mipsel]

--- a/debian/util-linux.manpages
+++ b/debian/util-linux.manpages
@@ -2,9 +2,6 @@
 debian/tmp/usr/share/man/man1/rename.1 => /usr/share/man/man1/rename.ul.1
 [linux-any] debian/tmp/usr/share/man/man8/linux32.8 => /usr/share/man/man1/linux32.1
 [linux-any] debian/tmp/usr/share/man/man8/linux64.8 => /usr/share/man/man1/linux64.1
-# Rename fdisk to ddisk on PowerPC
-[powerpc powerpcspe ppc64 ppc64el] debian/tmp/usr/share/man/man8/fdisk.8 => /usr/share/man/man8/ddisk.8
-[!powerpc !powerpcspe !ppc64 !ppc64el] debian/tmp/usr/share/man/man8/fdisk.8
 # Rename mkswap to mkswap.linux on non-linux.
 [linux-any] debian/tmp/usr/share/man/man8/mkswap.8
 [!linux-any] debian/tmp/usr/share/man/man8/mkswap.8 => /usr/share/man/man8/mkswap.linux.8
@@ -15,9 +12,13 @@ debian/tmp/usr/share/man/man1/getopt.1
 debian/tmp/usr/share/man/man1/ipcmk.1
 debian/tmp/usr/share/man/man1/ipcrm.1
 debian/tmp/usr/share/man/man1/ipcs.1
+debian/tmp/usr/share/man/man1/last.1
+debian/tmp/usr/share/man/man1/lastb.1
 debian/tmp/usr/share/man/man1/line.1
 debian/tmp/usr/share/man/man1/mcookie.1
+debian/tmp/usr/share/man/man1/mesg.1
 debian/tmp/usr/share/man/man1/more.1
+debian/tmp/usr/share/man/man1/mountpoint.1
 debian/tmp/usr/share/man/man1/namei.1
 debian/tmp/usr/share/man/man1/pg.1
 debian/tmp/usr/share/man/man1/rev.1
@@ -30,6 +31,7 @@ debian/tmp/usr/share/man/man5/terminal-colors.d.5
 debian/tmp/usr/share/man/man8/agetty.8
 debian/tmp/usr/share/man/man8/blkid.8
 debian/tmp/usr/share/man/man8/cfdisk.8
+debian/tmp/usr/share/man/man8/fdisk.8
 debian/tmp/usr/share/man/man8/findfs.8
 debian/tmp/usr/share/man/man8/fsck.8
 debian/tmp/usr/share/man/man8/fsck.cramfs.8
@@ -50,6 +52,7 @@ debian/tmp/usr/share/man/man8/ppc64.8                 [powerpc ppc64 ppc64el]
 debian/tmp/usr/share/man/man8/s390.8                            [s390x]
 debian/tmp/usr/share/man/man8/s390x.8                           [s390x]
 debian/tmp/usr/share/man/man8/sfdisk.8                          [!sparc]
+debian/tmp/usr/share/man/man8/sulogin.8
 debian/tmp/usr/share/man/man8/swaplabel.8
 debian/tmp/usr/share/man/man8/wipefs.8
 debian/tmp/usr/share/man/man8/x86_64.8                          [amd64]

--- a/debian/util-linux.postinst
+++ b/debian/util-linux.postinst
@@ -21,10 +21,4 @@ if [ -L /usr/doc/util-linux ]; then
 	rm -f /usr/doc/util-linux
 fi

-# (hwclock-related) parts of this package are being pulled into initramfs,
-# so trigger an update of the initramfs.
-if [ -x /usr/sbin/update-initramfs ]; then
-	/usr/sbin/update-initramfs -u
-fi
-
 #DEBHELPER#
--- a/debian/util-linux.preinst
+++ b/debian/util-linux.preinst
 #!/bin/sh
-set -e

-# We once shipped fstrim.timer in 2.25.2-2. Undo the timer getting enabled
-# and purge the helper state, if upgrading from that version.
-# if [ "$1" = "upgrade" ] && [ "$2" = "2.25.2-2" ] && \
-# 		[ -x /usr/bin/deb-systemd-helper ] && \
-# 		deb-systemd-helper debian-installed fstrim.timer; then
-# 	deb-systemd-helper disable fstrim.timer
-# 	deb-systemd-helper purge fstrim.timer
-# fi
+set -e

-#DEBHELPER#
+# Only relevant on PPC where mac-fdisk tries to hijack our binary name.
+# (We should not reinvent the update-alternatives system badly.)
+if [ -L /sbin/fdisk ]; then
+	rm /sbin/fdisk
+fi