Bug#889668: util-linux: diff for NMU version 2.31.1-0.2

[Laurent Bigonville]

Dear maintainer,

You will find here a 2nd version of the patch to fix the bug #889668.

The previous version was not taking into account the non-linux architectures.

Regards.
diff -Nru util-linux-2.31.1/debian/changelog util-linux-2.31.1/debian/changelog
--- util-linux-2.31.1/debian/changelog  2018-02-09 19:16:51.0 +0100
+++ util-linux-2.31.1/debian/changelog  2018-02-13 12:19:06.0 +0100
@@ -1,3 +1,11 @@
+util-linux (2.31.1-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install fstrim.timer and fstrim.service without enabling it by default
+(for now), see discussion in #732054 (Closes: #889668)
+
+ -- Laurent Bigonville   Tue, 13 Feb 2018 12:19:06 +0100
+
 util-linux (2.31.1-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru util-linux-2.31.1/debian/rules util-linux-2.31.1/debian/rules
--- util-linux-2.31.1/debian/rules  2018-02-09 19:16:51.0 +0100
+++ util-linux-2.31.1/debian/rules  2018-02-13 12:19:06.0 +0100
@@ -157,6 +157,12 @@
 override_dh_fixperms:
dh_fixperms -i -a -Xusr/bin/wall -Xbin/mount -Xbin/umount
 
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+override_dh_installsystemd:
+   dh_installsystemd -putil-linux --no-enable --no-start fstrim.timer 
fstrim.service
+   dh_installsystemd --remaining-packages
+endif
+
 override_dh_auto_test:
 ifeq ($(DEB_HOST_ARCH_OS), linux)
dh_auto_test --max-parallel=1
diff -Nru util-linux-2.31.1/debian/util-linux.install 
util-linux-2.31.1/debian/util-linux.install
--- util-linux-2.31.1/debian/util-linux.install 2018-02-09 19:16:51.0 
+0100
+++ util-linux-2.31.1/debian/util-linux.install 2018-02-12 18:03:47.0 
+0100
@@ -7,8 +7,8 @@
 [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
+[linux-any] lib/systemd/system/fstrim.timer
+[linux-any] lib/systemd/system/fstrim.service
 bin/findmnt
 bin/more
 bin/mountpoint

Bug#889668: util-linux: diff for NMU version 2.31.1-0.2

[Laurent Bigonville]

Control: tags 889668 + patch
Control: tags 889668 + pending

Dear maintainer,

I've prepared an NMU for util-linux (versioned as 2.31.1-0.2) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru util-linux-2.31.1/debian/changelog util-linux-2.31.1/debian/changelog
--- util-linux-2.31.1/debian/changelog  2018-02-09 19:16:51.0 +0100
+++ util-linux-2.31.1/debian/changelog  2018-02-13 12:19:06.0 +0100
@@ -1,3 +1,11 @@
+util-linux (2.31.1-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install fstrim.timer and fstrim.service without enabling it by default
+(for now), see discussion in #732054 (Closes: #889668)
+
+ -- Laurent Bigonville   Tue, 13 Feb 2018 12:19:06 +0100
+
 util-linux (2.31.1-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru util-linux-2.31.1/debian/rules util-linux-2.31.1/debian/rules
--- util-linux-2.31.1/debian/rules  2018-02-09 19:16:51.0 +0100
+++ util-linux-2.31.1/debian/rules  2018-02-13 11:45:16.0 +0100
@@ -157,6 +157,10 @@
 override_dh_fixperms:
dh_fixperms -i -a -Xusr/bin/wall -Xbin/mount -Xbin/umount
 
+override_dh_installsystemd:
+   dh_installsystemd -putil-linux --no-enable --no-start fstrim.timer 
fstrim.service
+   dh_installsystemd --remaining-packages
+
 override_dh_auto_test:
 ifeq ($(DEB_HOST_ARCH_OS), linux)
dh_auto_test --max-parallel=1
diff -Nru util-linux-2.31.1/debian/util-linux.install 
util-linux-2.31.1/debian/util-linux.install
--- util-linux-2.31.1/debian/util-linux.install 2018-02-09 19:16:51.0 
+0100
+++ util-linux-2.31.1/debian/util-linux.install 2018-02-12 18:03:47.0 
+0100
@@ -7,8 +7,8 @@
 [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
+[linux-any] lib/systemd/system/fstrim.timer
+[linux-any] lib/systemd/system/fstrim.service
 bin/findmnt
 bin/more
 bin/mountpoint