diff -Nru bilibop-0.5.2.1/debian/bilibop-lockfs.triggers bilibop-0.5.4/debian/bilibop-lockfs.triggers --- bilibop-0.5.2.1/debian/bilibop-lockfs.triggers 2017-05-18 15:20:24.000000000 +0000 +++ bilibop-0.5.4/debian/bilibop-lockfs.triggers 2017-09-09 08:22:54.000000000 +0000 @@ -1 +1 @@ -activate update-initramfs +activate-await update-initramfs diff -Nru bilibop-0.5.2.1/debian/bilibop-rules.triggers bilibop-0.5.4/debian/bilibop-rules.triggers --- bilibop-0.5.2.1/debian/bilibop-rules.triggers 2017-05-18 15:20:24.000000000 +0000 +++ bilibop-0.5.4/debian/bilibop-rules.triggers 2017-09-09 08:22:54.000000000 +0000 @@ -1 +1 @@ -activate update-initramfs +activate-await update-initramfs diff -Nru bilibop-0.5.2.1/debian/changelog bilibop-0.5.4/debian/changelog --- bilibop-0.5.2.1/debian/changelog 2017-05-18 15:20:24.000000000 +0000 +++ bilibop-0.5.4/debian/changelog 2017-09-09 08:22:54.000000000 +0000 @@ -1,3 +1,18 @@ +bilibop (0.5.4) unstable; urgency=high + + * bilibop-common: remove "udev compatibility stuff" (no more needed). + Closes: #852592. + * debian/control: + - bump Standards-Version to 4.1.0, and modify Format: field in + debian/copyright accordingly (use https:// URL); also remove + extra priority (deprecated) + - add aufs-dkms in the list of packages suggested by bilibop-lockfs + * debian/*.triggers: replace 'activate' by more explicit 'activate-await' + variant (caught by lintian). + * Update copyright dates + + -- Yann Amar Sat, 09 Sep 2017 08:22:54 +0000 + bilibop (0.5.2.1) unstable; urgency=high * bilibop-common: diff -Nru bilibop-0.5.2.1/debian/control bilibop-0.5.4/debian/control --- bilibop-0.5.2.1/debian/control 2017-05-18 15:20:24.000000000 +0000 +++ bilibop-0.5.4/debian/control 2017-09-09 08:22:54.000000000 +0000 @@ -3,13 +3,12 @@ Priority: optional Maintainer: Yann Amar Build-Depends: debhelper (>= 9), po-debconf -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 Homepage: https://un.poivron.org/~quidame/wiki/bilibop Vcs-Git: https://un.poivron.org/~quidame/git/bilibop.git Package: bilibop Section: metapackages -Priority: extra Architecture: linux-any Depends: bilibop-lockfs (= ${binary:Version}), bilibop-rules (= ${binary:Version}), ${misc:Depends} Description: run Debian GNU/Linux from external media - metapackage @@ -42,7 +41,7 @@ Architecture: linux-any Depends: bilibop-common (= ${binary:Version}), initramfs-tools, ${misc:Depends} Recommends: cryptsetup -Suggests: bilibop-device-policy, gnome-icon-theme, libnotify-bin, plymouth +Suggests: aufs-dkms, bilibop-device-policy, gnome-icon-theme, libnotify-bin, plymouth Description: lock filesystems and write changes into RAM ${Description} . @@ -78,7 +77,6 @@ ${Requirement} Package: bilibop-rules -Priority: extra Architecture: linux-any Depends: bilibop-common (= ${binary:Version}), initramfs-tools, ${misc:Depends} Recommends: lvm2 diff -Nru bilibop-0.5.2.1/debian/copyright bilibop-0.5.4/debian/copyright --- bilibop-0.5.2.1/debian/copyright 2017-05-18 15:20:24.000000000 +0000 +++ bilibop-0.5.4/debian/copyright 2017-09-09 08:22:54.000000000 +0000 @@ -1,13 +1,13 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: bilibop project Upstream-Contact: Files: * -Copyright: 2011-2014 Yann Amar +Copyright: 2011-2017 Yann Amar License: GPL-3.0+ Files: debian/* -Copyright: 2012-2013 Yann Amar +Copyright: 2012-2017 Yann Amar License: GPL-3.0+ License: GPL-3.0+ diff -Nru bilibop-0.5.2.1/lib/bilibop/common.sh bilibop-0.5.4/lib/bilibop/common.sh --- bilibop-0.5.2.1/lib/bilibop/common.sh 2017-05-18 15:20:24.000000000 +0000 +++ bilibop-0.5.4/lib/bilibop/common.sh 2017-09-09 08:22:54.000000000 +0000 @@ -1,6 +1,6 @@ # /lib/bilibop/common.sh # -# Copyright (C) 2011-2015, Yann Amar +# Copyright (C) 2011-2017, Yann Amar # License GPL-3.0+ # # This program is free software: you can redistribute it and/or modify @@ -149,29 +149,6 @@ # }}} -# Udev compatibility stuff =================================================={{{ -# What we want is to be able to use udevadm even if it not included in the -# PATH. Obviously, we assume that /bin is ever in PATH, so if udevadm is not -# in the PATH, it means /bin/udevadm does not exist; then /sbin/udevadm is -# the fallback. This should work for any version of udev, and does not need -# to silently modify the PATH of the user sourcing this file. The resulting -# udevadm() function does not conflict with the udevadm command, since the -# command itself is not available in PATH. -# NOTE: until udev has been merged to systemd, udevadm was /sbin/udevadm; -# from version 183 to 204, it seems that udevadm was /bin/udevadm, but with -# no symlink in /sbin to ensure backward compatibility; this has been done -# in 204-1. -has_udevadm="false" -for d in $(IFS=':'; echo ${PATH}); do - if [ -x "${d}/udevadm" ]; then - has_udevadm="true" - break - fi -done -[ "${has_udevadm}" = "true" ] || -udevadm() { /sbin/udevadm "$@"; } -unset has_udevadm d -# ===========================================================================}}} # bilibop_common_functions() ================================================{{{ # What we want is: output a list of useful bilibop functions, to use them # manually. diff -Nru bilibop-0.5.2.1/lib/bilibop/lockfs.sh bilibop-0.5.4/lib/bilibop/lockfs.sh --- bilibop-0.5.2.1/lib/bilibop/lockfs.sh 2017-05-18 15:20:24.000000000 +0000 +++ bilibop-0.5.4/lib/bilibop/lockfs.sh 2017-09-09 08:22:54.000000000 +0000 @@ -421,17 +421,17 @@ EOF else grep -q '^[[:blank:]]*dir[[:blank:]]*=' ${LVM_CONF} || - sed -i "s;^\s*devices\s*{;&\n dir = \"${1}\"\n;" ${LVM_CONF} + sed -i "s;^\s*devices\s*{;&\n\tdir = \"${1}\"\n;" ${LVM_CONF} grep -q '^[[:blank:]]*scan[[:blank:]]*=' ${LVM_CONF} || - sed -i "s;^\s*devices\s*{;&\n scan = [ \"${1}\" ]\n;" ${LVM_CONF} + sed -i "s;^\s*devices\s*{;&\n\tscan = [ \"${1}\" ]\n;" ${LVM_CONF} grep -q '^[[:blank:]]*obtain_device_list_from_udev[[:blank:]]*=' ${LVM_CONF} || - sed -i 's;^\s*devices\s*{;&\n obtain_device_list_form_udev = 1\n;' ${LVM_CONF} + sed -i 's;^\s*devices\s*{;&\n\tobtain_device_list_form_udev = 1\n;' ${LVM_CONF} grep -q '^[[:blank:]]*filter[[:blank:]]*=' ${LVM_CONF} || - sed -i 's;^\s*devices\s*{;&\n filter = [ "a|.*|" ]\n;' ${LVM_CONF} + sed -i 's;^\s*devices\s*{;&\n\tfilter = [ "a|.*|" ]\n;' ${LVM_CONF} grep -q '^[[:blank:]]*global_filter[[:blank:]]*=' ${LVM_CONF} || - sed -i 's;^\s*devices\s*{;&\n global_filter = [ "a|.*|" ]\n;' ${LVM_CONF} + sed -i 's;^\s*devices\s*{;&\n\tglobal_filter = [ "a|.*|" ]\n;' ${LVM_CONF} grep -q '^[[:blank:]]*sysfs_scan[[:blank:]]*=' ${LVM_CONF} || - sed -i 's;^\s*devices\s*{;&\n sysfs_scan = 1\n;' ${LVM_CONF} + sed -i 's;^\s*devices\s*{;&\n\tsysfs_scan = 1\n;' ${LVM_CONF} fi ## @@ -446,9 +446,9 @@ EOF else grep -q '^[[:blank:]]*locking_type[[:blank:]]*=' ${LVM_CONF} || - sed -i 's;^\s*global\s*{;&\n locking_type = 1\n;' ${LVM_CONF} + sed -i 's;^\s*global\s*{;&\n\tlocking_type = 1\n;' ${LVM_CONF} grep -q '^[[:blank:]]*metadata_read_only[[:blank:]]*=' ${LVM_CONF} || - sed -i 's;^\s*global\s*{;&\n metadata_read_only = 0\n;' ${LVM_CONF} + sed -i 's;^\s*global\s*{;&\n\tmetadata_read_only = 0\n;' ${LVM_CONF} fi ## @@ -538,7 +538,7 @@ if grep -q '^[[:blank:]]*read_only_volume_list[[:blank:]]*=' ${LVM_CONF} ; then sed -i "s|^\s*read_only_volume_list\s*=\s*[|& ${ROVL},|" ${LVM_CONF} else - sed -i "s|^\s*activation\s*{.*|&\n read_only_volume_list = [ ${ROVL} ]|" ${LVM_CONF} + sed -i "s|^\s*activation\s*{.*|&\n\tread_only_volume_list = [ ${ROVL} ]|" ${LVM_CONF} fi } # ===========================================================================}}} diff -Nru bilibop-0.5.2.1/lib/bilibop/pvfilter.sh bilibop-0.5.4/lib/bilibop/pvfilter.sh --- bilibop-0.5.2.1/lib/bilibop/pvfilter.sh 2017-05-18 15:20:24.000000000 +0000 +++ bilibop-0.5.4/lib/bilibop/pvfilter.sh 2017-09-09 08:22:54.000000000 +0000 @@ -426,7 +426,7 @@ [ "${have_filter}" = "false" -a "${global}" = "false" ] && # Add 'filter' variable if [ "${init}" = "true" ]; then - sed -i 's,^[[:blank:]]*devices[[:blank:]]*{.*,&\n filter = [ "a|.*|" ],' ${LVM_CONF} + sed -i 's,^[[:blank:]]*devices[[:blank:]]*{.*,&\n\tfilter = [ "a|.*|" ],' ${LVM_CONF} error=$((error+$?)) else echo "${PROG}: 'filter' variable is missing in ${LVM_CONF}." >&2 @@ -436,7 +436,7 @@ [ "${have_global}" = "false" -a "${global}" = "true" ] && # Add 'global_filter' variable if [ "${init}" = "true" ]; then - sed -i 's,^[[:blank:]]*devices[[:blank:]]*{.*,&\n global_filter = [ "a|.*|" ],' ${LVM_CONF} + sed -i 's,^[[:blank:]]*devices[[:blank:]]*{.*,&\n\tglobal_filter = [ "a|.*|" ],' ${LVM_CONF} error=$((error+$?)) else echo "${PROG}: 'global_filter' variable is missing in ${LVM_CONF}." >&2 @@ -446,7 +446,7 @@ [ "${have_obtain}" = "false" ] && # Add 'obtain_device_list_from_udev' variable if [ "${init}" = "true" ]; then - sed -i 's,^[[:blank:]]*devices[[:blank:]]*{.*,&\n obtain_device_list_from_udev = 1,' ${LVM_CONF} + sed -i 's,^[[:blank:]]*devices[[:blank:]]*{.*,&\n\tobtain_device_list_from_udev = 1,' ${LVM_CONF} error=$((error+$?)) else echo "${PROG}: 'obtain_device_list_from_udev' variable is missing in ${LVM_CONF}." >&2