8 files changed, 31 insertions, 26 deletions
diff --git a/README.itzks-common b/README.itzks-common
new file mode 100644
index 0000000..f5621a8
--- /dev/null
+++ b/README.itzks-common
@@ -0,0 +1,7 @@
+IT-Zukunft Schule: Common file add-ons for Debian Edu machines
+------------------ 
+
+This package pulls in config files and other files for
+Debian Edu machines running in the ITZkS context.
+
+Mike Gabriel, 20121102
+\ No newline at end of file
diff --git a/README.itzks-config b/README.itzks-config
deleted file mode 100644
index 1b1fd81..0000000
--- a/README.itzks-config
+++ /dev/null
@@ -1,7 +0,0 @@
-IT-Zukunft Schule: KVM hosts (virt-man-XX.backbone)
------------------- 
-
-This package pulls in software required for running a
-Debian system as virtual machine host system.
-
-Mike Gabriel, 20120727
-\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index fc50d99..a25d98c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+itzks-systems (2012.11.02.2) UNRELEASED; urgency=low
+
+  * Rename of bin:package: itzks-systems-config -> itzks-systems-common.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 02 Nov 2012 10:45:06 +0100
+
 itzks-systems (2012.11.02.1) squeeze-backports; urgency=low
 
   * dirvish templates:
diff --git a/debian/control b/debian/control
index 908164b..7e3e341 100644
--- a/debian/control
+++ b/debian/control
@@ -11,12 +11,17 @@ Vcs-Git: git://code.it-zukunft-schule.de/itzks-systems-virtman.git
 Vcs-Browser: http://code.it-zukunft-schule.de/gitweb?p=itzks-systems-virtman.git;a=summary
 Standards-Version: 3.9.3
 
-Package: itzks-systems-config
+Package: itzks-systems-common
 Architecture: all
+Replaces:
+ itzks-systems-config,
+Breaks:
+ itzks-systems-config,
 Depends:
  ${misc:Depends},
 Description: Configuration for ITZkS Systems
- Set of configuration parameters relevant to ITZkS systems.
+ Set of configuration parameters and common files
+ relevant to ITZkS systems.
 
 Package: itzks-systems-virtman
 Architecture: all
@@ -125,7 +130,7 @@ Replaces:
 Breaks:
  itzks-packages-mainserver,
 Depends:
- itzks-systems-config,
+ itzks-systems-common,
  ${misc:Depends},
  acl,
  apt-file,
@@ -172,7 +177,7 @@ Replaces:
 Breaks:
  itzks-packages-disklserver,
 Depends:
- itzks-systems-config,
+ itzks-systems-common,
  ${misc:Depends},
  arj,
  atftpd,
@@ -212,7 +217,7 @@ Replaces:
 Breaks:
  itzks-packages-diskless,
 Depends:
- itzks-systems-config,
+ itzks-systems-common,
  ${misc:Depends},
  arc-colors,
  arj,
@@ -367,7 +372,7 @@ Replaces:
 Breaks:
  itzks-packages-terminalserver,
 Depends:
- itzks-systems-config,
+ itzks-systems-common,
  ${misc:Depends},
  arc-colors,
  arj,
@@ -522,7 +527,7 @@ Description: Profiling for ITZkS Terminal Server Systems
 Package: itzks-systems-workstation
 Architecture: all
 Depends:
- itzks-systems-config,
+ itzks-systems-common,
  ${misc:Depends},
  arc-colors,
  arj,
diff --git a/debian/itzks-systems-common.docs b/debian/itzks-systems-common.docs
new file mode 100644
index 0000000..a45cd35
--- /dev/null
+++ b/debian/itzks-systems-common.docs
@@ -0,0 +1 @@
+README.itzks-common
diff --git a/debian/itzks-systems-config.install b/debian/itzks-systems-common.install
index ba1c675..ba1c675 100644
--- a/debian/itzks-systems-config.install
+++ b/debian/itzks-systems-common.install
diff --git a/debian/itzks-systems-config.postinst b/debian/itzks-systems-common.preinst
index 9f7826a..ea933cf 100755
--- a/debian/itzks-systems-config.postinst
+++ b/debian/itzks-systems-common.preinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for itzks-systems-config
+# preinst script for x2goserver
 #
 # see: dh_installdeb(1)
 
@@ -18,20 +18,15 @@ set -e
 # the debian-policy package
 
 case "$1" in
-	configure)
+	install|upgrade)
 		if ! dpkg-divert --list | grep passwd.gnu 1>/dev/null 2>/dev/null; then
-			dpkg-divert --add --rename --divert /usr/bin/passwd.gnu /usr/bin/passwd
-			update-alternatives --install /usr/bin/passwd passwd /usr/bin/passwd.gnu 40
-			update-alternatives --install /usr/bin/passwd passwd /usr/bin/passwd.itzks 20
-			update-alternatives --set passwd /usr/bin/passwd.itzks
+			dpkg-divert --add --rename --package itzks-systems-common --divert /usr/bin/passwd.gnu /usr/bin/passwd
 		fi
 		;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
+	abort-upgrade)
 		;;
-
 	*)
-		echo "postinst called with unknown argument \`$1'" >&2
+		echo "preinst called with unknown argument \`$1'" >&2
 		exit 1
 		;;
 esac
@@ -42,4 +37,3 @@ esac
 #DEBHELPER#
 
 exit 0
-
diff --git a/debian/itzks-systems-config.docs b/debian/itzks-systems-config.docs
deleted file mode 100644
index c818d5c..0000000
--- a/debian/itzks-systems-config.docs
+++ /dev/null
@@ -1 +0,0 @@
-README.itzks-config