[debian-edu-commits] debian-edu/ 01/01: Provide/improve multi-distro (legacy) support. Provide README.md file with instruction for package maintainers.
Mike Gabriel
sunweaver at debian.org
Mon Nov 16 09:44:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository educlient.
commit d50197f6bf74f6122787c8d1d556ebe37869ac04
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Nov 16 10:43:50 2015 +0100
Provide/improve multi-distro (legacy) support. Provide README.md file with instruction for package maintainers.
---
README.md | 95 ++++++++++++++++++++++
debian/changelog | 10 ++-
debian/copyright | 64 +++++++++------
debian/educlient.postinst | 8 +-
debian/educlient.prerm | 8 --
.../dispatcher.d/02debian-edu-config | 0
{etc-common => etc-debian-unstable}/auto.master | 0
{etc-common => etc-debian-unstable}/auto.misc | 0
{etc-common => etc-debian-unstable}/auto.net | 0
{etc-common => etc-debian-unstable}/auto.smb | 0
.../autofs_ldap_auth.conf | 0
{etc-common => etc-debian-unstable}/default/autofs | 0
.../default/nfs-common | 0
{etc-common => etc-debian-unstable}/idmapd.conf | 0
.../init.d/fetch-ldap-cert | 0
{etc-common => etc-debian-unstable}/krb5.conf | 0
{etc-common => etc-debian-unstable}/ldap/ldap.conf | 0
.../network/if-up.d/autofs | 0
{etc-common => etc-debian-unstable}/nslcd.conf | 0
{etc-common => etc-debian-unstable}/nsswitch.conf | 0
.../Debian/7/.placeholder | 0
.../Debian/7/idmapd.conf | 0
.../Debian/8/.placeholder | 0
.../Debian/9}/.paceholder | 0
.../LinuxMint/17.1/.placeholder | 0
.../LinuxMint/17.2/.placeholder | 0
.../LinuxMint/latest}/.placeholder | 0
etc-distrib-legacy/LinuxMint/latest/default/autofs | 1 +
.../LinuxMint/latest/init/fetch-ldap-cert.conf | 1 +
.../Ubuntu/12.04}/.placeholder | 0
.../Ubuntu/12.04}/idmapd.conf | 0
.../Ubuntu/14.04}/.placeholder | 0
.../Ubuntu/latest}/.placeholder | 0
.../Ubuntu/latest}/default/autofs | 0
.../Ubuntu/latest}/init/fetch-ldap-cert.conf | 0
etc-distrib/LinuxMint/17.1/default/autofs | 1 -
.../LinuxMint/17.1/init/fetch-ldap-cert.conf | 1 -
etc-distrib/LinuxMint/17.2/default/autofs | 1 -
.../LinuxMint/17.2/init/fetch-ldap-cert.conf | 1 -
etc-distrib/Ubuntu/14.04/init/fetch-ldap-cert.conf | 1 -
40 files changed, 144 insertions(+), 48 deletions(-)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c0e6427
--- /dev/null
+++ b/README.md
@@ -0,0 +1,95 @@
+# Maintaining the cross-distro Edu Client package #
+
+## Introduction ##
+
+This package provides configuration files and installation scripts for
+turning a Debian / Ubuntu / Linux Mint /LMDE workstation into a Debian
+Edu network client.
+
+This package provides legacy support for previous Debian/Ubuntu/Linux
+Mint/LMDE versions and shall always do so.
+
+However, this makes the maintenance of the Edu Client package a little
+bit tricky. This package needs to assume upcoming changes in Debian
+derivative distributions and adapt to them before that derivative distro
+becomes released. A post-release upload of this package to a Debian
+derivative distribution is very unlikely and the package's design tries
+to avoid this becoming necessary.
+
+## Package not working on your distribution (version) ##
+
+... for users of this package.
+
+Support distributions are:
+
+ * Debian (since Debian 7 aka wheezy)
+ * Ubuntu (since Ubuntu 12.04 aka precise)
+ * Linux Mint (since Linux Mint 17.1 aka Rebecca)
+ * LMDE (since LMDE 2 aka Betsy)
+
+The Edu Client package will _only_ support LTS distributions. Don't even
+try this package on non-LTS distributions. You are likely to fail. If you
+use a non-LTS Linux distro, please start scratching your head and ask
+yourself why you do such silly things.
+
+If this package is broken in your Debian derivative LTS distribution,
+please try obtaining this package from Debian unstable directly and (if a
+newer version is available in Debian unstable) check if educlient from
+Debian unstable fixes observed issues on your system.
+
+If using the package version from Debian unstable does not work either,
+please get in touch with us developers.
+
+## The maintenance concept ##
+
+... for package maintainers.
+
+We assume that all derivative Debian distros are derived from Debian
+unstable. Thus, if our package works on Debian testing/unstable, it is
+very likely that it will work on the Debian derivative distribution.
+
+However, we also want to provide legacy support for older distribution
+versions, so package maintainers should follow the below workflow:
+
+ 1. Adapt this package to changes in Debian unstable via maintaining
+ configuration files in the etc-debian-unstable/ folder of this
+ package.
+
+ 2. If the made change(s) modify any of the configuration files shipped
+ in the educlient package, provide an old copy of that configuration
+ file in
+
+ ´´´
+ etc-distrib-legacy/<distrib>/<version>
+ ´´´
+
+ Provide that legacy configuration file version for all distributions
+ and all distribution versions that are older than the next upcoming
+ releases of those distributions. (I.e., provide a copy of that old
+ file version in all directories under etc-distrib-legacy/.
+
+ 3. Please use symlinks for referencing the same file version in the
+ etc-distrib-legacy/ folder.
+
+ If files in Linux Mint and Ubuntu match, please place the file in
+ one of the Ubuntu subfolders and symlink from Linux Mint to Ubuntu.
+
+ If files in LMDE and Debian match, please place the file in
+ one of the Debian subfolders and symlink from LMDE to Debian.
+
+ Symlinks in etc-distrib-legacy/ folder: files may be symlinked.
+ DON'T symlink folders.
+
+ 4. If there are configuration files that are only specific to one or
+ several distribution (e.g. upstart configuration files in Ubuntu
+ and Linux Mint), please place those configuration files into the
+ etc-distrib-legacy/<distrib>/latest/ subfolder.
+
+## Questions / Feedback ##
+
+If you have any questions, please contact Mike Gabriel / Giorgio Pioda
+via the Debian Edu mailinglist: https://lists.debian.org/debian-edu.
+
+If you want to give feedback on this package (i.e., report observed
+bugs), please use the Debian bugtracker for package "educlient". Thanks.
+
diff --git a/debian/changelog b/debian/changelog
index 6355ce8..822344f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,12 +9,14 @@ educlient (0.6-1) UNRELEASED; urgency=low
* Update Vcs-* fields.
[ Mike Gabriel ]
- * Move etc/ files to etc-common/.
- * Add special idmapd.conf for Debian 7.
- * Provide fetch-ldap-cert upstart init script for Ubuntu 14.04 only.
+ * Move etc/ files to etc-debian-unstable/.
+ * Provide multi-distro (legacy) support.
+ * Add special idmapd.conf for Debian 7 and Ubuntu 12.04.
+ * Provide fetch-ldap-cert upstart init script for Ubuntu and
+ Linux Mint only.
* Rename debian/install to debian/educlient.install.
* Provide upstream script for Ubuntu 12.04 and 14.04.
- * Fix file permissions of exectuable scripts.
+ * Fix file permissions of executable scripts.
* debian/control:
+ Don't use Pre-Depends, Depends is sufficient.
+ Add myself to Uploaders: field.
diff --git a/debian/copyright b/debian/copyright
index e95d160..d2b055e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,38 +6,48 @@ Source: http://anonscm.debian.org/cgit/debian-edu/upstream/educlient.git/
Files: usr/share/perl5/Debian/Edu.pm
usr/bin/ldap-server-getcert
usr/bin/debian-edu-ldapserver
- etc-common/network/if-up.d/autofs
- etc-common/NetworkManager/dispatcher.d/02debian-edu-config
- etc-common/init.d/fetch-ldap-cert
+ etc-debian-unstable/network/if-up.d/autofs
+ etc-debian-unstable/NetworkManager/dispatcher.d/02debian-edu-config
+ etc-debian-unstable/init.d/fetch-ldap-cert
Copyright: 2001-2015, Petter Reinholdtsen <pere at hungry.com>
2012-2015, Giorgio Pioda <gfwp at ticino.com>
2015, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
License: GPL-2+
-Files: etc-common/nsswitch.conf
- etc-common/auto.smb
- etc-common/ldap/ldap.conf
- etc-common/krb5.conf
- etc-common/auto.misc
- etc-common/default/nfs-common
- etc-common/default/autofs
- etc-common/NetworkManager/dispatcher.d
- etc-common/nslcd.conf
- etc-common/idmapd.conf
- etc-common/autofs_ldap_auth.conf
- etc-common/auto.master
- etc-common/auto.net
- etc-distrib/Debian/8/.placeholder
- etc-distrib/Debian/unstable/.paceholder
- etc-distrib/Debian/7/.placeholder
- etc-distrib/Debian/7/idmapd.conf
- etc-distrib/LinuxMint/17.2/.placeholder
- etc-distrib/LinuxMint/17.1/.placeholder
- etc-distrib/LinuxMint/17.1/default/autofs
- etc-distrib/Ubuntu/14.04/.placeholder
- etc-distrib/Ubuntu/14.04/default/autofs
- etc-distrib/Ubuntu/12.04/.placeholder
- etc-distrib/Ubuntu/12.04/init/fetch-ldap-cert.conf
+Files: etc-debian-unstable/nsswitch.conf
+ etc-debian-unstable/auto.smb
+ etc-debian-unstable/ldap/ldap.conf
+ etc-debian-unstable/krb5.conf
+ etc-debian-unstable/auto.misc
+ etc-debian-unstable/default/nfs-common
+ etc-debian-unstable/default/autofs
+ etc-debian-unstable/NetworkManager/dispatcher.d
+ etc-debian-unstable/nslcd.conf
+ etc-debian-unstable/idmapd.conf
+ etc-debian-unstable/autofs_ldap_auth.conf
+ etc-debian-unstable/auto.master
+ etc-debian-unstable/auto.net
+ etc-distrib-legacy/Debian/9/.paceholder
+ etc-distrib-legacy/Debian/8/.placeholder
+ etc-distrib-legacy/Debian/7/.placeholder
+ etc-distrib-legacy/Debian/7/idmapd.conf
+ etc-distrib-legacy/LinuxMint/latest/.placeholder
+ etc-distrib-legacy/LinuxMint/17.2/.placeholder
+ etc-distrib-legacy/LinuxMint/17.1/.placeholder
+ etc-distrib-legacy/LinuxMint/17.1/default/autofs
+ etc-distrib-legacy/Ubuntu/latest/.placeholder
+ etc-distrib-legacy/Ubuntu/latest/default/autofs
+ etc-distrib-legacy/Ubuntu/latest/init/fetch-ldap-cert.conf
+ etc-distrib-legacy/Ubuntu/14.04/.placeholder
+ etc-distrib-legacy/Ubuntu/14.04/default/autofs
+ etc-distrib-legacy/Ubuntu/14.04/init/fetch-ldap-cert.conf
+ etc-distrib-legacy/Ubuntu/12.04/.placeholder
+ etc-distrib-legacy/Ubuntu/12.04/default/autofs
+ etc-distrib-legacy/Ubuntu/12.04/idmapd.conf
+ etc-distrib-legacy/Ubuntu/12.04/init/fetch-ldap-cert.conf
+ AUTHORS.txt
+ COPYING
+ README.md
Copyright: 2001-2015, Petter Reinholdtsen <pere at hungry.com>
2012-2015, Giorgio Pioda <gfwp at ticino.com>
2015, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
diff --git a/debian/educlient.postinst b/debian/educlient.postinst
index e1733e4..71c32e5 100755
--- a/debian/educlient.postinst
+++ b/debian/educlient.postinst
@@ -53,9 +53,9 @@ if [ -n "${USERN}" ]; then
fi
# Divert configuration files
-ETC_DISTRIB_VERSION="/etc/educlient/etc-distrib/${DISTRIB_ID}/${DISTRIB_RELEASE}"
-ETC_DISTRIB_COMMON="/etc/educlient/etc-distrib/${DISTRIB_ID}/common"
-ETC_COMMON="/etc/educlient/etc-common"
+ETC_DISTRIB_VERSION="/etc/educlient/etc-distrib-legacy/${DISTRIB_ID}/${DISTRIB_RELEASE}"
+ETC_DISTRIB_LATEST="/etc/educlient/etc-distrib-legacy/${DISTRIB_ID}/latest"
+ETC_LATEST="/etc/educlient/etc-debian-unstable"
if [ ! -d ${ETC_DISTRIB_VERSION} ]; then
echo "This Linux distribution and/or version (${DISTRIB_ID} ${DISTRIB_RELEASE} is not supported by this package."
@@ -66,7 +66,7 @@ mkdir -p /etc/debian-edu
echo "" > /etc/debian-edu/educlient.files-diverted
echo "" > /etc/debian-edu/educlient.files-added
-for working_dir in ${ETC_DISTRIB_VERSION} ${ETC_DISTRIB_COMMON} ${ETC_COMMON}; do
+for working_dir in ${ETC_DISTRIB_VERSION} ${ETC_DISTRIB_LATEST} ${ETC_LATEST}; do
if [ ! -d ${working_dir} ]; then
continue
diff --git a/debian/educlient.prerm b/debian/educlient.prerm
index eede331..bc94a56 100755
--- a/debian/educlient.prerm
+++ b/debian/educlient.prerm
@@ -7,14 +7,6 @@ set -xe
# Divert back all the stuff
-if [ -f /etc/os-release ]; then
- . /etc/os-release
-fi
-
-if [ -f /etc/lsb-release ]; then
- . /etc/lsb-release
-fi
-
if [ ! -f /etc/debian-edu/educlient.files-diverted ] && [ ! -f /etc/debian-edu/educlient.files-added ]; then
exit 0
fi
diff --git a/etc-common/NetworkManager/dispatcher.d/02debian-edu-config b/etc-debian-unstable/NetworkManager/dispatcher.d/02debian-edu-config
similarity index 100%
rename from etc-common/NetworkManager/dispatcher.d/02debian-edu-config
rename to etc-debian-unstable/NetworkManager/dispatcher.d/02debian-edu-config
diff --git a/etc-common/auto.master b/etc-debian-unstable/auto.master
similarity index 100%
rename from etc-common/auto.master
rename to etc-debian-unstable/auto.master
diff --git a/etc-common/auto.misc b/etc-debian-unstable/auto.misc
similarity index 100%
rename from etc-common/auto.misc
rename to etc-debian-unstable/auto.misc
diff --git a/etc-common/auto.net b/etc-debian-unstable/auto.net
similarity index 100%
rename from etc-common/auto.net
rename to etc-debian-unstable/auto.net
diff --git a/etc-common/auto.smb b/etc-debian-unstable/auto.smb
similarity index 100%
rename from etc-common/auto.smb
rename to etc-debian-unstable/auto.smb
diff --git a/etc-common/autofs_ldap_auth.conf b/etc-debian-unstable/autofs_ldap_auth.conf
similarity index 100%
rename from etc-common/autofs_ldap_auth.conf
rename to etc-debian-unstable/autofs_ldap_auth.conf
diff --git a/etc-common/default/autofs b/etc-debian-unstable/default/autofs
similarity index 100%
rename from etc-common/default/autofs
rename to etc-debian-unstable/default/autofs
diff --git a/etc-common/default/nfs-common b/etc-debian-unstable/default/nfs-common
similarity index 100%
rename from etc-common/default/nfs-common
rename to etc-debian-unstable/default/nfs-common
diff --git a/etc-common/idmapd.conf b/etc-debian-unstable/idmapd.conf
similarity index 100%
rename from etc-common/idmapd.conf
rename to etc-debian-unstable/idmapd.conf
diff --git a/etc-common/init.d/fetch-ldap-cert b/etc-debian-unstable/init.d/fetch-ldap-cert
similarity index 100%
rename from etc-common/init.d/fetch-ldap-cert
rename to etc-debian-unstable/init.d/fetch-ldap-cert
diff --git a/etc-common/krb5.conf b/etc-debian-unstable/krb5.conf
similarity index 100%
rename from etc-common/krb5.conf
rename to etc-debian-unstable/krb5.conf
diff --git a/etc-common/ldap/ldap.conf b/etc-debian-unstable/ldap/ldap.conf
similarity index 100%
rename from etc-common/ldap/ldap.conf
rename to etc-debian-unstable/ldap/ldap.conf
diff --git a/etc-common/network/if-up.d/autofs b/etc-debian-unstable/network/if-up.d/autofs
similarity index 100%
rename from etc-common/network/if-up.d/autofs
rename to etc-debian-unstable/network/if-up.d/autofs
diff --git a/etc-common/nslcd.conf b/etc-debian-unstable/nslcd.conf
similarity index 100%
rename from etc-common/nslcd.conf
rename to etc-debian-unstable/nslcd.conf
diff --git a/etc-common/nsswitch.conf b/etc-debian-unstable/nsswitch.conf
similarity index 100%
rename from etc-common/nsswitch.conf
rename to etc-debian-unstable/nsswitch.conf
diff --git a/etc-distrib/Debian/7/.placeholder b/etc-distrib-legacy/Debian/7/.placeholder
similarity index 100%
copy from etc-distrib/Debian/7/.placeholder
copy to etc-distrib-legacy/Debian/7/.placeholder
diff --git a/etc-distrib/Debian/7/idmapd.conf b/etc-distrib-legacy/Debian/7/idmapd.conf
similarity index 100%
copy from etc-distrib/Debian/7/idmapd.conf
copy to etc-distrib-legacy/Debian/7/idmapd.conf
diff --git a/etc-distrib/Debian/8/.placeholder b/etc-distrib-legacy/Debian/8/.placeholder
similarity index 100%
rename from etc-distrib/Debian/8/.placeholder
rename to etc-distrib-legacy/Debian/8/.placeholder
diff --git a/etc-distrib/Debian/unstable/.paceholder b/etc-distrib-legacy/Debian/9/.paceholder
similarity index 100%
rename from etc-distrib/Debian/unstable/.paceholder
rename to etc-distrib-legacy/Debian/9/.paceholder
diff --git a/etc-distrib/LinuxMint/17.1/.placeholder b/etc-distrib-legacy/LinuxMint/17.1/.placeholder
similarity index 100%
rename from etc-distrib/LinuxMint/17.1/.placeholder
rename to etc-distrib-legacy/LinuxMint/17.1/.placeholder
diff --git a/etc-distrib/LinuxMint/17.2/.placeholder b/etc-distrib-legacy/LinuxMint/17.2/.placeholder
similarity index 100%
rename from etc-distrib/LinuxMint/17.2/.placeholder
rename to etc-distrib-legacy/LinuxMint/17.2/.placeholder
diff --git a/etc-distrib/Ubuntu/12.04/.placeholder b/etc-distrib-legacy/LinuxMint/latest/.placeholder
similarity index 100%
rename from etc-distrib/Ubuntu/12.04/.placeholder
rename to etc-distrib-legacy/LinuxMint/latest/.placeholder
diff --git a/etc-distrib-legacy/LinuxMint/latest/default/autofs b/etc-distrib-legacy/LinuxMint/latest/default/autofs
new file mode 120000
index 0000000..d5cd2ca
--- /dev/null
+++ b/etc-distrib-legacy/LinuxMint/latest/default/autofs
@@ -0,0 +1 @@
+../../../Ubuntu/latest/default/autofs
\ No newline at end of file
diff --git a/etc-distrib-legacy/LinuxMint/latest/init/fetch-ldap-cert.conf b/etc-distrib-legacy/LinuxMint/latest/init/fetch-ldap-cert.conf
new file mode 120000
index 0000000..4e77db5
--- /dev/null
+++ b/etc-distrib-legacy/LinuxMint/latest/init/fetch-ldap-cert.conf
@@ -0,0 +1 @@
+../../../Ubuntu/latest/init/fetch-ldap-cert.conf
\ No newline at end of file
diff --git a/etc-distrib/Ubuntu/14.04/.placeholder b/etc-distrib-legacy/Ubuntu/12.04/.placeholder
similarity index 100%
rename from etc-distrib/Ubuntu/14.04/.placeholder
rename to etc-distrib-legacy/Ubuntu/12.04/.placeholder
diff --git a/etc-distrib/Debian/7/idmapd.conf b/etc-distrib-legacy/Ubuntu/12.04/idmapd.conf
similarity index 100%
rename from etc-distrib/Debian/7/idmapd.conf
rename to etc-distrib-legacy/Ubuntu/12.04/idmapd.conf
diff --git a/etc-distrib/Debian/7/.placeholder b/etc-distrib-legacy/Ubuntu/14.04/.placeholder
similarity index 100%
copy from etc-distrib/Debian/7/.placeholder
copy to etc-distrib-legacy/Ubuntu/14.04/.placeholder
diff --git a/etc-distrib/Debian/7/.placeholder b/etc-distrib-legacy/Ubuntu/latest/.placeholder
similarity index 100%
rename from etc-distrib/Debian/7/.placeholder
rename to etc-distrib-legacy/Ubuntu/latest/.placeholder
diff --git a/etc-distrib/Ubuntu/14.04/default/autofs b/etc-distrib-legacy/Ubuntu/latest/default/autofs
similarity index 100%
rename from etc-distrib/Ubuntu/14.04/default/autofs
rename to etc-distrib-legacy/Ubuntu/latest/default/autofs
diff --git a/etc-distrib/Ubuntu/12.04/init/fetch-ldap-cert.conf b/etc-distrib-legacy/Ubuntu/latest/init/fetch-ldap-cert.conf
similarity index 100%
rename from etc-distrib/Ubuntu/12.04/init/fetch-ldap-cert.conf
rename to etc-distrib-legacy/Ubuntu/latest/init/fetch-ldap-cert.conf
diff --git a/etc-distrib/LinuxMint/17.1/default/autofs b/etc-distrib/LinuxMint/17.1/default/autofs
deleted file mode 120000
index 4e29007..0000000
--- a/etc-distrib/LinuxMint/17.1/default/autofs
+++ /dev/null
@@ -1 +0,0 @@
-../../../Ubuntu/14.04/default/autofs
\ No newline at end of file
diff --git a/etc-distrib/LinuxMint/17.1/init/fetch-ldap-cert.conf b/etc-distrib/LinuxMint/17.1/init/fetch-ldap-cert.conf
deleted file mode 120000
index c3f2acb..0000000
--- a/etc-distrib/LinuxMint/17.1/init/fetch-ldap-cert.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../../Ubuntu/14.04/init/fetch-ldap-cert.conf
\ No newline at end of file
diff --git a/etc-distrib/LinuxMint/17.2/default/autofs b/etc-distrib/LinuxMint/17.2/default/autofs
deleted file mode 120000
index 4e29007..0000000
--- a/etc-distrib/LinuxMint/17.2/default/autofs
+++ /dev/null
@@ -1 +0,0 @@
-../../../Ubuntu/14.04/default/autofs
\ No newline at end of file
diff --git a/etc-distrib/LinuxMint/17.2/init/fetch-ldap-cert.conf b/etc-distrib/LinuxMint/17.2/init/fetch-ldap-cert.conf
deleted file mode 120000
index c3f2acb..0000000
--- a/etc-distrib/LinuxMint/17.2/init/fetch-ldap-cert.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../../Ubuntu/14.04/init/fetch-ldap-cert.conf
\ No newline at end of file
diff --git a/etc-distrib/Ubuntu/14.04/init/fetch-ldap-cert.conf b/etc-distrib/Ubuntu/14.04/init/fetch-ldap-cert.conf
deleted file mode 120000
index f3470eb..0000000
--- a/etc-distrib/Ubuntu/14.04/init/fetch-ldap-cert.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../../Ubuntu/12.04/init/fetch-ldap-cert.conf
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/educlient.git
More information about the debian-edu-commits
mailing list