[debian-edu-commits] debian-edu/ 01/01: Rename education-thin-client-server to education-ltsp-server. (see #588510)
Holger Levsen
holger at layer-acht.org
Fri Dec 2 12:44:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu.
commit db73dbb77f49ac308928c4672487dcbb0c539300
Author: Holger Levsen <holger at layer-acht.org>
Date: Fri Dec 2 13:44:28 2016 +0100
Rename education-thin-client-server to education-ltsp-server. (see #588510)
Make changes needed for renaming the thin-client-server profile to
ltsp-server-profile (see #588510).
Most notably the package education-thin-client-server has been renamed to
education-ltsp-server while education-thin-client-server has been kept as
transitional package.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
debian-edu-tasks.desc | 18 +++++++++---------
debian/changelog | 7 +++++++
debian/control.stub | 8 ++++++++
debian/education-ltsp-server.lintian-overrides | 2 ++
debian/education-thin-client-server.lintian-overrides | 2 --
debian/tests/test-metapkgs | 2 +-
interdepend-proposal.dot | 4 ++--
interdepend.dot | 4 ++--
tasks.ctl | 2 +-
tasks/desktop-other | 2 +-
tasks/{thin-client-server => ltsp-server} | 12 ++++++------
tasks/networked | 2 +-
tasks/networked-common | 2 +-
tasks/workstation | 2 +-
14 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index a383078..79e90ce 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -493,7 +493,7 @@ Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
This metapackage depends on various office and desktop applications
that are useful for teachers and their students.
Relevance: 10
-Test-edu-profile: Workstation Thin-Client-Server Standalone
+Test-edu-profile: Workstation LTSP-Server Standalone
Key:
education-desktop-other
Packages: list
@@ -1388,7 +1388,7 @@ Description: Debian Edu network packages
network installations (with the exception of roaming workstation
and minimal) in the Debian Edu Blend.
Relevance: 10
-Test-edu-profile: Minimal Workstation Main-Server Thin-Client-Server
+Test-edu-profile: Minimal Workstation Main-Server LTSP-Server
Key:
education-networked
Packages: list
@@ -1508,7 +1508,7 @@ Description: Debian Edu common networking packages
network installations (workstation, roaming workstation, minimal
and main-server, but not standalone) in the Debian Edu Blend.
Relevance: 10
-Test-edu-profile: Minimal Workstation Main-Server Thin-Client-Server
+Test-edu-profile: Minimal Workstation Main-Server LTSP-Server
Key:
education-networked-common
Packages: list
@@ -2258,15 +2258,15 @@ Packages: list
alsa-base
acpi-support-base
-Task: education-thin-client-server
+Task: education-ltsp-server
Section: debian-edu
-Description: Debian Edu networked thin client server packages
+Description: Debian Edu networked LTSP server packages
A metapackage containing dependencies for packages required on all
- networked thin client server installations in the Debian Edu Blend.
+ networked LTSP server installations in the Debian Edu Blend.
Relevance: 10
-Test-edu-profile: Thin-Client-Server
+Test-edu-profile: LTSP-Server
Key:
- education-thin-client-server
+ education-ltsp-server
Packages: list
iptables
isc-dhcp-server-ldap
@@ -2608,7 +2608,7 @@ Description: Debian Edu networked workstation packages
networked workstation (thick client) installations in the Debian Edu
Blend.
Relevance: 10
-Test-edu-profile: Workstation Roaming-Workstation Thin-Client-Server
+Test-edu-profile: Workstation Roaming-Workstation LTSP-Server
Key:
education-workstation
Packages: list
diff --git a/debian/changelog b/debian/changelog
index 070345f..66f4c2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ debian-edu (1.916) UNRELEASED; urgency=medium
* Adjust (Graphics|Physics).directory files to use Debian Edu specific icons.
* Use alphabetical order for language entries in the Physics.directory file.
+ [ Holger Levsen ]
+ * Make changes needed for renaming the thin-client-server profile to
+ ltsp-server-profile (see #588510).
+ Most notably the package education-thin-client-server has been renamed to
+ education-ltsp-server while education-thin-client-server has been kept as
+ transitional package.
+
-- Holger Levsen <holger at debian.org> Tue, 29 Nov 2016 09:52:59 +0100
debian-edu (1.915) unstable; urgency=medium
diff --git a/debian/control.stub b/debian/control.stub
index 39300fa..3970a9f 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -38,3 +38,11 @@ Description: Debian Edu menu reorganization
exist in the system and the user has to be a member of one of these two
groups.
+Package: education-thin-client-server
+Architecture: all
+Depends: education-ltsp-server
+Description: transitional package for education-ltsp-server
+ This is a transitional package to get upgrading systems to install the
+ education-ltsp-server package. It can safely be removed once no other package
+ depends on it.
+
diff --git a/debian/education-ltsp-server.lintian-overrides b/debian/education-ltsp-server.lintian-overrides
new file mode 100644
index 0000000..3b219a9
--- /dev/null
+++ b/debian/education-ltsp-server.lintian-overrides
@@ -0,0 +1,2 @@
+education-ltsp-server binary: maintainer-script-empty postrm
+education-ltsp-server binary: maintainer-script-empty preinst
diff --git a/debian/education-thin-client-server.lintian-overrides b/debian/education-thin-client-server.lintian-overrides
deleted file mode 100644
index f77f471..0000000
--- a/debian/education-thin-client-server.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-education-thin-client-server binary: maintainer-script-empty postrm
-education-thin-client-server binary: maintainer-script-empty preinst
diff --git a/debian/tests/test-metapkgs b/debian/tests/test-metapkgs
index 9a855e4..6005101 100644
--- a/debian/tests/test-metapkgs
+++ b/debian/tests/test-metapkgs
@@ -79,7 +79,7 @@ for profile in Minimal Main-Server; do
done
# Then the desktop ones
-for profile in Workstation Roaming-Workstation Thin-Client-Server Standalone; do
+for profile in Workstation Roaming-Workstation LTSP-Server Standalone; do
for desktop in kde gnome lxde xfce mate ; do
DESKTOP="$desktop" PROFILE="$profile" chroot_test
done
diff --git a/interdepend-proposal.dot b/interdepend-proposal.dot
index 358d273..0d1a9cd 100644
--- a/interdepend-proposal.dot
+++ b/interdepend-proposal.dot
@@ -1,7 +1,7 @@
digraph packages {
concentrate=true;
size="30,40";
-"thin-client-server" -> "workstation";
+"ltsp-server" -> "workstation";
"networked" -> "common";
"workstation" -> "networked";
"workstation" -> "<desktop>";
@@ -27,7 +27,7 @@ size="30,40";
"<desktop>" [shape=diamond];
"services" [shape=box];
"logic-games" [shape=box];
-"thin-client-server" [shape=box];
+"ltsp-server" [shape=box];
"desktop-other" [shape=box];
"common" [shape=box];
"music" [shape=box];
diff --git a/interdepend.dot b/interdepend.dot
index 52cf1b8..d490c6b 100644
--- a/interdepend.dot
+++ b/interdepend.dot
@@ -1,7 +1,7 @@
digraph packages {
concentrate=true;
size="30,40";
-"thin-client-server" -> "workstation";
+"ltsp-server" -> "workstation";
"networked" -> "common";
"standalone" -> "common";
"standalone" -> "desktop-other";
@@ -25,7 +25,7 @@ size="30,40";
"<desktop>" [shape=diamond];
"services" [shape=box];
"logic-games" [shape=box];
-"thin-client-server" [shape=box];
+"ltsp-server" [shape=box];
"desktop-other" [shape=box];
"common" [shape=box];
"music" [shape=box];
diff --git a/tasks.ctl b/tasks.ctl
index a93de2b..07bcdcb 100644
--- a/tasks.ctl
+++ b/tasks.ctl
@@ -3,7 +3,7 @@ priority-high:education-networked-common
priority-high:education-networked
priority-high:education-laptop
priority-high:education-main-server
-priority-high:education-thin-client-server
+priority-high:education-ltsp-server
priority-high:education-thin-client
priority-high:education-desktop-other
priority-high:education-workstation
diff --git a/tasks/desktop-other b/tasks/desktop-other
index e47ed63..43e23c9 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -1,7 +1,7 @@
Task: Desktop-other
Section: metapackages
Architecture: any
-Test-edu-profile: Workstation Thin-Client-Server Standalone
+Test-edu-profile: Workstation LTSP-Server Standalone
Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
This metapackage depends on various office and desktop applications
that are useful for teachers and their students.
diff --git a/tasks/thin-client-server b/tasks/ltsp-server
similarity index 87%
rename from tasks/thin-client-server
rename to tasks/ltsp-server
index 5480a25..3a1c5a0 100644
--- a/tasks/thin-client-server
+++ b/tasks/ltsp-server
@@ -1,12 +1,12 @@
-Task: Thin-client-server
+Task: LTSP-server
Section: metapackages
Architecture: any
-Test-edu-profile: Thin-Client-Server
-Description: Debian Edu networked thin client server packages
+Test-edu-profile: LTSP-Server
+Description: Debian Edu networked LTSP server packages
A metapackage containing dependencies for packages required on all
- networked thin client server installations in the Debian Edu Blend.
+ networked LTSP server installations in the Debian Edu Blend.
-Note: This is the list of packages to be installed on a thin client server.
+Note: This is the list of packages to be installed on a LTSP server.
Basis is LTSP versjon 3
Depends: iptables
@@ -61,7 +61,7 @@ Responsible: Patrick Winnertz
NeedConfig: yes
Depends: education-workstation
-Why: Packages which should be present on a thin client server
+Why: Packages which should be present on a LTSP server
Responsible: Ragnar WislÞff
NeedConfig: no
diff --git a/tasks/networked b/tasks/networked
index 072a177..736331e 100644
--- a/tasks/networked
+++ b/tasks/networked
@@ -1,7 +1,7 @@
Task: Networked stationary
Section: metapackages
Architecture: any
-Test-edu-profile: Minimal Workstation Main-Server Thin-Client-Server
+Test-edu-profile: Minimal Workstation Main-Server LTSP-Server
Description: Debian Edu network packages
A metapackage containing dependencies for packages required on
network installations (with the exception of roaming workstation
diff --git a/tasks/networked-common b/tasks/networked-common
index 5b65ad1..72a7656 100644
--- a/tasks/networked-common
+++ b/tasks/networked-common
@@ -1,7 +1,7 @@
Task: Networked
Section: metapackages
Architecture: any
-Test-edu-profile: Minimal Workstation Main-Server Thin-Client-Server
+Test-edu-profile: Minimal Workstation Main-Server LTSP-Server
Description: Debian Edu common networking packages
A metapackage containing dependencies for packages required on all
network installations (workstation, roaming workstation, minimal
diff --git a/tasks/workstation b/tasks/workstation
index 1fef1fe..4bfb998 100644
--- a/tasks/workstation
+++ b/tasks/workstation
@@ -1,7 +1,7 @@
Task: Workstation
Section: metapackages
Architecture: any
-Test-edu-profile: Workstation Roaming-Workstation Thin-Client-Server
+Test-edu-profile: Workstation Roaming-Workstation LTSP-Server
Description: Debian Edu networked workstation packages
A metapackage containing dependencies for packages required on all
networked workstation (thick client) installations in the Debian Edu
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git
More information about the debian-edu-commits
mailing list