From 1d7b63b1d493e8e8d22bad3e550435c86266fce6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 2 Nov 2012 10:46:27 +0100 Subject: Rename of bin:package: itzks-systems-config -> itzks-systems-common. --- README.itzks-common | 7 ++++++ README.itzks-config | 7 ------ debian/changelog | 6 +++++ debian/control | 19 +++++++++------ debian/itzks-systems-common.docs | 1 + debian/itzks-systems-common.install | 5 ++++ debian/itzks-systems-common.preinst | 39 +++++++++++++++++++++++++++++++ debian/itzks-systems-config.docs | 1 - debian/itzks-systems-config.install | 5 ---- debian/itzks-systems-config.postinst | 45 ------------------------------------ 10 files changed, 70 insertions(+), 65 deletions(-) create mode 100644 README.itzks-common delete mode 100644 README.itzks-config create mode 100644 debian/itzks-systems-common.docs create mode 100644 debian/itzks-systems-common.install create mode 100755 debian/itzks-systems-common.preinst delete mode 100644 debian/itzks-systems-config.docs delete mode 100644 debian/itzks-systems-config.install delete mode 100755 debian/itzks-systems-config.postinst 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 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-common.install b/debian/itzks-systems-common.install new file mode 100644 index 0000000..ba1c675 --- /dev/null +++ b/debian/itzks-systems-common.install @@ -0,0 +1,5 @@ +etc/debian-edu/* etc/debian-edu/ +etc/network/* etc/network/ +etc/apt/* etc/apt/ +etc/iceweasel/* etc/iceweasel/ +bin/passwd.itzks usr/bin/ \ No newline at end of file diff --git a/debian/itzks-systems-common.preinst b/debian/itzks-systems-common.preinst new file mode 100755 index 0000000..ea933cf --- /dev/null +++ b/debian/itzks-systems-common.preinst @@ -0,0 +1,39 @@ +#!/bin/sh +# preinst script for x2goserver +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + install|upgrade) + if ! dpkg-divert --list | grep passwd.gnu 1>/dev/null 2>/dev/null; then + dpkg-divert --add --rename --package itzks-systems-common --divert /usr/bin/passwd.gnu /usr/bin/passwd + fi + ;; + abort-upgrade) + ;; + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#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 diff --git a/debian/itzks-systems-config.install b/debian/itzks-systems-config.install deleted file mode 100644 index ba1c675..0000000 --- a/debian/itzks-systems-config.install +++ /dev/null @@ -1,5 +0,0 @@ -etc/debian-edu/* etc/debian-edu/ -etc/network/* etc/network/ -etc/apt/* etc/apt/ -etc/iceweasel/* etc/iceweasel/ -bin/passwd.itzks usr/bin/ \ No newline at end of file diff --git a/debian/itzks-systems-config.postinst b/debian/itzks-systems-config.postinst deleted file mode 100755 index 9f7826a..0000000 --- a/debian/itzks-systems-config.postinst +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# postinst script for itzks-systems-config -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - configure) - 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 - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - -- cgit v1.2.3