From e4b17402bbb5d53797a601de93771d8bd0df5213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 8 Feb 2014 15:00:10 +0200
Subject: [PATCH] hwclock,ionice,rtcwake: Deprecate in favor of util-linux ones
 (Debian: #737672)

---
 completions/Makefile.am           | 14 ++++++++++----
 completions/{hwclock => _hwclock} |  3 +++
 completions/{ionice => _ionice}   |  3 +++
 completions/{rtcwake => _rtcwake} |  3 +++
 test/completion/hwclock.exp       |  1 -
 test/completion/ionice.exp        |  1 -
 test/completion/rtcwake.exp       |  1 -
 test/lib/completions/hwclock.exp  | 18 ------------------
 test/lib/completions/ionice.exp   | 18 ------------------
 test/lib/completions/rtcwake.exp  | 20 --------------------
 10 files changed, 19 insertions(+), 63 deletions(-)
 rename completions/{hwclock => _hwclock} (81%)
 rename completions/{ionice => _ionice} (91%)
 rename completions/{rtcwake => _rtcwake} (87%)
 delete mode 100644 test/completion/hwclock.exp
 delete mode 100644 test/completion/ionice.exp
 delete mode 100644 test/completion/rtcwake.exp
 delete mode 100644 test/lib/completions/hwclock.exp
 delete mode 100644 test/lib/completions/ionice.exp
 delete mode 100644 test/lib/completions/rtcwake.exp

diff --git a/completions/Makefile.am b/completions/Makefile.am
index 9ef17ea6..3fa38db9 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -130,7 +130,6 @@ bashcomp_DATA = 2to3 \
 		hping2 \
 		htop \
 		htpasswd \
-		hwclock \
 		iconv \
 		id \
 		idn \
@@ -142,7 +141,6 @@ bashcomp_DATA = 2to3 \
 		installpkg \
 		interdiff \
 		invoke-rc.d \
-		ionice \
 		ip \
 		iperf \
 		ipmitool \
@@ -305,7 +303,6 @@ bashcomp_DATA = 2to3 \
 		rpmcheck \
 		rrdtool \
 		rsync \
-		rtcwake \
 		sbcl \
 		sbopkg \
 		screen \
@@ -390,7 +387,16 @@ bashcomp_DATA = 2to3 \
 		zopfli
 
 EXTRA_DIST = $(bashcomp_DATA) \
-	     _mock _modules _nmcli _subversion _udevadm _yum _yum-utils
+		_hwclock \
+		_ionice \
+		_mock \
+		_modules \
+		_nmcli \
+		_rtcwake \
+		_subversion \
+		_udevadm \
+		_yum \
+		_yum-utils
 
 CLEANFILES = \
 	7za \
diff --git a/completions/hwclock b/completions/_hwclock
similarity index 81%
rename from completions/hwclock
rename to completions/_hwclock
index 9f8f9b15..5a00343f 100644
--- a/completions/hwclock
+++ b/completions/_hwclock
@@ -1,5 +1,8 @@
 # hwclock(8) completion                                    -*- shell-script -*-
 
+# Use of this file is deprecated.  Upstream completion is available in
+# util-linux >= 2.23, use that instead.
+
 _hwclock()
 {
     local cur prev words cword
diff --git a/completions/ionice b/completions/_ionice
similarity index 91%
rename from completions/ionice
rename to completions/_ionice
index 6d9bdd46..56c0ebe3 100644
--- a/completions/ionice
+++ b/completions/_ionice
@@ -1,5 +1,8 @@
 # ionice(1) completion                                     -*- shell-script -*-
 
+# Use of this file is deprecated.  Upstream completion is available in
+# util-linux >= 2.23, use that instead.
+
 _ionice()
 {
     local cur prev words cword
diff --git a/completions/rtcwake b/completions/_rtcwake
similarity index 87%
rename from completions/rtcwake
rename to completions/_rtcwake
index f276c1be..297aad15 100644
--- a/completions/rtcwake
+++ b/completions/_rtcwake
@@ -1,5 +1,8 @@
 # bash completion for rtcwake                              -*- shell-script -*-
 
+# Use of this file is deprecated.  Upstream completion is available in
+# util-linux >= 2.23, use that instead.
+
 _rtcwake()
 {
     local cur prev words cword split
diff --git a/test/completion/hwclock.exp b/test/completion/hwclock.exp
deleted file mode 100644
index b0bdb8ed..00000000
--- a/test/completion/hwclock.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions hwclock
diff --git a/test/completion/ionice.exp b/test/completion/ionice.exp
deleted file mode 100644
index d569f418..00000000
--- a/test/completion/ionice.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions ionice
diff --git a/test/completion/rtcwake.exp b/test/completion/rtcwake.exp
deleted file mode 100644
index abedd8de..00000000
--- a/test/completion/rtcwake.exp
+++ /dev/null
@@ -1 +0,0 @@
-assert_source_completions rtcwake
diff --git a/test/lib/completions/hwclock.exp b/test/lib/completions/hwclock.exp
deleted file mode 100644
index b12951a9..00000000
--- a/test/lib/completions/hwclock.exp
+++ /dev/null
@@ -1,18 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "hwclock -"
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions/ionice.exp b/test/lib/completions/ionice.exp
deleted file mode 100644
index d0ff8b64..00000000
--- a/test/lib/completions/ionice.exp
+++ /dev/null
@@ -1,18 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "ionice -"
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions/rtcwake.exp b/test/lib/completions/rtcwake.exp
deleted file mode 100644
index 21c05eab..00000000
--- a/test/lib/completions/rtcwake.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-proc setup {} {
-    save_env
-}
-
-
-proc teardown {} {
-    assert_env_unmodified
-}
-
-
-setup
-
-
-assert_complete_any "rtcwake "
-
-
-sync_after_int
-
-
-teardown