[debian-edu-commits] debian-edu/ 01/01: Move ldap-tools/ldappasswd2 to share/debian-edu-config/tools/ so it ends up in /usr/share/debian-edu-config/tools/ and not in /usr/bin/.

[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 bb091c3cde23c4d8a04e20b445f0dc7219baf46c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Sep 18 17:22:43 2016 +0200

    Move ldap-tools/ldappasswd2 to share/debian-edu-config/tools/ so it ends up in /usr/share/debian-edu-config/tools/ and not in /usr/bin/.
---
 Makefile                                                  | 2 +-
 debian/changelog                                          | 2 ++
 {ldap-tools => share/debian-edu-config/tools}/ldappasswd2 | 0
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 04d95e4..91a5a65 100644
--- a/Makefile
+++ b/Makefile
@@ -228,7 +228,6 @@ LDAPPROGRAMS = \
 	ldap-add-host-to-netgroup \
 	ldap-add-user-to-group \
 	ldap-createuser-krb5 \
-	ldappasswd2 \
 	ldap2netgroup \
 	ldap-debian-edu-install \
 	mkslapdcert \
@@ -363,6 +362,7 @@ install: install-testsuite
 		share/debian-edu-config/tools/ldap2bind-updatezonelist \
 		share/debian-edu-config/tools/ldap-user-clean-attic.sh \
 		share/debian-edu-config/tools/ldapdump.sh \
+		share/debian-edu-config/tools/ldappasswd2 \
 		share/debian-edu-config/tools/locate-syslog-collector \
 		share/debian-edu-config/tools/logoutkill.sh \
 		share/debian-edu-config/tools/ltsp-addfirmware \
diff --git a/debian/changelog b/debian/changelog
index 7746dcf..f18b72b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debian-edu-config (1.912) UNRELEASED; urgency=medium
 
   * Translation updates:
     - Catalan, thanks to René Mérou.
+  * Move ldap-tools/ldappasswd2 to share/debian-edu-config/tools/ so it ends
+    up in /usr/share/debian-edu-config/tools/ and not in /usr/bin/.
 
  -- Holger Levsen <holger at debian.org>  Thu, 15 Sep 2016 22:02:14 +0200
 
diff --git a/ldap-tools/ldappasswd2 b/share/debian-edu-config/tools/ldappasswd2
similarity index 100%
rename from ldap-tools/ldappasswd2
rename to share/debian-edu-config/tools/ldappasswd2

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