[debian-edu-commits] debian-edu/ 01/01: Move debian-edu-ltsp-audiodivert, which is only used by our maintainer scripts, from /usr/bin to /usr/share/debian-edu-config/tools/.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-config.

commit 3938e91f5d1628a16dd63ba5961297aa702fba89
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Aug 3 20:50:16 2016 +0200

    Move debian-edu-ltsp-audiodivert, which is only used by our maintainer scripts, from /usr/bin to /usr/share/debian-edu-config/tools/.
---
 Makefile                                                            | 2 +-
 debian/changelog                                                    | 2 ++
 debian/debian-edu-config.postrm                                     | 4 ++--
 debian/debian-edu-config.prerm                                      | 4 ++--
 {sbin => share/debian-edu-config/tools}/debian-edu-ltsp-audiodivert | 0
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 85b3c24..7a6600d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ PROGS = \
 SPROGS = cfengine-debian-edu \
 	debian-edu-fsautoresize \
 	debian-edu-ltsp \
-	debian-edu-ltsp-audiodivert \
 	debian-edu-nscd-netgroup-cache \
 	debian-edu-pxeinstall \
 	debian-edu-restart-services \
@@ -396,6 +395,7 @@ install: install-testsuite
 		share/debian-edu-config/tools/debian-edu-dovecot-create-cert \
 		share/debian-edu-config/tools/migrate-squid-to-squid3 \
 		share/debian-edu-config/tools/ldap-server-getcert \
+		share/debian-edu-config/tools/debian-edu-ltsp-audiodivert \
 		share/debian-edu-config/ltspfs-mounter-kde \
 		share/ltsp/get-ldap-ltsp-config \
 		share/ltsp/init-ltsp.d/08-edu-hostname \
diff --git a/debian/changelog b/debian/changelog
index e907c02..45525e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debian-edu-config (1.907) UNRELEASED; urgency=medium
 
   * testsuite/hardware and debian/control: remove code depending on removed
     xresprobe package.
+  * Move debian-edu-ltsp-audiodivert, which is only used by our maintainer
+    scripts, from /usr/bin to /usr/share/debian-edu-config/tools/.
 
  -- Holger Levsen <holger at debian.org>  Wed, 03 Aug 2016 18:29:32 +0200
 
diff --git a/debian/debian-edu-config.postrm b/debian/debian-edu-config.postrm
index 1a18620..16783ed 100644
--- a/debian/debian-edu-config.postrm
+++ b/debian/debian-edu-config.postrm
@@ -15,8 +15,8 @@ case "$1" in
 
         # Remove diverts before removing the package
 	if [ remove = "$1" ] \
-	    && [ -x /usr/sbin/debian-edu-ltsp-audiodivert ] ; then
-	    debian-edu-ltsp-audiodivert remove
+	    && [ -x /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert ] ; then
+	    /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert remove
 	fi
 	;;
     purge)
diff --git a/debian/debian-edu-config.prerm b/debian/debian-edu-config.prerm
index 09313ba..ba526f0 100644
--- a/debian/debian-edu-config.prerm
+++ b/debian/debian-edu-config.prerm
@@ -15,8 +15,8 @@ case "$1" in
 
         # Remove diverts before removing the package
 	if [ remove = "$1" ] \
-	    && [ -x /usr/sbin/debian-edu-ltsp-audiodivert ] ; then
-	    debian-edu-ltsp-audiodivert remove
+	    && [ -x /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert ] ; then
+	    /usr/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert remove
 	fi
 	if [ remove = "$1" ] && [ -e /usr/share/pam-configs/edu-nopwdchange ]; then
 	    rm /usr/share/pam-configs/edu-nopwdchange
diff --git a/sbin/debian-edu-ltsp-audiodivert b/share/debian-edu-config/tools/debian-edu-ltsp-audiodivert
similarity index 100%
rename from sbin/debian-edu-ltsp-audiodivert
rename to share/debian-edu-config/tools/debian-edu-ltsp-audiodivert

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git