debian/*: Process with wrap-and-sort (options: -s -b -k -t).

23 files changed, 517 insertions, 538 deletions

diff --git a/debian/control b/debian/control
index a31ddda..c334993 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,8 @@ Source: itzks-systems
 Section: misc
 Priority: optional
 Maintainer: ITZkS Packaging <admins@lists.it-zukunft-schule.de>
-Uploaders:
- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends:
- debhelper (>= 9),
- po-debconf,
+Uploaders: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Build-Depends: debhelper (>= 9), po-debconf
 Homepage: http://wiki.it-zukunft-schule.de
 Vcs-Git: git://code.it-zukunft-schule.de/itzks-systems.git
 Vcs-Browser: http://code.it-zukunft-schule.de/gitweb?p=itzks-systems.git;a=summary
@@ -14,135 +11,52 @@ Standards-Version: 3.9.8
 
 Package: itzks-systems-common
 Architecture: all
-Replaces:
- itzks-systems-config,
-Breaks:
- itzks-systems-config,
-Depends:
- ${misc:Depends},
- python,
- python-netaddr,
- firefox-esr,
+Replaces: itzks-systems-config
+Breaks: itzks-systems-config
+Depends: firefox-esr, python, python-netaddr, ${misc:Depends}
 Description: Configuration for ITZkS Systems
  Set of configuration parameters and common files
  relevant to ITZkS systems.
 
-Package: itzks-systems-virtman
+Package: itzks-debian-mate-default-settings
 Architecture: all
-Replaces:
- itzks-packages-virtman,
- itzks-systems-workstation,
- itzks-systems-mainserver,
- itzks-systems-disklserver,
- itzks-systems-diskless,
- itzks-systems-displayserver,
- itzks-systems-display,
- itzks-systems-filter,
- itzks-systems-terminalserver,
- itzks-systems-backup,
- gnu-fdisk,
-Breaks:
- itzks-packages-virtman,
- itzks-systems-workstation,
- itzks-systems-mainserver,
- itzks-systems-disklserver,
- itzks-systems-diskless,
- itzks-systems-displayserver,
- itzks-systems-display,
- itzks-systems-filter,
- itzks-systems-terminalserver,
- itzks-systems-backup,
-Depends:
- ${misc:Depends},
- itzks-systems-common (>= ${source:Version}),
- arj,
- bridge-utils,
- bzip2,
- catdvi,
- etckeeper,
- eom,
- firmware-linux-free,
- git,
- gdisk,
- htop,
- firefox-esr,
- firefox-esr-l10n-de,
- itzks-keyring,
- ganeti | libvirt-bin,
- ganeti-os-noop | libvirt-bin,
- links,
- linux-image-amd64,
- linuxlogo,
- lxde,
- lvm2,
- mc,
- nload,
- nmap,
- ocsinventory-agent,
- odt2txt,
- openvpn,
- pkg-mozilla-archive-keyring,
- postfix,
- pyhoca-gui,
- qemu-kvm,
- reportbug,
- sudo,
- sysstat,
- tree,
- unzip,
- x2go-keyring,
- x2goserver,
- x2goserver-xsession,
- x2golxdebindings,
- x2godesktopsharing,
- x2goclient,
- xinit,
- xpdf,
- xul-ext-adblock-plus,
- vim,
- zip,
-Recommends:
- firmware-linux-nonfree,
- deb-multimedia-keyring
-Conflicts:
- gnu-fdisk,
- exim4, exim4-config, exim4-base, exim4-daemon
-Description: Profiling ITZkS-VirtMan Systems
- Install this package to pull in all dependencies required on
- ITZkS VirtMan Debian systems.
- .
- ITZkS (IT-Zukunft Schule) is a Nothern German project and based
- on Debian Edu / Skolelinux.
+Depends: desktop-file-utils, ${misc:Depends}
+Conflicts: mint-mate-default-settings, ubuntu-mate-default-settings
+Provides: debian-mate-default-settings
+Breaks: debian-mate-default-settings
+Replaces: debian-mate-default-settings
+Description: Default settings for MATE on Debian
+ This package comes together with mate-session-manager as provided by upstream
+ but does a little tweaking here and there to provide best experience of the
+ MATE desktop environment on Debian systems.
 
 Package: itzks-systems-backup
 Architecture: all
 Replaces:
+ debian-edu-artwork-joy,
+ gnu-fdisk,
  itzks-packages-backup,
- itzks-systems-workstation,
- itzks-systems-disklserver,
+ itzks-systems-backup,
  itzks-systems-diskless,
- itzks-systems-displayserver,
+ itzks-systems-disklserver,
  itzks-systems-display,
- itzks-systems-terminalserver,
+ itzks-systems-displayserver,
  itzks-systems-filter,
+ itzks-systems-terminalserver,
  itzks-systems-virtman,
- itzks-systems-backup,
- debian-edu-artwork-joy,
- gnu-fdisk,
+ itzks-systems-workstation,
 Breaks:
  itzks-packages-backup,
- itzks-systems-workstation,
- itzks-systems-disklserver,
+ itzks-systems-backup,
  itzks-systems-diskless,
- itzks-systems-displayserver,
+ itzks-systems-disklserver,
  itzks-systems-display,
- itzks-systems-terminalserver,
+ itzks-systems-displayserver,
  itzks-systems-filter,
+ itzks-systems-terminalserver,
  itzks-systems-virtman,
- itzks-systems-backup,
+ itzks-systems-workstation,
 Depends:
- ${misc:Depends},
- itzks-systems-common (>= ${source:Version}),
  arj,
  bzip2,
  deb-multimedia-keyring,
@@ -150,10 +64,11 @@ Depends:
  etckeeper,
  firmware-linux-free,
  firmware-linux-nonfree,
- git,
  gdisk,
+ git,
  htop,
  itzks-keyring,
+ itzks-systems-common (>= ${source:Version}),
  links,
  linux-image-amd64,
  linuxlogo,
@@ -177,10 +92,14 @@ Depends:
  vim,
  xfsprogs,
  zip,
+ ${misc:Depends},
 Conflicts:
  debian-edu-artwork-joy,
+ exim4,
+ exim4-base,
+ exim4-config,
+ exim4-daemon,
  gnu-fdisk,
- exim4, exim4-config, exim4-base, exim4-daemon
 Description: Profiling ITZkS-Backup Systems
  Install this package to pull in all dependencies required on
  ITZkS Backup Debian systems.
@@ -188,195 +107,35 @@ Description: Profiling ITZkS-Backup Systems
  ITZkS (IT-Zukunft Schule) is a Nothern German project and based
  on Debian Edu / Skolelinux.
 
-Package: itzks-systems-mainserver
+Package: itzks-systems-diskless
 Architecture: all
 Replaces:
- itzks-packages-mainserver,
- itzks-systems-workstation,
- itzks-systems-disklserver,
- itzks-systems-diskless,
- itzks-systems-displayserver,
- itzks-systems-display,
- itzks-systems-terminalserver,
- itzks-systems-filter,
- itzks-systems-virtman,
- itzks-systems-backup,
  debian-edu-artwork-joy,
  gnu-fdisk,
-Breaks:
- itzks-packages-mainserver,
- itzks-systems-workstation,
+ itzks-packages-diskless,
+ itzks-systems-backup,
  itzks-systems-disklserver,
- itzks-systems-diskless,
- itzks-systems-displayserver,
  itzks-systems-display,
- itzks-systems-terminalserver,
- itzks-systems-filter,
- itzks-systems-virtman,
- itzks-systems-backup,
-Depends:
- itzks-systems-common (>= ${source:Version}),
- debian-edu-config (>= 1.818+deb8u2~),
- ${misc:Depends},
- debian-mate-default-settings | itzks-debian-mate-default-settings (>= ${source:Version}),
- acl,
- apt-file,
- arj,
- arpwatch,
- atftpd,
- bzip2,
- chromium,
- deb-multimedia-keyring,
- debian-edu-artwork-spacefun,
- dnsutils,
- eom,
- engrampa,
- filezilla,
- gdisk,
- htop,
- itzks-keyring,
- libnagios-plugin-perl,
- links,
- linuxlogo,
- mate-desktop-environment-core,
- mc,
- memtest86,
- memtest86+,
- nload,
- nmap,
- ocsinventory-agent,
- openvpn,
- pkg-mozilla-archive-keyring,
- puppetmaster,
- puppet,
- puppet-module-puppetlabs-apt,
- puppet-module-puppetlabs-concat,
- puppet-module-puppetlabs-inifile,
- puppet-module-puppetlabs-stdlib,
- pxelinux,
- reportbug,
- squidclient,
- syslinux,
- sysstat,
- tree,
- unzip,
- vim,
- xarchiver,
- xpdf,
- xul-ext-adblock-plus,
- zip,
-Description: Profiling for ITZkS-MainServer Systems
- Install this package to pull in recommended dependencies
- on the Debian Edu main server (aka TJENER).
- .
- This package also adds enhancement to the basic configuration
- of the Debian Edu main server.
- .
- ITZkS (IT-Zukunft Schule) is a Nothern German project and based
- on Debian Edu / Skolelinux.
-
-Package: itzks-systems-disklserver
-Architecture: all
-Replaces:
- itzks-packages-disklserver,
- itzks-systems-mainserver,
- itzks-systems-workstation,
- itzks-systems-diskless,
  itzks-systems-displayserver,
- itzks-systems-display,
  itzks-systems-filter,
- itzks-systems-terminalserver,
- itzks-systems-virtman,
- itzks-systems-backup,
- debian-edu-artwork-joy,
- gnu-fdisk,
-Breaks:
- itzks-packages-disklserver,
  itzks-systems-mainserver,
- itzks-systems-workstation,
- itzks-systems-diskless,
- itzks-systems-displayserver,
- itzks-systems-display,
- itzks-systems-filter,
  itzks-systems-terminalserver,
  itzks-systems-virtman,
- itzks-systems-backup,
-Depends:
- ${misc:Depends},
- itzks-systems-common (>= ${source:Version}),
- debian-edu-config (>= 1.818+deb8u2~),
- arj,
- atftpd,
- bzip2,
- deb-multimedia-keyring,
- debian-edu-artwork-spacefun,
- dnsutils,
- htop,
- gdisk,
- itzks-keyring,
- links,
- linuxlogo,
- memtest86,
- memtest86+,
- mc,
- nfs-kernel-server,
- nload,
- nmap,
- ocsinventory-agent,
- openvpn,
- pkg-mozilla-archive-keyring,
- puppet,
- pxelinux,
- reportbug,
- syslinux,
- sysstat,
- tree,
- unzip,
- vim,
- xpdf,
- zip,
-Description: Profiling ITZkS-DisklServer systems
- Install this package to pull in all dependencies required on
- ITZkS Diskless Workstation Server systems.
- .
- This package also provides scripts and configuration enhancements
- for the Diskless Workstation Server profile.
- .
- ITZkS (IT-Zukunft Schule) is a Nothern German project and based
- on Debian Edu / Skolelinux.
-
-Package: itzks-systems-diskless
-Architecture: all
-Replaces:
- itzks-packages-diskless,
- itzks-systems-mainserver,
  itzks-systems-workstation,
- itzks-systems-disklserver,
- itzks-systems-displayserver,
- itzks-systems-display,
- itzks-systems-filter,
- itzks-systems-terminalserver,
- itzks-systems-virtman,
- itzks-systems-backup,
- debian-edu-artwork-joy,
- gnu-fdisk,
 Breaks:
  itzks-packages-diskless,
- itzks-systems-mainserver,
- itzks-systems-workstation,
+ itzks-systems-backup,
  itzks-systems-disklserver,
- itzks-systems-displayserver,
  itzks-systems-display,
+ itzks-systems-displayserver,
  itzks-systems-filter,
+ itzks-systems-mainserver,
  itzks-systems-terminalserver,
  itzks-systems-virtman,
- itzks-systems-backup,
+ itzks-systems-workstation,
 Depends:
- ${misc:Depends},
- debian-mate-default-settings | itzks-debian-mate-default-settings (>= ${source:Version}),
- itzks-systems-common (>= ${source:Version}),
- debian-edu-config (>= 1.818+deb8u2~),
  arj,
+ atril,
  audacity,
  bluefish,
  bzip2,
@@ -386,34 +145,42 @@ Depends:
  cups-bsd,
  deb-multimedia-keyring,
  debian-edu-artwork-spacefun,
+ debian-edu-config (>= 1.818+deb8u2~),
+ debian-mate-default-settings | itzks-debian-mate-default-settings (>= ${source:Version}),
+ desktop-base,
  emacs24,
+ engrampa,
  eom,
  etckeeper,
- engrampa,
+ ffmpegthumbnailer,
  filezilla,
+ firefox-esr,
+ firefox-esr-l10n-de,
  firmware-linux-free,
  firmware-linux-nonfree,
  firmware-realtek,
  flashplugin-nonfree,
+ fonts-linex | ttf-linex,
+ fonts-sil-doulos | ttf-sil-doulos,
+ galculator,
  gcalctool,
  geogebra5 | geogebra44,
- gnome-colors-common,
  git,
+ gnome-colors-common,
  grdesktop,
  gstreamer0.10-plugins-bad,
  gstreamer0.10-plugins-good,
  gstreamer0.10-plugins-ugly,
+ gstreamer1.0-libav,
  gstreamer1.0-plugins-bad,
  gstreamer1.0-plugins-good,
  gstreamer1.0-plugins-ugly,
- gstreamer1.0-libav,
  gv,
  htop,
  icedove,
- firefox-esr,
- firefox-esr-l10n-de,
  imagemagick,
  itzks-keyring,
+ itzks-systems-common (>= ${source:Version}),
  kdenlive,
  kdm,
  kdm-gdmcompat,
@@ -456,24 +223,19 @@ Depends:
  linux-image-486 | linux-image-amd64,
  linuxlogo,
  logisim,
+ mate-applets,
  mate-desktop-environment,
  mate-desktop-environment-extras,
+ mate-icon-theme-faenza,
+ mate-media,
  mate-media-pulse,
- mate-settings-daemon-pulse,
- atril,
- pluma,
+ mate-notification-daemon,
  mate-power-manager,
  mate-screensaver,
- galculator,
- mate-utils,
- mate-applets,
- mate-media,
- mate-themes,
- mate-icon-theme-faenza,
+ mate-settings-daemon-pulse,
  mate-system-monitor,
- mate-notification-daemon,
- desktop-base,
- ffmpegthumbnailer,
+ mate-themes,
+ mate-utils,
  mc,
  memtest86,
  memtest86+,
@@ -483,20 +245,21 @@ Depends:
  nted,
  ocsinventory-agent,
  odt2txt,
- pkg-mozilla-archive-keyring,
+ oracle-java8-jre,
+ oracle-java8-plugin,
  pidgin,
  pinta,
+ pkg-mozilla-archive-keyring,
+ pluma,
  pyhoca-gui,
  python-matplotlib,
  python3-matplotlib,
  rawtherapee,
  reportbug,
  scratch,
+ sqlite3,
  stunnel4,
  subversion,
- oracle-java8-jre,
- oracle-java8-plugin,
- sqlite3,
  sysstat,
  texlive-fonts-recommended,
  texlive-generic-recommended,
@@ -504,23 +267,21 @@ Depends:
  texlive-latex-recommended,
  texworks,
  tree,
- fonts-linex | ttf-linex,
- fonts-sil-doulos | ttf-sil-doulos,
  ttf-mscorefonts-installer,
  unzip,
  vlc,
  vlc-plugin-pulse,
+ x11-apps,
  x2go-keyring,
- x2godesktopsharing,
  x2goclient,
+ x2godesktopsharing,
  xarchiver,
- x11-apps,
  xpdf,
  xul-ext-adblock-plus,
  yakuake,
  zip,
-Recommends:
- flashplayer-chromium,
+ ${misc:Depends},
+Recommends: flashplayer-chromium
 Conflicts:
  debian-edu-artwork-joy,
  gdm,
@@ -570,54 +331,58 @@ Description: Profiling for ITZkS Diskless Workstation Systems
  ITZkS (IT-Zukunft Schule) is a Nothern German project and based
  on Debian Edu / Skolelinux.
 
-Package: itzks-systems-filter
+Package: itzks-systems-disklserver
 Architecture: all
 Replaces:
- itzks-systems-mainserver,
- itzks-systems-workstation,
- itzks-systems-disklserver,
+ debian-edu-artwork-joy,
+ gnu-fdisk,
+ itzks-packages-disklserver,
+ itzks-systems-backup,
  itzks-systems-diskless,
- itzks-systems-displayserver,
  itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
+ itzks-systems-mainserver,
  itzks-systems-terminalserver,
  itzks-systems-virtman,
- itzks-systems-backup,
- debian-edu-artwork-joy,
- gnu-fdisk,
-Breaks:
- itzks-systems-mainserver,
  itzks-systems-workstation,
- itzks-systems-disklserver,
+Breaks:
+ itzks-packages-disklserver,
+ itzks-systems-backup,
  itzks-systems-diskless,
- itzks-systems-displayserver,
  itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
+ itzks-systems-mainserver,
  itzks-systems-terminalserver,
  itzks-systems-virtman,
- itzks-systems-backup,
+ itzks-systems-workstation,
 Depends:
- ${misc:Depends},
- itzks-systems-common (>= ${source:Version}),
  arj,
+ atftpd,
  bzip2,
+ deb-multimedia-keyring,
  debian-edu-artwork-spacefun,
+ debian-edu-config (>= 1.818+deb8u2~),
  dnsutils,
- e2guardian,
- htop,
  gdisk,
+ htop,
  itzks-keyring,
- libnagios-plugin-perl,
+ itzks-systems-common (>= ${source:Version}),
  links,
  linuxlogo,
+ mc,
  memtest86,
  memtest86+,
- mc,
+ nfs-kernel-server,
  nload,
  nmap,
  ocsinventory-agent,
+ openvpn,
+ pkg-mozilla-archive-keyring,
  puppet,
+ pxelinux,
  reportbug,
- squid3,
- squidclient,
  syslinux,
  sysstat,
  tree,
@@ -625,53 +390,122 @@ Depends:
  vim,
  xpdf,
  zip,
-Description: Profiling ITZkS-Filter systems
+ ${misc:Depends},
+Description: Profiling ITZkS-DisklServer systems
  Install this package to pull in all dependencies required on
- ITZkS Servers providing a Content Filter System.
+ ITZkS Diskless Workstation Server systems.
+ .
+ This package also provides scripts and configuration enhancements
+ for the Diskless Workstation Server profile.
  .
  ITZkS (IT-Zukunft Schule) is a Nothern German project and based
  on Debian Edu / Skolelinux.
 
-Package: itzks-systems-displayserver
+Package: itzks-systems-display
 Architecture: all
 Replaces:
+ debian-edu-artwork-joy,
+ gnu-fdisk,
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
  itzks-systems-mainserver,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
  itzks-systems-workstation,
- itzks-systems-disklserver,
+Breaks:
+ itzks-systems-backup,
  itzks-systems-diskless,
- itzks-systems-display,
+ itzks-systems-disklserver,
+ itzks-systems-displayserver,
  itzks-systems-filter,
+ itzks-systems-mainserver,
  itzks-systems-terminalserver,
  itzks-systems-virtman,
- itzks-systems-backup,
+ itzks-systems-workstation,
+Depends:
+ acpi,
+ arj,
+ bzip2,
+ debian-edu-artwork-spacefun,
+ desktop-base,
+ etckeeper,
+ firmware-linux-free,
+ firmware-linux-nonfree,
+ firmware-realtek,
+ git,
+ htop,
+ impressive-display,
+ itzks-keyring,
+ itzks-systems-common (>= ${source:Version}),
+ linux-image | linux-image-amd64,
+ linuxlogo,
+ mc,
+ memtest86,
+ memtest86+,
+ nano,
+ nload,
+ nmap,
+ nodm,
+ ocsinventory-agent,
+ plymouth,
+ plymouth-themes,
+ reportbug,
+ sysstat,
+ tree,
+ ttf-mscorefonts-installer,
+ unzip,
+ zip,
+ ${misc:Depends},
+Conflicts: debian-edu-artwork-joy, debian-edu-artwork-lines, ldm
+Description: Profiling for ITZkS Diskless Displays
+ Install this package to pull in all dependencies required on
+ ITZkS Diskless Display systems.
+ .
+ ITZkS (IT-Zukunft Schule) is a Nothern German project and based
+ on Debian Edu / Skolelinux.
+
+Package: itzks-systems-displayserver
+Architecture: all
+Replaces:
  debian-edu-artwork-joy,
  gnu-fdisk,
-Breaks:
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-filter,
  itzks-systems-mainserver,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
  itzks-systems-workstation,
- itzks-systems-disklserver,
+Breaks:
+ itzks-systems-backup,
  itzks-systems-diskless,
+ itzks-systems-disklserver,
  itzks-systems-display,
  itzks-systems-filter,
+ itzks-systems-mainserver,
  itzks-systems-terminalserver,
  itzks-systems-virtman,
- itzks-systems-backup,
+ itzks-systems-workstation,
 Depends:
- ${misc:Depends},
- itzks-systems-common (>= ${source:Version}),
  arj,
  atftpd,
  bzip2,
  debian-edu-artwork-spacefun,
  dnsutils,
- htop,
  gdisk,
+ htop,
  itzks-keyring,
+ itzks-systems-common (>= ${source:Version}),
  links,
  linuxlogo,
+ mc,
  memtest86,
  memtest86+,
- mc,
  ndb-server,
  nfs-kernel-server,
  nload,
@@ -687,6 +521,7 @@ Depends:
  vim,
  xpdf,
  zip,
+ ${misc:Depends},
 Description: Profiling ITZkS-DisplayServer systems
  Install this package to pull in all dependencies required on
  ITZkS Servers providing Substitute Teacher Schedule Displays.
@@ -694,71 +529,169 @@ Description: Profiling ITZkS-DisplayServer systems
  ITZkS (IT-Zukunft Schule) is a Nothern German project and based
  on Debian Edu / Skolelinux.
 
-Package: itzks-systems-display
+Package: itzks-systems-filter
 Architecture: all
 Replaces:
+ debian-edu-artwork-joy,
+ gnu-fdisk,
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
  itzks-systems-mainserver,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
  itzks-systems-workstation,
- itzks-systems-disklserver,
+Breaks:
+ itzks-systems-backup,
  itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
  itzks-systems-displayserver,
- itzks-systems-filter,
+ itzks-systems-mainserver,
  itzks-systems-terminalserver,
  itzks-systems-virtman,
- itzks-systems-backup,
+ itzks-systems-workstation,
+Depends:
+ arj,
+ bzip2,
+ debian-edu-artwork-spacefun,
+ dnsutils,
+ e2guardian,
+ gdisk,
+ htop,
+ itzks-keyring,
+ itzks-systems-common (>= ${source:Version}),
+ libnagios-plugin-perl,
+ links,
+ linuxlogo,
+ mc,
+ memtest86,
+ memtest86+,
+ nload,
+ nmap,
+ ocsinventory-agent,
+ puppet,
+ reportbug,
+ squid3,
+ squidclient,
+ syslinux,
+ sysstat,
+ tree,
+ unzip,
+ vim,
+ xpdf,
+ zip,
+ ${misc:Depends},
+Description: Profiling ITZkS-Filter systems
+ Install this package to pull in all dependencies required on
+ ITZkS Servers providing a Content Filter System.
+ .
+ ITZkS (IT-Zukunft Schule) is a Nothern German project and based
+ on Debian Edu / Skolelinux.
+
+Package: itzks-systems-mainserver
+Architecture: all
+Replaces:
  debian-edu-artwork-joy,
  gnu-fdisk,
-Breaks:
- itzks-systems-mainserver,
- itzks-systems-workstation,
- itzks-systems-disklserver,
+ itzks-packages-mainserver,
+ itzks-systems-backup,
  itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
  itzks-systems-displayserver,
  itzks-systems-filter,
  itzks-systems-terminalserver,
  itzks-systems-virtman,
+ itzks-systems-workstation,
+Breaks:
+ itzks-packages-mainserver,
  itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
+ itzks-systems-workstation,
 Depends:
- ${misc:Depends},
- itzks-systems-common (>= ${source:Version}),
- acpi,
+ acl,
+ apt-file,
  arj,
+ arpwatch,
+ atftpd,
  bzip2,
+ chromium,
+ deb-multimedia-keyring,
  debian-edu-artwork-spacefun,
- etckeeper,
- firmware-linux-free,
- firmware-linux-nonfree,
- firmware-realtek,
- git,
+ debian-edu-config (>= 1.818+deb8u2~),
+ debian-mate-default-settings | itzks-debian-mate-default-settings (>= ${source:Version}),
+ dnsutils,
+ engrampa,
+ eom,
+ filezilla,
+ gdisk,
  htop,
- impressive-display,
  itzks-keyring,
- nodm,
- linux-image | linux-image-amd64,
+ itzks-systems-common (>= ${source:Version}),
+ libnagios-plugin-perl,
+ links,
  linuxlogo,
- desktop-base,
+ mate-desktop-environment-core,
  mc,
  memtest86,
  memtest86+,
- nano,
  nload,
  nmap,
  ocsinventory-agent,
- plymouth,
- plymouth-themes,
+ openvpn,
+ pkg-mozilla-archive-keyring,
+ puppet,
+ puppet-module-puppetlabs-apt,
+ puppet-module-puppetlabs-concat,
+ puppet-module-puppetlabs-inifile,
+ puppet-module-puppetlabs-stdlib,
+ puppetmaster,
+ pxelinux,
  reportbug,
+ squidclient,
+ syslinux,
  sysstat,
  tree,
- ttf-mscorefonts-installer,
  unzip,
+ vim,
+ xarchiver,
+ xpdf,
+ xul-ext-adblock-plus,
  zip,
-Conflicts:
- debian-edu-artwork-joy,
- debian-edu-artwork-lines,
- ldm,
-Description: Profiling for ITZkS Diskless Displays
+ ${misc:Depends},
+Description: Profiling for ITZkS-MainServer Systems
+ Install this package to pull in recommended dependencies
+ on the Debian Edu main server (aka TJENER).
+ .
+ This package also adds enhancement to the basic configuration
+ of the Debian Edu main server.
+ .
+ ITZkS (IT-Zukunft Schule) is a Nothern German project and based
+ on Debian Edu / Skolelinux.
+
+Package: itzks-systems-smartboard
+Architecture: all
+Depends: schroot, ${misc:Depends}
+Recommends: itzks-systems-workstation (>= ${source:Version})
+Description: Profiling for ITZkS Workstation Systems running a SMART Board
  Install this package to pull in all dependencies required on
- ITZkS Diskless Display systems.
+ ITZkS (diskfull) Workstation systems.
+ .
+ Additionally, configure the system to be used with SMART Notebook 11.
+ .
+ The SMART Notebook 11 software will get deployed via an Ubuntu 12.04
+ chroot image (in-school downloadable tarball). This package provides
+ all the needed integration parts, to integrate the SMART Notebook 11
+ software into the Debian Edu desktop system.
  .
  ITZkS (IT-Zukunft Schule) is a Nothern German project and based
  on Debian Edu / Skolelinux.
@@ -766,36 +699,33 @@ Description: Profiling for ITZkS Diskless Displays
 Package: itzks-systems-terminalserver
 Architecture: all
 Replaces:
+ debian-edu-artwork-joy,
+ gnu-fdisk,
  itzks-packages-terminalserver,
- itzks-systems-mainserver,
- itzks-systems-workstation,
- itzks-systems-disklserver,
+ itzks-systems-backup,
  itzks-systems-diskless,
- itzks-systems-displayserver,
+ itzks-systems-disklserver,
  itzks-systems-display,
+ itzks-systems-displayserver,
  itzks-systems-filter,
+ itzks-systems-mainserver,
  itzks-systems-virtman,
- itzks-systems-backup,
- debian-edu-artwork-joy,
- gnu-fdisk,
+ itzks-systems-workstation,
 Breaks:
  itzks-packages-terminalserver,
- itzks-systems-mainserver,
- itzks-systems-workstation,
- itzks-systems-disklserver,
+ itzks-systems-backup,
  itzks-systems-diskless,
- itzks-systems-displayserver,
+ itzks-systems-disklserver,
  itzks-systems-display,
+ itzks-systems-displayserver,
  itzks-systems-filter,
+ itzks-systems-mainserver,
  itzks-systems-virtman,
- itzks-systems-backup,
+ itzks-systems-workstation,
 Depends:
- ${misc:Depends},
- debian-mate-default-settings | itzks-debian-mate-default-settings (>= ${source:Version}),
- itzks-systems-common (>= ${source:Version}),
- debian-edu-config (>= 1.818+deb8u2~),
- arj,
  apt-file,
+ arj,
+ atril,
  audacity,
  bluefish,
  bzip2,
@@ -805,31 +735,39 @@ Depends:
  cups-bsd,
  deb-multimedia-keyring,
  debian-edu-artwork-spacefun,
+ debian-edu-config (>= 1.818+deb8u2~),
+ debian-mate-default-settings | itzks-debian-mate-default-settings (>= ${source:Version}),
+ desktop-base,
  emacs24,
+ engrampa,
  eom,
  etckeeper,
- engrampa,
+ ffmpegthumbnailer,
  filezilla,
+ firefox-esr,
+ firefox-esr-l10n-de,
  firmware-linux-free,
  firmware-linux-nonfree,
  firmware-realtek,
  flashplugin-nonfree,
+ fonts-linex | ttf-linex,
+ fonts-sil-doulos | ttf-sil-doulos,
+ galculator,
  gcalctool,
+ gdisk,
  geogebra5 | geogebra44,
  git,
  gnome-colors-common,
- gdisk,
  grdesktop,
  gv,
  htop,
  icedove,
- firefox-esr,
- firefox-esr-l10n-de,
  imagemagick,
  itzks-keyring,
- kile,
+ itzks-systems-common (>= ${source:Version}),
  kdm,
  kdm-gdmcompat,
+ kile,
  kturtle,
  lazarus,
  libreoffice,
@@ -868,24 +806,19 @@ Depends:
  linux-image-amd64,
  linuxlogo,
  logisim,
+ mate-applets,
  mate-desktop-environment,
  mate-desktop-environment-extras,
+ mate-icon-theme-faenza,
+ mate-media,
  mate-media-pulse,
- mate-settings-daemon-pulse,
- atril,
- pluma,
+ mate-notification-daemon,
  mate-power-manager,
  mate-screensaver,
- galculator,
- mate-utils,
- mate-applets,
- mate-media,
- mate-themes,
- mate-icon-theme-faenza,
+ mate-settings-daemon-pulse,
  mate-system-monitor,
- mate-notification-daemon,
- desktop-base,
- ffmpegthumbnailer,
+ mate-themes,
+ mate-utils,
  mc,
  musescore,
  nload,
@@ -894,21 +827,22 @@ Depends:
  ocsinventory-agent,
  odt2txt,
  openvpn,
+ oracle-java8-jre,
+ oracle-java8-plugin,
  pidgin,
  pinta,
+ pkg-mozilla-archive-keyring,
+ pluma,
+ puppet,
  pyhoca-gui,
  python-matplotlib,
  python3-matplotlib,
- pkg-mozilla-archive-keyring,
- puppet,
  rawtherapee,
  reportbug,
  scratch,
+ sqlite3,
  stunnel4,
  subversion,
- oracle-java8-jre,
- oracle-java8-plugin,
- sqlite3,
  sysstat,
  texlive-fonts-recommended,
  texlive-generic-recommended,
@@ -916,25 +850,24 @@ Depends:
  texlive-latex-recommended,
  texworks,
  tree,
- fonts-linex | ttf-linex,
- fonts-sil-doulos | ttf-sil-doulos,
  ttf-mscorefonts-installer,
  unzip,
+ x11-apps,
  x2go-keyring,
  x2goclient,
- x2goserver,
- x2goserver-xsession,
  x2godesktopsharing,
- x2gomatebindings,
  x2golxdebindings,
- x2goserver-printing,
+ x2gomatebindings,
+ x2goserver,
  x2goserver-fmbindings,
+ x2goserver-printing,
+ x2goserver-xsession,
  xarchiver,
- x11-apps,
  xpdf,
  xul-ext-adblock-plus,
  yakuake,
  zip,
+ ${misc:Depends},
 Conflicts:
  debian-edu-artwork-joy,
  gdm,
@@ -984,37 +917,117 @@ Description: Profiling for ITZkS Terminal Server Systems
  ITZkS (IT-Zukunft Schule) is a Nothern German project and based
  on Debian Edu / Skolelinux.
 
-Package: itzks-systems-workstation
+Package: itzks-systems-virtman
 Architecture: all
-Breaks:
+Replaces:
+ gnu-fdisk,
+ itzks-packages-virtman,
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
  itzks-systems-mainserver,
  itzks-systems-terminalserver,
- itzks-systems-disklserver,
+ itzks-systems-workstation,
+Breaks:
+ itzks-packages-virtman,
+ itzks-systems-backup,
  itzks-systems-diskless,
- itzks-systems-displayserver,
+ itzks-systems-disklserver,
  itzks-systems-display,
+ itzks-systems-displayserver,
  itzks-systems-filter,
- itzks-systems-virtman,
- itzks-systems-backup,
-Replaces:
  itzks-systems-mainserver,
  itzks-systems-terminalserver,
- itzks-systems-disklserver,
+ itzks-systems-workstation,
+Depends:
+ arj,
+ bridge-utils,
+ bzip2,
+ catdvi,
+ eom,
+ etckeeper,
+ firefox-esr,
+ firefox-esr-l10n-de,
+ firmware-linux-free,
+ ganeti | libvirt-bin,
+ ganeti-os-noop | libvirt-bin,
+ gdisk,
+ git,
+ htop,
+ itzks-keyring,
+ itzks-systems-common (>= ${source:Version}),
+ links,
+ linux-image-amd64,
+ linuxlogo,
+ lvm2,
+ lxde,
+ mc,
+ nload,
+ nmap,
+ ocsinventory-agent,
+ odt2txt,
+ openvpn,
+ pkg-mozilla-archive-keyring,
+ postfix,
+ pyhoca-gui,
+ qemu-kvm,
+ reportbug,
+ sudo,
+ sysstat,
+ tree,
+ unzip,
+ vim,
+ x2go-keyring,
+ x2goclient,
+ x2godesktopsharing,
+ x2golxdebindings,
+ x2goserver,
+ x2goserver-xsession,
+ xinit,
+ xpdf,
+ xul-ext-adblock-plus,
+ zip,
+ ${misc:Depends},
+Recommends: deb-multimedia-keyring, firmware-linux-nonfree
+Conflicts: exim4, exim4-base, exim4-config, exim4-daemon, gnu-fdisk
+Description: Profiling ITZkS-VirtMan Systems
+ Install this package to pull in all dependencies required on
+ ITZkS VirtMan Debian systems.
+ .
+ ITZkS (IT-Zukunft Schule) is a Nothern German project and based
+ on Debian Edu / Skolelinux.
+
+Package: itzks-systems-workstation
+Architecture: all
+Breaks:
+ itzks-systems-backup,
  itzks-systems-diskless,
- itzks-systems-displayserver,
+ itzks-systems-disklserver,
  itzks-systems-display,
- itzks-systems-virtman,
+ itzks-systems-displayserver,
  itzks-systems-filter,
- itzks-systems-backup,
+ itzks-systems-mainserver,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
+Replaces:
  debian-edu-artwork-joy,
  gnu-fdisk,
+ itzks-systems-backup,
+ itzks-systems-diskless,
+ itzks-systems-disklserver,
+ itzks-systems-display,
+ itzks-systems-displayserver,
+ itzks-systems-filter,
+ itzks-systems-mainserver,
+ itzks-systems-terminalserver,
+ itzks-systems-virtman,
 Depends:
- debian-mate-default-settings | itzks-debian-mate-default-settings (>= ${source:Version}),
- itzks-systems-common (>= ${source:Version}),
- debian-edu-config (>= 1.818+deb8u2~),
- ${misc:Depends},
  anacron,
  arj,
+ atril,
  audacity,
  bluefish,
  bzip2,
@@ -1024,20 +1037,29 @@ Depends:
  cups-bsd,
  deb-multimedia-keyring,
  debian-edu-artwork-spacefun,
+ debian-edu-config (>= 1.818+deb8u2~),
+ debian-mate-default-settings | itzks-debian-mate-default-settings (>= ${source:Version}),
+ desktop-base,
  emacs24,
+ engrampa,
  eom,
  etckeeper,
- engrampa,
+ ffmpegthumbnailer,
  filezilla,
+ firefox-esr,
+ firefox-esr-l10n-de,
  firmware-linux-free,
  firmware-linux-nonfree,
  firmware-realtek,
  flashplugin-nonfree,
+ fonts-linex | ttf-linex,
+ fonts-sil-doulos | ttf-sil-doulos,
  fping,
+ galculator,
  gcalctool,
- gnome-colors-common,
- git,
  gdisk,
+ git,
+ gnome-colors-common,
  grdesktop,
  gstreamer0.10-plugins-bad,
  gstreamer0.10-plugins-good,
@@ -1045,10 +1067,9 @@ Depends:
  gv,
  htop,
  icedove,
- firefox-esr,
- firefox-esr-l10n-de,
  imagemagick,
  itzks-keyring,
+ itzks-systems-common (>= ${source:Version}),
  kdenlive,
  kdm,
  kdm-gdmcompat,
@@ -1091,24 +1112,19 @@ Depends:
  linux-image-amd64,
  linuxlogo,
  logisim,
+ mate-applets,
  mate-desktop-environment,
  mate-desktop-environment-extras,
+ mate-icon-theme-faenza,
+ mate-media,
  mate-media-pulse,
- mate-settings-daemon-pulse,
- atril,
- pluma,
+ mate-notification-daemon,
  mate-power-manager,
  mate-screensaver,
- galculator,
- mate-utils,
- mate-applets,
- mate-media,
- mate-themes,
- mate-icon-theme-faenza,
+ mate-settings-daemon-pulse,
  mate-system-monitor,
- mate-notification-daemon,
- desktop-base,
- ffmpegthumbnailer,
+ mate-themes,
+ mate-utils,
  mc,
  musescore,
  nload,
@@ -1117,21 +1133,22 @@ Depends:
  ocsinventory-agent,
  odt2txt,
  openvpn,
+ oracle-java8-jre,
+ oracle-java8-plugin,
  pidgin,
  pinta,
+ pkg-mozilla-archive-keyring,
+ pluma,
  puppet,
  pyhoca-gui,
  python-matplotlib,
  python3-matplotlib,
- pkg-mozilla-archive-keyring,
  rawtherapee,
  reportbug,
  scratch,
+ sqlite3,
  stunnel4,
  subversion,
- oracle-java8-jre,
- oracle-java8-plugin,
- sqlite3,
  sysstat,
  texlive-fonts-recommended,
  texlive-generic-recommended,
@@ -1139,24 +1156,21 @@ Depends:
  texlive-latex-recommended,
  texworks,
  tree,
- fonts-linex | ttf-linex,
- fonts-sil-doulos | ttf-sil-doulos,
  ttf-mscorefonts-installer,
  unzip,
  vlc,
  vlc-plugin-pulse,
- xarchiver,
+ x11-apps,
  x2go-keyring,
- x2godesktopsharing,
  x2goclient,
- x11-apps,
+ x2godesktopsharing,
+ xarchiver,
  xpdf,
  xul-ext-adblock-plus,
  yakuake,
  zip,
-Recommends:
- network-manager-gnome,
- flashplayer-chromium,
+ ${misc:Depends},
+Recommends: flashplayer-chromium, network-manager-gnome
 Conflicts:
  debian-edu-artwork-joy,
  gdm,
@@ -1205,38 +1219,3 @@ Description: Profiling for ITZkS Workstation Systems
  .
  ITZkS (IT-Zukunft Schule) is a Nothern German project and based
  on Debian Edu / Skolelinux.
-
-Package: itzks-systems-smartboard
-Architecture: all
-Depends:
- schroot,
- ${misc:Depends},
-Recommends:
- itzks-systems-workstation (>= ${source:Version}),
-Description: Profiling for ITZkS Workstation Systems running a SMART Board
- Install this package to pull in all dependencies required on
- ITZkS (diskfull) Workstation systems.
- .
- Additionally, configure the system to be used with SMART Notebook 11.
- .
- The SMART Notebook 11 software will get deployed via an Ubuntu 12.04
- chroot image (in-school downloadable tarball). This package provides
- all the needed integration parts, to integrate the SMART Notebook 11
- software into the Debian Edu desktop system.
- .
- ITZkS (IT-Zukunft Schule) is a Nothern German project and based
- on Debian Edu / Skolelinux.
-
-Package: itzks-debian-mate-default-settings
-Architecture: all
-Depends: desktop-file-utils,
-         ${misc:Depends},
-Conflicts: ubuntu-mate-default-settings,
-           mint-mate-default-settings,
-Provides: debian-mate-default-settings,
-Breaks: debian-mate-default-settings,
-Replaces: debian-mate-default-settings,
-Description: Default settings for MATE on Debian
- This package comes together with mate-session-manager as provided by upstream
- but does a little tweaking here and there to provide best experience of the
- MATE desktop environment on Debian systems.
diff --git a/debian/itzks-systems-backup.docs b/debian/itzks-systems-backup.docs
index 6728c3b..8ed02c4 100644
--- a/debian/itzks-systems-backup.docs
+++ b/debian/itzks-systems-backup.docs
@@ -1 +1 @@
-README.backup
\ No newline at end of file
+README.backup
diff --git a/debian/itzks-systems-backup.examples b/debian/itzks-systems-backup.examples
index e43698f..785b949 100644
--- a/debian/itzks-systems-backup.examples
+++ b/debian/itzks-systems-backup.examples
@@ -1,3 +1,3 @@
-examples/backup/backup-dirvish.tar.gz
 examples/backup/README.dirvish
+examples/backup/backup-dirvish.tar.gz
 examples/backup/master.conf.dirvish
diff --git a/debian/itzks-systems-backup.install b/debian/itzks-systems-backup.install
index 27ddb6e..1d60393 100644
--- a/debian/itzks-systems-backup.install
+++ b/debian/itzks-systems-backup.install
@@ -1,3 +1,3 @@
-usr-lib-nagios-plugins/check_md_raid usr/lib/nagios/plugins/
-usr-lib-nagios-plugins/check_dirvish* usr/lib/nagios/plugins/
 etc/sudoers.d/itzks-systems-backup etc/sudoers.d/
+usr-lib-nagios-plugins/check_dirvish* usr/lib/nagios/plugins/
+usr-lib-nagios-plugins/check_md_raid usr/lib/nagios/plugins/
diff --git a/debian/itzks-systems-common.install b/debian/itzks-systems-common.install
index 8f6de5f..b9dc3c1 100644
--- a/debian/itzks-systems-common.install
+++ b/debian/itzks-systems-common.install
@@ -1,14 +1,14 @@
-etc/debian-edu/* etc/debian-edu/
-etc/network/* etc/network/
-etc/sitesummary/* etc/sitesummary/
+bin/passwd usr/bin/
+bin/standardskriver usr/bin/
 etc/apt/* etc/apt/
 etc/cron.d/itzks-systems-common
+etc/debian-edu/* etc/debian-edu/
 etc/firefox-esr/* etc/firefox-esr/
+etc/network/* etc/network/
+etc/sitesummary/* etc/sitesummary/
 etc/standardskriver.cfg etc/
 etc/xdg/autostart/standardskriver.desktop etc/xdg/autostart/
-bin/passwd usr/bin/
-bin/standardskriver usr/bin/
 sbin/itzks-systems.do_preseed
 share/itzks-systems-common/ usr/share/
-usr-lib-nagios-plugins/check_mem.pl usr/lib/nagios/plugins/
 usr-lib-nagios-plugins/check_fs_ro.sh usr/lib/nagios/plugins/
+usr-lib-nagios-plugins/check_mem.pl usr/lib/nagios/plugins/
diff --git a/debian/itzks-systems-diskless.install b/debian/itzks-systems-diskless.install
index 79ffa96..668a23b 100644
--- a/debian/itzks-systems-diskless.install
+++ b/debian/itzks-systems-diskless.install
@@ -1,7 +1,7 @@
 bin/itzks-user-suicide usr/bin/
-etc/mimeapps.list etc/
-etc/shutdown-at-night/ etc/
 etc/.java etc/
 etc/chromium/ etc/
-share/glib-2.0/schemas/90_itzks+mate.gschema.override usr/share/glib-2.0/schemas/
+etc/mimeapps.list etc/
+etc/shutdown-at-night/ etc/
 sbin/itzks-switch-to-systemd-networkd usr/sbin/
+share/glib-2.0/schemas/90_itzks+mate.gschema.override usr/share/glib-2.0/schemas/
diff --git a/debian/itzks-systems-diskless.links b/debian/itzks-systems-diskless.links
index 1a70981..2a2442b 100644
--- a/debian/itzks-systems-diskless.links
+++ b/debian/itzks-systems-diskless.links
@@ -1,2 +1,2 @@
+etc/mimeapps.list usr/share/applications/mimeapps.list
 usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-diskless/README.itzks-common
-etc/mimeapps.list usr/share/applications/mimeapps.list
\ No newline at end of file
diff --git a/debian/itzks-systems-disklserver.examples b/debian/itzks-systems-disklserver.examples
index 5a463f2..b98fe86 100644
--- a/debian/itzks-systems-disklserver.examples
+++ b/debian/itzks-systems-disklserver.examples
@@ -1,2 +1,2 @@
-examples/disklserver/disklserver-tftp.tar.gz
 examples/disklserver/README.tftp
+examples/disklserver/disklserver-tftp.tar.gz
diff --git a/debian/itzks-systems-disklserver.links b/debian/itzks-systems-disklserver.links
index ad80d22..bf49b51 100644
--- a/debian/itzks-systems-disklserver.links
+++ b/debian/itzks-systems-disklserver.links
@@ -1 +1 @@
-usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-disklserver/README.itzks-common
\ No newline at end of file
+usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-disklserver/README.itzks-common
diff --git a/debian/itzks-systems-disklserver.manpages b/debian/itzks-systems-disklserver.manpages
index 66ae7d1..e52f2e4 100644
--- a/debian/itzks-systems-disklserver.manpages
+++ b/debian/itzks-systems-disklserver.manpages
@@ -1 +1 @@
-man/diskless-workstation-shell.8
\ No newline at end of file
+man/diskless-workstation-shell.8
diff --git a/debian/itzks-systems-displayserver.examples b/debian/itzks-systems-displayserver.examples
index f6f02d7..a1c03f6 100644
--- a/debian/itzks-systems-displayserver.examples
+++ b/debian/itzks-systems-displayserver.examples
@@ -1,2 +1,2 @@
-examples/displayserver/displayserver-tftp.tar.gz
 examples/displayserver/README.tftp
+examples/displayserver/displayserver-tftp.tar.gz
diff --git a/debian/itzks-systems-displayserver.links b/debian/itzks-systems-displayserver.links
index 2e78d8b..fe6609f 100644
--- a/debian/itzks-systems-displayserver.links
+++ b/debian/itzks-systems-displayserver.links
@@ -1 +1 @@
-usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-displayserver/README.itzks-common
\ No newline at end of file
+usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-displayserver/README.itzks-common
diff --git a/debian/itzks-systems-displayserver.manpages b/debian/itzks-systems-displayserver.manpages
index 66ae7d1..e52f2e4 100644
--- a/debian/itzks-systems-displayserver.manpages
+++ b/debian/itzks-systems-displayserver.manpages
@@ -1 +1 @@
-man/diskless-workstation-shell.8
\ No newline at end of file
+man/diskless-workstation-shell.8
diff --git a/debian/itzks-systems-mainserver.examples b/debian/itzks-systems-mainserver.examples
index 3cae6a4..ce9df9a 100644
--- a/debian/itzks-systems-mainserver.examples
+++ b/debian/itzks-systems-mainserver.examples
@@ -1,2 +1,2 @@
-examples/mainserver/mainserver-tftp.tar.gz
 examples/mainserver/README.tftp
+examples/mainserver/mainserver-tftp.tar.gz
diff --git a/debian/itzks-systems-mainserver.install b/debian/itzks-systems-mainserver.install
index 8581aa8..0c99b12 100644
--- a/debian/itzks-systems-mainserver.install
+++ b/debian/itzks-systems-mainserver.install
@@ -1,7 +1,7 @@
-sbin/itzks-transfer-cleaner usr/sbin
-etc/skel etc/
 etc/chromium etc/
-etc/sudoers.d/itzks-systems-mainserver etc/sudoers.d/
 etc/cron.d/itzks-transfer-cleaner /etc/cron.d/
-usr-lib-nagios-plugins/check_squid usr/lib/nagios/plugins/
+etc/skel etc/
+etc/sudoers.d/itzks-systems-mainserver etc/sudoers.d/
+sbin/itzks-transfer-cleaner usr/sbin
 usr-lib-nagios-plugins/check_puppetmaster* usr/lib/nagios/plugins/
+usr-lib-nagios-plugins/check_squid usr/lib/nagios/plugins/
diff --git a/debian/itzks-systems-mainserver.links b/debian/itzks-systems-mainserver.links
index f419a5e..4b0dff7 100644
--- a/debian/itzks-systems-mainserver.links
+++ b/debian/itzks-systems-mainserver.links
@@ -1 +1 @@
-usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-mainserver/README.itzks-common
\ No newline at end of file
+usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-mainserver/README.itzks-common
diff --git a/debian/itzks-systems-smartboard.install b/debian/itzks-systems-smartboard.install
index f1f50c4..92a49d2 100644
--- a/debian/itzks-systems-smartboard.install
+++ b/debian/itzks-systems-smartboard.install
@@ -1,8 +1,8 @@
 bin/smarttech* usr/bin/
-etc/xdg/autostart/smarttech-SMART*.desktop etc/xdg/autostart/
 etc/schroot/chroot.d/precise-i386-smartboard-ITZkS etc/schroot/chroot.d/
 etc/schroot/slxdesktop.ITZkS etc/schroot/
-share/itzks-systems-smartboard/ usr/share/
-share/icons/ usr/share/
+etc/xdg/autostart/smarttech-SMART*.desktop etc/xdg/autostart/
 lib-udev-rules.d/60-SMARTBoard32.rules lib/udev/rules.d/
-share/glib-2.0/schemas/90_itzks-smartboard+mate.gschema.override usr/share/glib-2.0/schemas/
\ No newline at end of file
+share/glib-2.0/schemas/90_itzks-smartboard+mate.gschema.override usr/share/glib-2.0/schemas/
+share/icons/ usr/share/
+share/itzks-systems-smartboard/ usr/share/
diff --git a/debian/itzks-systems-terminalserver.install b/debian/itzks-systems-terminalserver.install
index 3e8b6d7..3de5d67 100644
--- a/debian/itzks-systems-terminalserver.install
+++ b/debian/itzks-systems-terminalserver.install
@@ -1,4 +1,4 @@
+etc/.java etc/
 etc/chromium/ etc/
 etc/mimeapps.list etc/
 etc/shutdown-at-night/ etc/
-etc/.java etc/
\ No newline at end of file
diff --git a/debian/itzks-systems-terminalserver.links b/debian/itzks-systems-terminalserver.links
index 8dc1d29..237b984 100644
--- a/debian/itzks-systems-terminalserver.links
+++ b/debian/itzks-systems-terminalserver.links
@@ -1,2 +1,2 @@
+etc/mimeapps.list usr/share/applications/mimeapps.list
 usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-terminalserver/README.itzks-common
-etc/mimeapps.list usr/share/applications/mimeapps.list
\ No newline at end of file
diff --git a/debian/itzks-systems-virtman.docs b/debian/itzks-systems-virtman.docs
index 7e878f8..cda129d 100644
--- a/debian/itzks-systems-virtman.docs
+++ b/debian/itzks-systems-virtman.docs
@@ -1 +1 @@
-README.virtman
\ No newline at end of file
+README.virtman
diff --git a/debian/itzks-systems-virtman.install b/debian/itzks-systems-virtman.install
index f2f4eb7..4acbcec 100644
--- a/debian/itzks-systems-virtman.install
+++ b/debian/itzks-systems-virtman.install
@@ -1,2 +1,2 @@
-usr-lib-nagios-plugins/check_md_raid usr/lib/nagios/plugins/
 usr-lib-nagios-plugins/check_apcupsd usr/lib/nagios/plugins/
+usr-lib-nagios-plugins/check_md_raid usr/lib/nagios/plugins/
diff --git a/debian/itzks-systems-workstation.install b/debian/itzks-systems-workstation.install
index 677e58e..01ffadb 100644
--- a/debian/itzks-systems-workstation.install
+++ b/debian/itzks-systems-workstation.install
@@ -1,8 +1,8 @@
 bin/itzks-user-suicide usr/bin/
-etc/mimeapps.list etc/
-etc/shutdown-at-night/ etc/
 etc/.java etc/
 etc/chromium/ etc/
-share/glib-2.0/schemas/90_itzks+mate.gschema.override usr/share/glib-2.0/schemas/
-sbin/itzks-switch-to-systemd-networkd usr/sbin/
 etc/cron.daily/itzks-systems-workstation /etc/cron.daily/
+etc/mimeapps.list etc/
+etc/shutdown-at-night/ etc/
+sbin/itzks-switch-to-systemd-networkd usr/sbin/
+share/glib-2.0/schemas/90_itzks+mate.gschema.override usr/share/glib-2.0/schemas/
diff --git a/debian/itzks-systems-workstation.links b/debian/itzks-systems-workstation.links
index b62e11a..0adeada 100644
--- a/debian/itzks-systems-workstation.links
+++ b/debian/itzks-systems-workstation.links
@@ -1,2 +1,2 @@
+etc/mimeapps.list usr/share/applications/mimeapps.list
 usr/share/doc/itzks-systems-common/README.itzks-common usr/share/doc/itzks-systems-workstation/README.itzks-common
-etc/mimeapps.list usr/share/applications/mimeapps.list
\ No newline at end of file