Update debian files to upstream state

debian/changelog

+udisks2 (2.1.7-3) unstable; urgency=medium
+
+  * Drop no longer needed migration code from before jessie.
+  * Add explicit Build-Depends on gnome-common. Required for the
+    GNOME_COMPILE_WARNINGS macro. (Closes: #837828)
+  * Ensure that /var/lib/udisks2 exists when running the upstream integration
+    test.
+  * Promote exfat-utils from Suggests to Recommends. The exFAT file system is
+    more widely used these days so we want to have support installed by
+    default. (Closes: #812467)
+  * Use dbus-run-session to run tests. (Closes: #836042)
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 20 Oct 2016 18:49:25 +0200
+
+udisks2 (2.1.7-2) unstable; urgency=medium
+
+  [ Simon McVittie ]
+  * Avoid using "dh_install -X.la". This would suppress installation of
+    anything containing the substring .la *anywhere*. -X.la is
+    less bad than -X.a (which stopped gnome-software from installing
+    its .appstream file as intended, for example), but still seems
+    somewhat risky.
+  * Use https for Vcs-Git
+
+  [ Michael Biebl ]
+  * Run wrap-and-sort -at.
+  * Use https for upstream homepage.
+  * Drop --disable-silent-rules from debian/rules. This is now handled by dh
+    directly depending on whether the DH_QUIET environment variable is set.
+  * Bump Standards-Version to 3.9.8.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 26 May 2016 05:39:47 +0200
+
+udisks2 (2.1.7-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Drop git_Fix-udiskctl-help-for-glib-2.45.patch, included upstream.
+  * debian/libudisks2-0.symbols: Add new symbols for this release.
+  * udisks2-inhibit: Stop fiddling with polkit rules; restarting it can break
+    existing clients/pending requests, and we can't use inotify as we don't
+    want to write anything on the actual file system and bind mounts don't
+    trigger inotify. Use a different approach of a temporary udev rule which
+    sets UDISKS_IGNORE on all block devices. This continues to avoid touching
+    the file system but does not need any daemon restarts, works with polkit
+    >= 106, and now also suppresses showing new block devices on the desktop.
+    (LP: #1508075)
+  * Bump Standards-Version to 3.9.7 (no changes necessary).
+  * debian/tests/upstream-system: Try to purge ntfs-3g, as the NTFS test still
+    hangs the kernel often (see 2.1.5-1).
+  * Add missing "make" test dependency.
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 01 Mar 2016 10:52:39 +0100
+
+udisks2 (2.1.6-2) unstable; urgency=medium
+
+  * Fix udisksctl help crash with glib 2.45. (LP: #1478369)
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 28 Jul 2015 07:48:20 +0200
+
+udisks2 (2.1.6-1) unstable; urgency=medium
+
+  [ Martin Pitt ]
+  * New upstream release.
+    - Drop Decide-whether-devices-are-on-the-same-seat-by-uid-n.patch,
+      included upstream.
+  * debian/rules: Configure with explicit --libexecdir, as that's where the
+    daemon gets installed now.
+
+  [ Simon McVittie ]
+  * Disable Automake "silent rules" for more useful buildd logs
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 30 Jun 2015 10:41:32 +0200
+
+udisks2 (2.1.5-3) unstable; urgency=medium
+
+  * debian/control: Drop obsolete XS-Testsuite: field, dpkg adds this
+    automatically now.
+
+ -- Martin Pitt <mpitt@debian.org>  Mon, 27 Apr 2015 10:03:57 +0200
+
+udisks2 (2.1.5-2) experimental; urgency=medium
+
+  * Team upload.
+  * Treat devices as "on the same seat" if the requesting uid owns
+    the active login session on the device's seat. This means that shared
+    services run by the user's `systemd --user`, such as the dbus-daemon
+    run by dbus-user-session and the D-Bus or systemd services that
+    it starts, can manipulate the user's devices even though those are
+    not associated with any particular login session or seat.
+    (Closes: #780004)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 31 Mar 2015 19:16:58 +0100
+
+udisks2 (2.1.5-1) experimental; urgency=medium
+
+  [ Martin Pitt ]
+  * New upstream release:
+    - Drop default [df]mask for VFAT and NTFS (LP: #453605)
+  * Drop our patches, included upstream.
+  * debian/rules: Configure with --enable-fhs-media, to continue mounting in
+    /media instead of /run/media. (Previously done by a Debian patch)
+  * debian/tests/upstream-system: Drop ntfs-3g test dependency; due to a bug
+    in the BLKRRPART ioctl this causes eternal udev and thus mount hangs.
+    (see LP #1398859)
+  * udisks2-inhibit: Don't use mount --move, as it doesn't work under shared
+    mounts (i. e. under systemd). (LP: #1410851)
+
+  [ Michael Biebl ]
+  * Update Vcs-Browser URL to use cgit and https.
+
+ -- Martin Pitt <mpitt@debian.org>  Fri, 06 Mar 2015 09:29:30 +0100
+
+udisks2 (2.1.4-1) experimental; urgency=medium
+
+  * New upstream bug fix release.
+    - Avoids waking up disks from standby through SMART updates.
+      (LP: #1281588)
+    - Drop 00git_test_fixes.patch and libsystemd.patch, included upstream.
+  * Bump Standards-Version to 3.9.6 (no changes necessary).
+  * Add missing python3-dbus autopkgtest dependency.
+  * integration-test: Skip double mount check for NTFS. Patch cherry-picked
+    from upstream git.
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 18 Dec 2014 14:07:40 +0100
+
 udisks2 (2.1.3-5+devuan3) unstable; urgency=medium
 
   * As the previous fix for tests in qemu doesn't work well, re-do it in

debian/control

@@ -4,33 +4,46 @@ Priority: optional
 Maintainer: Dimitri Puzin <max@psycasst.de>
 Uploaders: Franco (nextime) Lanza <nextime@nexlab.it>
 Build-Depends: debhelper (>= 9),
- pkg-config,
- xsltproc,
- gtk-doc-tools,
- intltool (>= 0.40.0),
- libglib2.0-dev (>= 2.31.13),
- udev (>= 147),
- libgudev-1.0-dev (>= 165),
- libpolkit-gobject-1-dev (>= 0.97),
- libpolkit-agent-1-dev (>= 0.97),
- libacl1-dev,
- libgirepository1.0-dev (>= 1.30),
- gobject-introspection (>= 1.30),
- libatasmart-dev (>= 0.17),
- dh-autoreconf
-Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/pkg-utopia/udisks2.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-utopia/udisks2.git;a=summary
-Homepage: http://www.freedesktop.org/wiki/Software/udisks
-XS-Testsuite: autopkgtest
+               dh-autoreconf,
+               gobject-introspection (>= 1.30),
+               gtk-doc-tools,
+               intltool (>= 0.40.0),
+               gnome-common,
+               libacl1-dev,
+               libatasmart-dev (>= 0.17),
+               libgirepository1.0-dev (>= 1.30),
+               libglib2.0-dev (>= 2.31.13),
+               libgudev-1.0-dev (>= 165),
+               libpolkit-agent-1-dev (>= 0.97),
+               libpolkit-gobject-1-dev (>= 0.97),
+               pkg-config,
+               udev (>= 147),
+               xsltproc,
+Standards-Version: 3.9.8
+Vcs-Git: git@git.devuan.org:devuan-packages/udisks2.git
+Vcs-Browser: https://git.devuan.org/devuan-packages/udisks2
+Homepage: https://www.freedesktop.org/wiki/Software/udisks
 
 Package: udisks2
 Architecture: linux-any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, udev, dbus, parted
-Pre-Depends: ${misc:Pre-Depends}
-Recommends: policykit-1, dosfstools, ntfs-3g, eject, gdisk
-Suggests: xfsprogs, reiserfsprogs, exfat-utils, btrfs-tools, mdadm, cryptsetup-bin
+Depends: dbus,
+         parted,
+         udev,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Pre-Depends: ${misc:Pre-Depends},
+Recommends: dosfstools,
+            eject,
+            exfat-utils,
+            gdisk,
+            ntfs-3g,
+            policykit-1,
+Suggests: btrfs-tools,
+          cryptsetup-bin,
+          mdadm,
+          reiserfsprogs,
+          xfsprogs,
 Description: D-Bus service to access and manipulate storage devices
  The udisks daemon serves as an interface to system block devices,
  implemented via D-Bus. It handles operations such as querying, mounting,
@@ -48,8 +61,8 @@ Description: D-Bus service to access and manipulate storage devices
 Package: udisks2-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Suggests: devhelp
+Depends: ${misc:Depends},
+Suggests: devhelp,
 Description: udisks2 documentation
  The udisks daemon serves as an interface to system block devices,
  implemented via D-Bus. It handles operations such as querying, mounting,
@@ -62,8 +75,9 @@ Package: libudisks2-0
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Description: GObject based library to access udisks2
  The udisks daemon serves as an interface to system block devices,
  implemented via D-Bus. It handles operations such as querying, mounting,
@@ -77,10 +91,10 @@ Package: libudisks2-dev
 Section: libdevel
 Architecture: linux-any
 Multi-Arch: same
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- gir1.2-udisks-2.0 (= ${binary:Version}),
- libudisks2-0 (= ${binary:Version})
+Depends: gir1.2-udisks-2.0 (= ${binary:Version}),
+         libudisks2-0 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: GObject based library to access udisks2 - development files
  The udisks daemon serves as an interface to system block devices,
  implemented via D-Bus. It handles operations such as querying, mounting,
@@ -95,8 +109,8 @@ Section: introspection
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${gir:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: GObject based library to access udisks2 - introspection data
  The udisks daemon serves as an interface to system block devices,
  implemented via D-Bus. It handles operations such as querying, mounting,
@@ -105,4 +119,3 @@ Description: GObject based library to access udisks2 - introspection data
  .
  This package provides introspection data for libudisks. It can be used
  by packages using the GIRepository format to generate dynamic bindings.
-

debian/copyright

 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: UDisks2
 Upstream-Contact: David Zeuthen <zeuthen@gmail.com>
-Source: http://udisks.freedesktop.org/releases/
+Source: https://udisks.freedesktop.org/releases/
 
 Files: *
 Copyright: 2007-2011 David Zeuthen <zeuthen@gmail.com>

debian/libudisks2-0.symbols

@@ -194,6 +194,8 @@ libudisks2.so.0 libudisks2-0 #MINVER#
  udisks_drive_ata_get_apm_supported@Base 2.0.0
  udisks_drive_ata_get_pm_enabled@Base 2.0.0
  udisks_drive_ata_get_pm_supported@Base 2.0.0
+ udisks_drive_ata_get_read_lookahead_enabled@Base 2.1.7
+ udisks_drive_ata_get_read_lookahead_supported@Base 2.1.7
  udisks_drive_ata_get_security_enhanced_erase_unit_minutes@Base 2.0.0
  udisks_drive_ata_get_security_erase_unit_minutes@Base 2.0.0
  udisks_drive_ata_get_security_frozen@Base 2.0.0
@@ -227,6 +229,8 @@ libudisks2.so.0 libudisks2-0 #MINVER#
  udisks_drive_ata_set_apm_supported@Base 2.0.0
  udisks_drive_ata_set_pm_enabled@Base 2.0.0
  udisks_drive_ata_set_pm_supported@Base 2.0.0
+ udisks_drive_ata_set_read_lookahead_enabled@Base 2.1.7
+ udisks_drive_ata_set_read_lookahead_supported@Base 2.1.7
  udisks_drive_ata_set_security_enhanced_erase_unit_minutes@Base 2.0.0
  udisks_drive_ata_set_security_erase_unit_minutes@Base 2.0.0
  udisks_drive_ata_set_security_frozen@Base 2.0.0

debian/libudisks2-dev.install

 usr/include
-usr/lib/*/*.so
 usr/lib/*/*.a
+usr/lib/*/*.so
 usr/lib/*/pkgconfig/
 usr/share/gir*/

debian/local/udisks2-inhibit

 #!/bin/sh
-# Disallow udisks2 mount operations for anyone but root while a program is running.
+# Avoid udisks mounting while a program is running. This is mostly useful
+# for installers.
 # This is similar to udisks 1.x's "udisks --inhibit .." command.
 # Author: Martin Pitt <martin.pitt@ubuntu.com>
 
 set -e
 
-RULE="[Inhibit udisks2]
-Identity=unix-user:*
-Action=org.freedesktop.udisks2.filesystem*;
-ResultActive=no
-ResultInactive=no
-ResultAny=no
-"
-
 [ -n "$1" ] || {
     echo "Usage: $0 <command> [<arguments> ...]" >&2
     exit 1
@@ -23,23 +16,11 @@ ResultAny=no
     exit 1
 }
 
-DIR=/var/lib/polkit-1/localauthority/90-mandatory.d
-[ -d $DIR ] || {
-    echo "$DIR does not exist. Please install policykit-1" >&2
-    exit 1
-}
-
-# mount a tmpfs over $DIR and place our rule in there, together with the
-# already existing ones; this will guarantee that the file will not
-# accidentally stay around across reboot, etc.
-mkdir -p /run/udisks2/inhibit-polkit
-mount -t tmpfs tmpfs /run/udisks2/inhibit-polkit
-find "$DIR" -mindepth 1 -exec cp -a '{}' /run/udisks2/inhibit-polkit \;
-echo "$RULE" > /run/udisks2/inhibit-polkit/udisks2-inhibit.pkla
-mount --move /run/udisks2/inhibit-polkit "$DIR"
-trap "umount $DIR; pkill --signal HUP polkitd" 0 HUP INT QUIT ILL ABRT FPE KILL SEGV PIPE ALRM TERM BUS
-rmdir /run/udisks2/inhibit-polkit
-pkill --signal HUP polkitd || :
+mkdir -p /run/udev/rules.d
+echo 'SUBSYSTEM=="block", ENV{UDISKS_IGNORE}="1"' > /run/udev/rules.d/90-udisks-inhibit.rules
+trap "rm -f /run/udev/rules.d/90-udisks-inhibit.rules; udevadm control --reload; udevadm trigger --subsystem-match=block" EXIT HUP INT QUIT ILL ABRT FPE KILL SEGV PIPE ALRM TERM BUS
+udevadm control --reload
+udevadm trigger --subsystem-match=block
 
 # run wrapped command
 "$@"

debian/rules

@@ -5,8 +5,10 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--with-systemdsystemunitdir="" \
-		--enable-gtk-doc
+		--libexecdir=/usr/lib \
+		--enable-gtk-doc \
+		--enable-fhs-media \
+		--with-systemdsystemunitdir=""
 
 override_dh_auto_build:
 	dh_auto_build
@@ -20,4 +22,5 @@ override_dh_auto_install:
 	fi
 
 override_dh_install:
-	dh_install -X.la --fail-missing
+	rm -f debian/tmp/usr/lib/*/*.la
+	dh_install --fail-missing

debian/tests/control

 Tests: upstream-system
-Depends: @, python3-gi, gir1.2-glib-2.0, reiserfsprogs, xfsprogs, ntfs-3g, dosfstools, lvm2, mdadm, cryptsetup-bin, kpartx, libatasmart-bin, policykit-1, dbus-x11
+Depends: cryptsetup-bin,
+         dbus (>= 1.8),
+         dosfstools,
+         gir1.2-glib-2.0,
+         kpartx,
+         libatasmart-bin,
+         lvm2,
+         make,
+         mdadm,
+         policykit-1,
+         python3-dbus,
+         python3-gi,
+         reiserfsprogs,
+         xfsprogs,
+         @,
 Restrictions: needs-root isolation-machine

debian/tests/upstream-system

 #!/bin/sh
 set -e
 
+# The NTFS test still hangs the kernel often (see 2.1.5-1 changelog and
+# https://launchpad.net/bugs/1398859)
+dpkg -P ntfs-3g 2>&1|| true
+
 # succeeding test must not write anything to stderr, as per DEP-8
 mkdir -p /var/run/udisks2
-src/tests/integration-test 2>&1
+mkdir -p /var/lib/udisks2
+dbus-run-session -- src/tests/integration-test 2>&1

debian/udisks2.install

+debian/local/udisks2-inhibit usr/lib/udisks2/
 etc/
 lib/udev/
 usr/bin/
-usr/sbin/* /sbin/
 usr/lib/udisks2/
+usr/sbin/* /sbin/
 usr/share/bash-completion/
 usr/share/dbus-1/
 usr/share/locale/
 usr/share/man/
 usr/share/polkit-1/
-debian/local/udisks2-inhibit usr/lib/udisks2/

debian/udisks2.maintscript

-rm_conffile /etc/bash_completion.d/udisksctl-bash-completion.sh 2.0.0-1~

debian/udisks2.postinst

@@ -16,14 +16,6 @@ if [ "$1" = "configure" ]; then
     pid=$(get_pid org.freedesktop.UDisks2)
     kill $pid 2>/dev/null || true
 
-    # in that version, the mounted-fs file moved
-    if dpkg --compare-versions "$2" lt-nl "1.99.0-4" &&
-        [ -e /run/udisks2/mounted-fs ] &&
-        [ -d /var/lib/udisks2 ] &&
-        [ ! -e /var/lib/udisks2/mounted-fs ]; then
-        mv /run/udisks2/mounted-fs /var/lib/udisks2/
-    fi
-
     # restart daemon if it was running before
     [ -z "$pid" ] || udisksctl status >/dev/null || true # will trigger through D-Bus activation
 

debian/watch

 version=3
-http://udisks.freedesktop.org/releases/udisks-(.*).tar.bz2
+https://udisks.freedesktop.org/releases/udisks-(.*).tar.bz2