[debian-edu-commits] debian-edu/ 03/04: Adjust various files to reflect the KDE framework related changes.

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Tue Feb 13 21:01:22 UTC 2018 

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

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

commit 6c3872abc2f8ddf5e4870176b1a1ee62a86c369b
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Feb 13 21:51:08 2018 +0100

    Adjust various files to reflect the KDE framework related changes.
    
    Makefile
    debian/debian-edu-config.lintian-overrides
    debian/debian-edu-config.maintscript
    debian/debian-edu-config.postinst
    debian/dirs
---
 Makefile                                   | 52 ------------------------------
 debian/debian-edu-config.lintian-overrides |  2 +-
 debian/debian-edu-config.maintscript       | 11 ++++---
 debian/debian-edu-config.postinst          | 34 +++++++++----------
 debian/dirs                                |  2 --
 5 files changed, 22 insertions(+), 79 deletions(-)

diff --git a/Makefile b/Makefile
index 0de4e71..817660f 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,6 @@ SYSCONFFILES = \
 	X11/Xsession.d/06debian-edu-firefox-ltsp \
 	X11/Xsession.d/09debian-edu-missing-home \
 	X11/Xsession.d/10debian-edu-one-login-per-host \
-	desktop-profiles/debian-edu-config.listing \
 	debian-edu/nightkill.conf \
 	debian-edu/pxeinstall.conf \
 	default/munin-node \
@@ -237,37 +236,6 @@ WWWFILES = \
 	logo-trans.png \
 	wpad.dat
 
-KIOSKFILES = \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/kalzium.desktop \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/chguserpw.desktop \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/kmplot.desktop \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/kstars.desktop \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/ooo-impress.desktop \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/ooo-writer.desktop \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/gcompris.desktop \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/gimp-2.2.desktop \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/kgeography.desktop \
-	share/debian-edu/students/share/apps/kdesktop/Desktop/stopmotion.desktop \
-	share/debian-edu/students/share/config/kdeglobals \
-	share/debian-edu/students/share/config/konqiconviewrc \
-	share/debian-edu/students/share/config/uiserverrc \
-	share/debian-edu/students/share/services/update_ksycoca \
-	share/debian-edu/students/share/config/menus/applications.menu \
-	share/debian-edu/students/share/config/menus/kde-applications.menu \
-	share/debian-edu/students/share/applications/kalzium.desktop \
-	share/debian-edu/students/share/applications/kbruch.desktop \
-	share/debian-edu/students/share/applications/klatin.desktop \
-	share/debian-edu/students/share/applications/kmplot.desktop \
-	share/debian-edu/students/share/applications/kpercentage.desktop \
-	share/debian-edu/students/share/applications/kstars.desktop \
-	share/debian-edu/students/share/applications/kturtle.desktop \
-	share/debian-edu/students/share/applications/kvoctrain.desktop \
-	share/debian-edu/students/share/applications/kwordquiz.desktop \
-	share/debian-edu/students/share/applications/oocalc.desktop \
-	share/debian-edu/students/share/applications/ooimpress.desktop \
-	share/debian-edu/students/share/applications/oowriter.desktop  \
-	share/debian-edu/root/share/apps/kdesktop/Desktop/tjener.desktop
-
 all:
 	$(MAKE) -C www
 
@@ -391,26 +359,6 @@ install: install-testsuite
 		$(INSTALL_DATA) $$f $(DESTDIR)/usr/$$f ; \
 	done
 
-	set -e ; for f in share/debian-edu/common/share/config/kcookiejarrc \
-		share/debian-edu/common/share/apps/kicker/default-apps \
-		share/debian-edu/common/share/config/artsmessagerc \
-		share/debian-edu/common/share/config/kdeglobals \
-		share/debian-edu/common/share/config/kdeprintrc \
-		share/debian-edu/common/share/config/kpersonalizerrc \
-		share/debian-edu/common/share/config/konquerorrc \
-		share/debian-edu/common/share/config/kickoffrc \
-		share/debian-edu/common/share/config/nepomukserverrc \
-		share/debian-edu/networked-kde3/share/config/kioslaverc \
-		share/debian-edu/networked-kde3/share/config/adept_notifierrc \
-		share/debian-edu/networked-kde3/share/config/networkmanagementrc \
-	; do \
-		$(INSTALL_DATA) $$f $(DESTDIR)/usr/$$f ; \
-	done
-
-	set -e ; for f in $(KIOSKFILES) ; do \
-		$(INSTALL_DATA) "$$f" "$(DESTDIR)/usr/$$f" ; \
-	done
-
 	set -e ; for f in \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings \
diff --git a/debian/debian-edu-config.lintian-overrides b/debian/debian-edu-config.lintian-overrides
index 204c9c7..c046caa 100644
--- a/debian/debian-edu-config.lintian-overrides
+++ b/debian/debian-edu-config.lintian-overrides
@@ -3,7 +3,7 @@ debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/f
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/hostname
 debian-edu-config binary: script-not-executable etc/dhcp/dhclient-exit-hooks.d/wpad-proxy-update
 debian-edu-config binary: command-with-path-in-maintainer-script postinst:51 /usr/bin/etckeeper
-debian-edu-config binary: command-with-path-in-maintainer-script postinst:287 /usr/bin/etckeeper
+debian-edu-config binary: command-with-path-in-maintainer-script postinst:284 /usr/bin/etckeeper
 debian-edu-config binary: non-standard-apache2-configuration-name debian-edu-config-doc.conf != debian-edu-config.conf
 debian-edu-config binary: debconf-is-not-a-registry usr/bin/ldap-debian-edu-install
 debian-edu-config binary: debconf-is-not-a-registry usr/share/debian-edu-config/d-i/finish-install
diff --git a/debian/debian-edu-config.maintscript b/debian/debian-edu-config.maintscript
index 83706ff..0e1f0d2 100644
--- a/debian/debian-edu-config.maintscript
+++ b/debian/debian-edu-config.maintscript
@@ -4,14 +4,15 @@ mv_conffile /etc/apache2/conf.d/debian-edu-config-doc /etc/apache2/conf-availabl
 rm_conffile /etc/cfengine/debian-edu/cf.pdns 1.811
 rm_conffile /etc/insserv.conf.d/debian-edu-config 1.811
 rm_conffile /etc/powerdns/pdns.d/pdns-debian-edu.conf 1.811
+rm_conffile /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp 1.818+deb8u1
+rm_conffile /etc/apt/apt.conf.d/99-edu-prefer-iceweasel 1.818+deb8u1
+rm_conffile /etc/init.d/iceweasel-ldapconf 1.818+deb8u1
+rm_conffile /etc/cfengine/debian-edu/cf.iceweasel 1.818+deb8u1
+rm_conffile /usr/share/debian-edu-config/iceweacel-networked-prefs.js 1.818+deb8u1
 rm_conffile /etc/cfengine/debian-edu/cf.kdm 1.906
 rm_conffile /etc/insserv/overrides/kdm 1.906
 rm_conffile /etc/ldap/slapd-debian-edu.conf 1.911
 rm_conffile /etc/ldap/slapd-lenny_debian-edu.conf 1.911
 rm_conffile /etc/cfengine3/debian-edu/cf.pki 2.10.19
 rm_conffile /etc/cfengine3/debian-edu/cf.thunderbird 2.10.19
-rm_conffile /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp 1.818+deb8u1
-rm_conffile /etc/apt/apt.conf.d/99-edu-prefer-iceweasel 1.818+deb8u1
-rm_conffile /etc/init.d/iceweasel-ldapconf 1.818+deb8u1
-rm_conffile /etc/cfengine/debian-edu/cf.iceweasel 1.818+deb8u1
-rm_conffile /usr/share/debian-edu-config/iceweacel-networked-prefs.js 1.818+deb8u1
+rm_conffile /etc/desktop-profiles/debian-edu-config.listing 2.10.22
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index c794597..59efbb0 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -106,25 +106,6 @@ if [ -f /etc/debian-edu/config ] && egrep -q "(LTSP-Server|Thin-Client-Server)"
 	fi
 fi
 
-# Install the file kde-user-profile if it does not exist to ensure
-# we can use our kiosk modes
-KIOSK_MAP_FILE="/etc/kde-user-profile"
-KIOSK_CONFIG_FILE="/etc/kderc"
-if [ ! -e "$KIOSK_MAP_FILE" ] ; then
-        update-ini-file $KIOSK_MAP_FILE 'General' 'groups' 'students,admins,root'
-        update-ini-file $KIOSK_MAP_FILE 'Groups' 'students' 'debian_edu_pupils'
-        update-ini-file $KIOSK_MAP_FILE 'Groups' 'admins' 'debian_edu_root'
-        update-ini-file $KIOSK_MAP_FILE 'Groups' 'root' 'debian_edu_root'
-fi
-
-if [ ! -e "$KIOSK_CONFIG_FILE" ] ; then
-        update-ini-file $KIOSK_CONFIG_FILE 'Directories' 'userProfileMapFile' '/etc/kde-user-profile'
-        update-ini-file $KIOSK_CONFIG_FILE 'Directories-debian_edu_pupils' 'ProfileDescription' 'Debian-Edu Profile for pupils'
-        update-ini-file $KIOSK_CONFIG_FILE 'Directories-debian_edu_pupils' 'prefixes' '/usr/share/debian-edu/students'
-        update-ini-file $KIOSK_CONFIG_FILE 'Directories-debian_edu_root' 'ProfileDescription' 'Debian-Edu Profile for root'
-        update-ini-file $KIOSK_CONFIG_FILE 'Directories-debian_edu_root' 'prefixes' '/usr/share/debian-edu/root'
-fi
-
 case "$1" in
 configure)
     if dpkg --compare-versions "$2" le "1.929" && dpkg --compare-versions "$2" ge "1.926" && \
@@ -202,6 +183,21 @@ configure)
 	rm /etc/samba/smbldap-machineadd-gosa
     fi
 
+    if dpkg --compare-versions "$2" le "2.10.22" ; then
+        if [ -d /usr/share/debian-edu/common ] ; then
+	    rm -rf /usr/share/debian-edu/common
+        fi
+        if [ -d /usr/share/debian-edu/networked-kde3 ] ; then
+	    rm -rf /usr/share/debian-edu/networked-kde3
+        fi
+        if [ -d /usr/share/debian-edu/root ] ; then
+	    rm -rf /usr/share/debian-edu/root
+        fi
+        if [ -d /usr/share/debian-edu/students ] ; then
+	    rm -rf /usr/share/debian-edu/students
+        fi
+    fi
+
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf
     chown root:root /etc/sssd/sssd-debian-edu.conf
diff --git a/debian/dirs b/debian/dirs
index 35f6cff..7527c48 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -21,7 +21,5 @@ etc/X11/Xsession.d
 usr/bin
 usr/share/debian-edu-config/tools
 usr/share/doc/debian-edu-config
-usr/share/debian-edu/common/share/config
-usr/share/debian-edu/common/share/mimelnk/applnk
 usr/share/man
 usr/share/man/man8

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

More information about the debian-edu-commits mailing list