[X2Go-Commits] [x2gothinclient] 03/03: re-arrange complete X2Go TCE project, bump version to 1.5.0.0
git-admin at x2go.org
git-admin at x2go.org
Sun Aug 24 16:56:44 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gothinclient.
commit a458a1ed666eb12b5d856812396ecd31fba01585
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Aug 24 16:56:32 2014 +0200
re-arrange complete X2Go TCE project, bump version to 1.5.0.0
---
VERSION | 2 +-
.../init/x2gocdmanager.init | 0
{x2gocdmanager => cdmanager}/man/x2gocdmanager.8 | 0
{x2gocdmanager => cdmanager}/man/x2goejectcd.1 | 0
.../powerej/eject-button.png | Bin 260 -> 260 bytes
{x2gocdmanager => cdmanager}/powerej/eject.cpp | 0
{x2gocdmanager => cdmanager}/powerej/mb.cpp | 0
{x2gocdmanager => cdmanager}/powerej/mb.h | 0
{x2gocdmanager => cdmanager}/powerej/powerej.pro | 0
{x2gocdmanager => cdmanager}/powerej/resources.rcc | 0
{x2gocdmanager => cdmanager}/x2gocdmanager | 0
.../init/x2gothinclient-chroot.init | 7 ++
.../patchsets/alsa-utils.wheezy/alsa-utils | 0
.../patchsets/alsa-utils.wheezy/utils.sh | 0
.../etc/freerdp/known_hosts | 0
common/etc/x2gothinclient_init | 1 +
common/etc/x2gothinclient_sessions | 1 +
debian/changelog | 4 +-
debian/control | 77 ++++++++++++++------
debian/po/POTFILES.in | 2 +-
debian/po/de.po | 10 +--
debian/po/templates.pot | 10 +--
debian/rules | 14 ++--
debian/x2gocdmanager.init | 1 -
debian/x2gocdmanager.install | 2 -
debian/x2gocdmanager.manpages | 2 -
debian/x2gosmartcardrules.install | 3 -
debian/x2gosmartcardrules.manpages | 1 -
debian/x2gothinclient-cdmanager.init | 1 +
debian/x2gothinclient-cdmanager.install | 2 +
debian/x2gothinclient-cdmanager.manpages | 2 +
debian/x2gothinclient-chroot.init | 2 +-
debian/x2gothinclient-chroot.install | 2 +-
debian/x2gothinclient-common.install | 1 +
...mon.postinst => x2gothinclient-common.postinst} | 32 +-------
...-daemon.postrm => x2gothinclient-common.postrm} | 0
debian/x2gothinclient-daemon.examples | 2 -
debian/x2gothinclient-daemon.init | 1 -
debian/x2gothinclient-daemon.install | 2 -
debian/x2gothinclient-daemon.manpages | 1 -
...config => x2gothinclient-displaymanager.config} | 0
...mon.dirs => x2gothinclient-displaymanager.dirs} | 0
debian/x2gothinclient-displaymanager.examples | 2 +
debian/x2gothinclient-displaymanager.init | 1 +
debian/x2gothinclient-displaymanager.install | 1 +
debian/x2gothinclient-displaymanager.manpages | 1 +
debian/x2gothinclient-displaymanager.postinst | 54 ++++++++++++++
...n.prerm => x2gothinclient-displaymanager.prerm} | 4 +-
...tes => x2gothinclient-displaymanager.templates} | 0
...agement.dirs => x2gothinclient-management.dirs} | 0
debian/x2gothinclient-management.docs | 4 +
debian/x2gothinclient-management.install | 4 +
debian/x2gothinclient-management.manpages | 1 +
debian/x2gothinclient-minidesktop.init | 2 +-
debian/x2gothinclient-minidesktop.install | 12 +--
debian/x2gothinclient-minidesktop.postinst | 2 -
...les.dirs => x2gothinclient-smartcardrules.dirs} | 0
debian/x2gothinclient-smartcardrules.install | 3 +
debian/x2gothinclient-smartcardrules.manpages | 1 +
debian/x2gothinclient-usbmount.install | 3 +
debian/x2gothinclient-usbmount.manpages | 1 +
debian/x2gothinclient.postinst | 38 ++++++++++
...lient-daemon.preinst => x2gothinclient.preinst} | 2 +-
debian/x2gothinclientmanagement.docs | 4 -
debian/x2gothinclientmanagement.install | 4 -
debian/x2gothinclientmanagement.manpages | 1 -
debian/x2gousbmount.install | 3 -
debian/x2gousbmount.manpages | 1 -
.../x2gothinclient-displaymanager_background.svg | 1 +
.../etc/x2gothinclient-displaymanager_start | 1 +
.../init/x2gothinclient-displaymanager.init | 5 +-
.../man/x2gothinclientd.8 | 0
.../sbin/x2gothinclientd | 0
{x2gothinclientmanagement => management}/README | 0
.../README.hostname | 0
.../etc/x2gothinclient_settings | 0
.../man/x2gothinclient_cleanup.8 | 0
.../man/x2gothinclient_create.8 | 0
.../man/x2gothinclient_preptftpboot.8 | 0
.../man/x2gothinclient_shell.8 | 0
.../man/x2gothinclient_update.8 | 0
.../man/x2gothinclient_upgrade.8 | 0
.../sbin/x2gothinclient_cleanup | 0
.../sbin/x2gothinclient_create | 0
.../sbin/x2gothinclient_preptftpboot | 0
.../sbin/x2gothinclient_shell | 0
.../sbin/x2gothinclient_update | 0
.../sbin/x2gothinclient_upgrade | 0
.../x2gothinclient-displaymanager_background.svg | 0
.../share/etc/x2gothinclient-displaymanager_start | 0
.../etc/x2gothinclient-minidesktop_background.svg | 0
.../share/etc/x2gothinclient-minidesktop_start | 0
.../share/etc/x2gothinclient_init | 0
.../share/etc/x2gothinclient_sessions | 0
.../share/tftpboot/default.cfg | 0
.../share/tftpboot/local-boot.cfg | 0
.../share/tftpboot/memtest.cfg | 0
.../share/tftpboot/pxelinux.cfg/default | 0
.../share/tftpboot/x2go-simple-splash.png | Bin 4314 -> 4314 bytes
.../share/tftpboot/x2go-splash.png | Bin 18746 -> 18746 bytes
.../share/tftpboot/x2go-tce.cfg | 0
.../autostart/x2gothinclient-minidesktop.desktop | 0
.../background/x2gotce-minidesktop-background.svg | 0
.../etc/x2gothinclient-minidesktop_background.svg | 1 +
minidesktop/etc/x2gothinclient-minidesktop_start | 1 +
.../init/x2gothinclient-minidesktop.init | 4 +
.../x2gothinclient-minidesktop.layout | 0
.../20_x2gothinclient-minidesktop.gschema.override | 0
.../seeds/preseed_nodm | 0
.../21-x2gognupgccid.rules | 0
.../man/x2gognupgccid.8 | 0
.../x2gognupgccid | 0
{x2gousbmount => usbmount}/61-x2gousbmount.rules | 0
{x2gousbmount => usbmount}/man/x2gousbmount.8 | 0
{x2gousbmount => usbmount}/x2gousbmount | 0
.../etc/x2gothinclient-daemon_background.svg | 1 -
.../etc/x2gothinclient-daemon_init | 1 -
.../etc/x2gothinclient-daemon_sessions | 1 -
.../etc/x2gothinclient-daemon_start | 1 -
.../etc/x2gothinclient-minidesktop_background.svg | 1 -
.../etc/x2gothinclient-minidesktop_init | 1 -
.../etc/x2gothinclient-minidesktop_sessions | 1 -
.../etc/x2gothinclient-minidesktop_start | 1 -
.../share/etc/x2gothinclient-minidesktop_init | 46 ------------
.../share/etc/x2gothinclient-minidesktop_sessions | 66 -----------------
125 files changed, 228 insertions(+), 239 deletions(-)
diff --git a/VERSION b/VERSION
index dd22e0b..5d7661f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0.3
+1.5.0.0
diff --git a/x2gocdmanager/init/x2gocdmanager.init b/cdmanager/init/x2gocdmanager.init
similarity index 100%
rename from x2gocdmanager/init/x2gocdmanager.init
rename to cdmanager/init/x2gocdmanager.init
diff --git a/x2gocdmanager/man/x2gocdmanager.8 b/cdmanager/man/x2gocdmanager.8
similarity index 100%
rename from x2gocdmanager/man/x2gocdmanager.8
rename to cdmanager/man/x2gocdmanager.8
diff --git a/x2gocdmanager/man/x2goejectcd.1 b/cdmanager/man/x2goejectcd.1
similarity index 100%
rename from x2gocdmanager/man/x2goejectcd.1
rename to cdmanager/man/x2goejectcd.1
diff --git a/x2gocdmanager/powerej/eject-button.png b/cdmanager/powerej/eject-button.png
similarity index 100%
rename from x2gocdmanager/powerej/eject-button.png
rename to cdmanager/powerej/eject-button.png
diff --git a/x2gocdmanager/powerej/eject.cpp b/cdmanager/powerej/eject.cpp
similarity index 100%
rename from x2gocdmanager/powerej/eject.cpp
rename to cdmanager/powerej/eject.cpp
diff --git a/x2gocdmanager/powerej/mb.cpp b/cdmanager/powerej/mb.cpp
similarity index 100%
rename from x2gocdmanager/powerej/mb.cpp
rename to cdmanager/powerej/mb.cpp
diff --git a/x2gocdmanager/powerej/mb.h b/cdmanager/powerej/mb.h
similarity index 100%
rename from x2gocdmanager/powerej/mb.h
rename to cdmanager/powerej/mb.h
diff --git a/x2gocdmanager/powerej/powerej.pro b/cdmanager/powerej/powerej.pro
similarity index 100%
rename from x2gocdmanager/powerej/powerej.pro
rename to cdmanager/powerej/powerej.pro
diff --git a/x2gocdmanager/powerej/resources.rcc b/cdmanager/powerej/resources.rcc
similarity index 100%
rename from x2gocdmanager/powerej/resources.rcc
rename to cdmanager/powerej/resources.rcc
diff --git a/x2gocdmanager/x2gocdmanager b/cdmanager/x2gocdmanager
similarity index 100%
rename from x2gocdmanager/x2gocdmanager
rename to cdmanager/x2gocdmanager
diff --git a/x2gothinclient-chroot/init/x2gothinclient-chroot.init b/chroot/init/x2gothinclient-chroot.init
similarity index 84%
rename from x2gothinclient-chroot/init/x2gothinclient-chroot.init
rename to chroot/init/x2gothinclient-chroot.init
index 3bcbc66..c88727b 100644
--- a/x2gothinclient-chroot/init/x2gothinclient-chroot.init
+++ b/chroot/init/x2gothinclient-chroot.init
@@ -10,6 +10,13 @@
# Description: Prepare X2Go TCE tmpfs directories for usage
### END INIT INFO
+set -e
+
+. /lib/lsb/init-functions
+
+# pre-init X2Go Thin Client through init script...
+test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init
+
case "$1" in
start|"")
# prep tmpfs subfolders for nfs-common
diff --git a/x2gothinclient-chroot/patchsets/alsa-utils.wheezy/alsa-utils b/chroot/patchsets/alsa-utils.wheezy/alsa-utils
similarity index 100%
rename from x2gothinclient-chroot/patchsets/alsa-utils.wheezy/alsa-utils
rename to chroot/patchsets/alsa-utils.wheezy/alsa-utils
diff --git a/x2gothinclient-chroot/patchsets/alsa-utils.wheezy/utils.sh b/chroot/patchsets/alsa-utils.wheezy/utils.sh
similarity index 100%
rename from x2gothinclient-chroot/patchsets/alsa-utils.wheezy/utils.sh
rename to chroot/patchsets/alsa-utils.wheezy/utils.sh
diff --git a/x2gothinclient-chroot/etc/freerdp/known_hosts b/common/etc/freerdp/known_hosts
similarity index 100%
rename from x2gothinclient-chroot/etc/freerdp/known_hosts
rename to common/etc/freerdp/known_hosts
diff --git a/common/etc/x2gothinclient_init b/common/etc/x2gothinclient_init
new file mode 120000
index 0000000..58c8c7f
--- /dev/null
+++ b/common/etc/x2gothinclient_init
@@ -0,0 +1 @@
+../../management/share/etc/x2gothinclient_init
\ No newline at end of file
diff --git a/common/etc/x2gothinclient_sessions b/common/etc/x2gothinclient_sessions
new file mode 120000
index 0000000..1e02528
--- /dev/null
+++ b/common/etc/x2gothinclient_sessions
@@ -0,0 +1 @@
+../../management/share/etc/x2gothinclient_sessions
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 7b43ed9..c84e21f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low
+x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
- * New upstream release (1.1.0.3):
+ * New upstream release (1.5.0.0):
- Stop advertising GNOME in default session profile. Switching to MATE.
- Use type=auto for automatic keyboard detection as default in example
session profiles.
diff --git a/debian/control b/debian/control
index b77a50e..7ac9e98 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,12 @@ Build-Depends:
qt4-qmake,
libqt4-dev,
po-debconf,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
Homepage: http://code.x2go.org/releases/source/x2gothinclient
Vcs-Git: git://code.x2go.org/x2gothinclient.git
Vcs-Browser: http://code.x2go.org/gitweb?p=x2gothinclient.git;a=summary
-Package: x2gothinclientmanagement
+Package: x2gothinclient-management
Architecture: all
Depends:
${misc:Depends},
@@ -25,6 +25,10 @@ Recommends:
syslinux,
syslinux-themes-debian-squeeze,
nfs-kernel-server
+Breaks:
+ x2gothinclientmanagement (<< 1.5.0.0),
+Replaces:
+ x2gothinclientmanagement (<< 1.5.0.0),
Suggests:
dhcp3-server | dnsmasq | isc-dhcp-server
Description: Management tools for X2Go Thin Client chroot server
@@ -37,8 +41,8 @@ Description: Management tools for X2Go Thin Client chroot server
- audio support
- authentication by smartcard and USB stick
.
- x2gothinclientmanagement:
- -------------------------
+ x2gothinclient-management:
+ --------------------------
IMPORTANT: Install this package on the chroot server that
provides X2Go Thin Client images over PXE/Etherboot.
.
@@ -56,7 +60,7 @@ Depends:
plymouth-themes-all,
pulseaudio-x11 | pulseaudio,
syslinux,
- x2gothinclient-daemon | x2gothinclient-minidesktop,
+ x2gothinclient-displaymanager | x2gothinclient-minidesktop,
Recommends:
acpid,
gnupg-agent,
@@ -67,9 +71,9 @@ Recommends:
memtest86+,
vim,
x11-xserver-utils,
- x2gocdmanager,
- x2gousbmount,
- x2gosmartcardrules,
+ x2gothinclient-cdmanager,
+ x2gothinclient-usbmount,
+ x2gothinclient-smartcardrules,
Suggests:
firmware-linux-nonfree,
firmware-bnx2,
@@ -110,7 +114,7 @@ Breaks:
Replaces:
x2gothinclient-minidesktop-mate,
Conflicts:
- x2gothinclient-daemon,
+ x2gothinclient-displaymanager,
Description: Minimal desktop for X2Go Thin Client chroot (based on MATE)
X2Go is a server based computing environment with
- session resuming
@@ -128,7 +132,7 @@ Description: Minimal desktop for X2Go Thin Client chroot (based on MATE)
you also have a set of basic applications that run on the thinclient
CPU (e.g. iceweasel with Flash).
-Package: x2gothinclient-daemon
+Package: x2gothinclient-displaymanager
Architecture: all
Depends:
${misc:Depends},
@@ -161,8 +165,8 @@ Description: login daemon starting x2goclient in displaymanager mode
- audio support
- authentication by smartcard and USB stick
.
- x2gothinclient-daemon:
- ----------------------
+ x2gothinclient-displaymanager:
+ -----------------------------
IMPORTANT: Use this Package only for the X2Go Thin Client Environment
(This package is meant to be installed in a CHROOT environment!!!)
.
@@ -175,13 +179,36 @@ Description: login daemon starting x2goclient in displaymanager mode
.
X2Go Client in thin-client-mode will behave like xdm, kdm or gdm.
-Package: x2gousbmount
+Package: x2gothinclient
+Architecture: all
+Depends:
+ ${misc:Depends},
+ x2gothinclient-displaymanager (>= ${source:Version}),
+Description: temporary package for migration to x2gothinclient-displaymanager
+ X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session broker support
+ - client-side mass storage mounting support
+ - client-side printing support
+ - audio support
+ - authentication by smartcard and USB stick
+ .
+ x2gothinclient:
+ ---------------
+ This package is a temporary migration package and will be deprecated soon.
+
+Package: x2gothinclient-usbmount
Architecture: all
Depends:
${misc:Depends},
udev,
cryptsetup,
libfile-path-expand-perl,
+Breaks:
+ x2gousbmount (<< 1.5.0.0),
+Replaces:
+ x2gousbmount (<< 1.5.0.0),
Description: clientside usb mass-storage device mounting
X2Go is a server based computing environment with
- session resuming
@@ -192,15 +219,15 @@ Description: clientside usb mass-storage device mounting
- audio support
- authentication by smartcard and USB stick
.
- x2gousbmount:
- -------------
+ x2gothinclient-usbmount:
+ ------------------------
IMPORTANT: Use this Package only for the x2go Thin Client Environment
(This package is meant to be installed in a CHROOT environment!!!)
.
This package adds client-side USB mass storage device mounting using
UDEV rules to your X2Go Thin Client.
-Package: x2gocdmanager
+Package: x2gothinclient-cdmanager
Architecture: any
Depends:
${shlibs:Depends},
@@ -209,6 +236,10 @@ Depends:
lsscsi,
eject,
libfile-path-expand-perl,
+Breaks:
+ x2gocdmanager (<< 1.5.0.0),
+Replaces:
+ x2gocdmanager (<< 1.5.0.0),
Description: clientside daemon enabling automatic CD-Rom mounting
X2Go is a server based computing environment with
- session resuming
@@ -219,19 +250,23 @@ Description: clientside daemon enabling automatic CD-Rom mounting
- audio support
- authentication by smartcard and USB stick
.
- x2gocdmanager:
- --------------
+ x2gothinclient-cdmanager:
+ -------------------------
IMPORTANT: Use this Package only for the x2go Thin Client Environment
(This package is meant to be installed in a CHROOT environment!!!)
.
This package adds a client-side daemon to your X2Go Thin Client that enables
automatic CD-ROM mounting within Thin Client X2Go sessions.
-Package: x2gosmartcardrules
+Package: x2gothinclient-smartcardrules
Architecture: all
Depends:
${misc:Depends},
udev,
+Breaks:
+ x2gosmartcardrules (<< 1.5.0.0),
+Replaces:
+ x2gosmartcardrules (<< 1.5.0.0),
Description: UDEV rules for smartcard readers
X2Go is a server based computing environment with
- session resuming
@@ -242,8 +277,8 @@ Description: UDEV rules for smartcard readers
- audio support
- authentication by smartcard and USB stick
.
- x2gosmartcardrules:
- -------------------
+ x2gothinclient-smartcardrules:
+ ------------------------------
IMPORTANT: Use this Package only for the x2go Thin Client Environment
(This package is meant to be installed in a CHROOT environment!!!)
.
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index eefda6d..8db2b9c 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] x2gothinclient.templates
+[type: gettext/rfc822deb] x2gothinclient-displaymanager.templates
diff --git a/debian/po/de.po b/debian/po/de.po
index 0c9f8bc..8ee980e 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -19,13 +19,13 @@ msgstr ""
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../.templates:1001
msgid "Default display manager:"
msgstr "Standardmäßiger Display-Manager"
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../.templates:1001
msgid ""
"On X2Go thin clients X2Go Client is sort of used as a display manager. For "
"this, X2Go Client gets started in TCE mode. The TCE acronym stands for thin "
@@ -39,7 +39,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../x2gothinclient-displaymanager.templates:1001
msgid ""
"Generally, a display manager is a program that provides graphical login "
"capabilities for the X Window System. Other display managers for example are "
@@ -51,7 +51,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../x2gothinclient-displaymanager.templates:1001
msgid ""
"However, X2Go Client in TCE mode does appear like a display manager, but it "
"will log you onto pre-defined X2Go sessions on remote servers."
@@ -62,7 +62,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../x2gothinclient-displaymanager.templates:1001
msgid ""
"As you are about to install X2Go Client in TCE mode on this machine and as "
"you already have other display managers installed on this machine, please "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 15e68de..0febb28 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -19,13 +19,13 @@ msgstr ""
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../x2gothinclient-displaymanager.templates:1001
msgid "Default display manager:"
msgstr ""
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../x2gothinclient-displaymanager.templates:1001
msgid ""
"On X2Go thin clients X2Go Client is sort of used as a display manager. For "
"this, X2Go Client gets started in TCE mode. The TCE acronym stands for thin "
@@ -35,7 +35,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../x2gothinclient-displaymanager.templates:1001
msgid ""
"Generally, a display manager is a program that provides graphical login "
"capabilities for the X Window System. Other display managers for example are "
@@ -44,7 +44,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../x2gothinclient-displaymanager.templates:1001
msgid ""
"However, X2Go Client in TCE mode does appear like a display manager, but it "
"will log you onto pre-defined X2Go sessions on remote servers."
@@ -52,7 +52,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../x2gothinclient.templates:1001
+#: ../x2gothinclient-displaymanager.templates:1001
msgid ""
"As you are about to install X2Go Client in TCE mode on this machine and as "
"you already have other display managers installed on this machine, please "
diff --git a/debian/rules b/debian/rules
index 4d3cf77..ea6c85c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ endif
configure: configure-stamp
configure-stamp:
dh_testdir
- cd x2gocdmanager/powerej && qmake-qt4 powerej.pro
+ cd cdmanager/powerej && qmake-qt4 powerej.pro
touch $@
build: build-arch build-indep
@@ -20,7 +20,7 @@ build-arch: build-stamp
build-stamp: configure-stamp
dh_testdir
dh_prep
- $(MAKE) -C x2gocdmanager/powerej
+ $(MAKE) -C cdmanager/powerej
touch $@
build-indep:
@@ -28,7 +28,7 @@ build-indep:
clean:
dh_testdir
dh_testroot
- [ ! -f x2gocdmanager/powerej/Makefile ] || $(MAKE) -C x2gocdmanager/powerej distclean
+ [ ! -f cdmanager/powerej/Makefile ] || $(MAKE) -C cdmanager/powerej distclean
dh_clean build-stamp configure-stamp
binary-indep: build-indep
@@ -43,10 +43,10 @@ binary-arch: build-arch
dh_installexamples
dh_installdirs
dh_install
- mkdir -p debian/x2gothinclient/usr/share/x2go/versions/
- cp VERSION debian/x2gothinclient/usr/share/x2go/versions/VERSION.x2gothinclient
- mkdir -p debian/x2gothinclientmanagement/usr/share/x2go/versions/
- cp VERSION debian/x2gothinclientmanagement/usr/share/x2go/versions/VERSION.x2gothinclientmanagement
+ mkdir -p debian/x2gothinclient-displaymanager/usr/share/x2go/versions/
+ cp VERSION debian/x2gothinclient-displaymanager/usr/share/x2go/versions/VERSION.x2gothinclient-dispaymanager
+ mkdir -p debian/x2gothinclient-management/usr/share/x2go/versions/
+ cp VERSION debian/x2gothinclient-management/usr/share/x2go/versions/VERSION.x2gothinclient-management
dh_installinit
dh_installman
dh_installdebconf
diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init
deleted file mode 120000
index 2728572..0000000
--- a/debian/x2gocdmanager.init
+++ /dev/null
@@ -1 +0,0 @@
-../x2gocdmanager/init/x2gocdmanager.init
\ No newline at end of file
diff --git a/debian/x2gocdmanager.install b/debian/x2gocdmanager.install
deleted file mode 100644
index c95d6a6..0000000
--- a/debian/x2gocdmanager.install
+++ /dev/null
@@ -1,2 +0,0 @@
-x2gocdmanager/powerej/x2goejectcd usr/bin
-x2gocdmanager/x2gocdmanager usr/sbin
diff --git a/debian/x2gocdmanager.manpages b/debian/x2gocdmanager.manpages
deleted file mode 100644
index a70dd31..0000000
--- a/debian/x2gocdmanager.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-x2gocdmanager/man/x2gocdmanager.8
-x2gocdmanager/man/x2goejectcd.1
diff --git a/debian/x2gosmartcardrules.install b/debian/x2gosmartcardrules.install
deleted file mode 100644
index 03c1e4d..0000000
--- a/debian/x2gosmartcardrules.install
+++ /dev/null
@@ -1,3 +0,0 @@
-x2gosmartcardrules/21-x2gognupgccid.rules lib/udev/rules.d/
-x2gosmartcardrules/x2gognupgccid usr/lib/x2go/tce/
-
diff --git a/debian/x2gosmartcardrules.manpages b/debian/x2gosmartcardrules.manpages
deleted file mode 100644
index a30ef3a..0000000
--- a/debian/x2gosmartcardrules.manpages
+++ /dev/null
@@ -1 +0,0 @@
-x2gosmartcardrules/man/x2gognupgccid.8
diff --git a/debian/x2gothinclient-cdmanager.init b/debian/x2gothinclient-cdmanager.init
new file mode 120000
index 0000000..873783f
--- /dev/null
+++ b/debian/x2gothinclient-cdmanager.init
@@ -0,0 +1 @@
+../cdmanager/init/x2gocdmanager.init
\ No newline at end of file
diff --git a/debian/x2gothinclient-cdmanager.install b/debian/x2gothinclient-cdmanager.install
new file mode 100644
index 0000000..a7a20bc
--- /dev/null
+++ b/debian/x2gothinclient-cdmanager.install
@@ -0,0 +1,2 @@
+cdmanager/powerej/x2goejectcd usr/bin
+cdmanager/x2gocdmanager usr/sbin
diff --git a/debian/x2gothinclient-cdmanager.manpages b/debian/x2gothinclient-cdmanager.manpages
new file mode 100644
index 0000000..744f462
--- /dev/null
+++ b/debian/x2gothinclient-cdmanager.manpages
@@ -0,0 +1,2 @@
+cdmanager/man/x2gocdmanager.8
+cdmanager/man/x2goejectcd.1
diff --git a/debian/x2gothinclient-chroot.init b/debian/x2gothinclient-chroot.init
index 79cca51..e7fc6e9 120000
--- a/debian/x2gothinclient-chroot.init
+++ b/debian/x2gothinclient-chroot.init
@@ -1 +1 @@
-../x2gothinclient-chroot/init/x2gothinclient-chroot.init
\ No newline at end of file
+../chroot/init/x2gothinclient-chroot.init
\ No newline at end of file
diff --git a/debian/x2gothinclient-chroot.install b/debian/x2gothinclient-chroot.install
index 53435cc..6aa32c4 100644
--- a/debian/x2gothinclient-chroot.install
+++ b/debian/x2gothinclient-chroot.install
@@ -1 +1 @@
-x2gothinclient-chroot/patchsets usr/share/x2go/tce/
\ No newline at end of file
+chroot/patchsets usr/share/x2go/tce/
\ No newline at end of file
diff --git a/debian/x2gothinclient-common.install b/debian/x2gothinclient-common.install
new file mode 100644
index 0000000..afa9abe
--- /dev/null
+++ b/debian/x2gothinclient-common.install
@@ -0,0 +1 @@
+management/share/etc/x2gothinclient_* etc/x2go/
diff --git a/debian/x2gothinclient-daemon.postinst b/debian/x2gothinclient-common.postinst
similarity index 71%
rename from debian/x2gothinclient-daemon.postinst
rename to debian/x2gothinclient-common.postinst
index 2c78125..938d3c4 100755
--- a/debian/x2gothinclient-daemon.postinst
+++ b/debian/x2gothinclient-common.postinst
@@ -1,13 +1,10 @@
#!/bin/sh
-# postinst script for x2gothinclient
+# postinst script for x2gothinclient-chroot
#
# see: dh_installdeb(1)
set -e
-# source debconf's configuration module
-. /usr/share/debconf/confmodule
-
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
@@ -20,33 +17,6 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-THIS_PACKAGE=x2gothinclient
-DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-
-# debconf is not a registry, so we only fiddle with the default file if it
-# does not exist
-if [ ! -e $DEFAULT_DISPLAY_MANAGER_FILE ]; then
- if db_get shared/default-x-display-manager; then
- # workaround debconf passthru bug (#379198)
- if [ -z "$RET" ]; then
- $RET="$THIS_PACKAGE"
- fi
- if [ "$THIS_PACKAGE" != "$RET" ]; then
- echo "Please be sure to run \"dpkg --configure $RET\"."
- fi
- echo "/usr/sbin/x2gothinclientd" > $DEFAULT_DISPLAY_MANAGER_FILE
- fi
-fi
-
-# remove the displaced old default display manager file if it exists
-if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
- rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
-fi
-
-# debconf hangs if gdm gets started below without this
-db_stop || true
-
-
case "$1" in
configure)
diff --git a/debian/x2gothinclient-daemon.postrm b/debian/x2gothinclient-common.postrm
similarity index 100%
rename from debian/x2gothinclient-daemon.postrm
rename to debian/x2gothinclient-common.postrm
diff --git a/debian/x2gothinclient-daemon.examples b/debian/x2gothinclient-daemon.examples
deleted file mode 100644
index 5bee45d..0000000
--- a/debian/x2gothinclient-daemon.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-x2gothinclientmanagement/share/etc/x2gothinclient-daemon_*
-
diff --git a/debian/x2gothinclient-daemon.init b/debian/x2gothinclient-daemon.init
deleted file mode 120000
index a847a27..0000000
--- a/debian/x2gothinclient-daemon.init
+++ /dev/null
@@ -1 +0,0 @@
-../x2gothinclient-daemon/init/x2gothinclient.init
\ No newline at end of file
diff --git a/debian/x2gothinclient-daemon.install b/debian/x2gothinclient-daemon.install
deleted file mode 100644
index fb86030..0000000
--- a/debian/x2gothinclient-daemon.install
+++ /dev/null
@@ -1,2 +0,0 @@
-x2gothinclient-daemon/sbin/x2gothinclientd usr/sbin/
-x2gothinclientmanagement/share/etc/x2gothinclient-daemon_* etc/x2go/
diff --git a/debian/x2gothinclient-daemon.manpages b/debian/x2gothinclient-daemon.manpages
deleted file mode 100644
index a07e884..0000000
--- a/debian/x2gothinclient-daemon.manpages
+++ /dev/null
@@ -1 +0,0 @@
-x2gothinclient/man/x2gothinclientd.8
\ No newline at end of file
diff --git a/debian/x2gothinclient-daemon.config b/debian/x2gothinclient-displaymanager.config
similarity index 100%
rename from debian/x2gothinclient-daemon.config
rename to debian/x2gothinclient-displaymanager.config
diff --git a/debian/x2gothinclient-daemon.dirs b/debian/x2gothinclient-displaymanager.dirs
similarity index 100%
rename from debian/x2gothinclient-daemon.dirs
rename to debian/x2gothinclient-displaymanager.dirs
diff --git a/debian/x2gothinclient-displaymanager.examples b/debian/x2gothinclient-displaymanager.examples
new file mode 100644
index 0000000..d52678f
--- /dev/null
+++ b/debian/x2gothinclient-displaymanager.examples
@@ -0,0 +1,2 @@
+management/share/etc/x2gothinclient-displaymanager_*
+
diff --git a/debian/x2gothinclient-displaymanager.init b/debian/x2gothinclient-displaymanager.init
new file mode 120000
index 0000000..3250181
--- /dev/null
+++ b/debian/x2gothinclient-displaymanager.init
@@ -0,0 +1 @@
+../displaymanager/init/x2gothinclient-displaymanager.init
\ No newline at end of file
diff --git a/debian/x2gothinclient-displaymanager.install b/debian/x2gothinclient-displaymanager.install
new file mode 100644
index 0000000..a088b8a
--- /dev/null
+++ b/debian/x2gothinclient-displaymanager.install
@@ -0,0 +1 @@
+displaymanager/sbin/x2gothinclientd usr/sbin/
diff --git a/debian/x2gothinclient-displaymanager.manpages b/debian/x2gothinclient-displaymanager.manpages
new file mode 100644
index 0000000..a794fd9
--- /dev/null
+++ b/debian/x2gothinclient-displaymanager.manpages
@@ -0,0 +1 @@
+displaymanager/man/x2gothinclientd.8
\ No newline at end of file
diff --git a/debian/x2gothinclient-displaymanager.postinst b/debian/x2gothinclient-displaymanager.postinst
new file mode 100755
index 0000000..a61e877
--- /dev/null
+++ b/debian/x2gothinclient-displaymanager.postinst
@@ -0,0 +1,54 @@
+#!/bin/sh
+# postinst script for x2gothinclient-daemon
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# source debconf's configuration module
+. /usr/share/debconf/confmodule
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+THIS_PACKAGE=x2gothinclient-displaymanager
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+# debconf is not a registry, so we only fiddle with the default file if it
+# does not exist
+if [ ! -e $DEFAULT_DISPLAY_MANAGER_FILE ]; then
+ if db_get shared/default-x-display-manager; then
+ # workaround debconf passthru bug (#379198)
+ if [ -z "$RET" ]; then
+ $RET="$THIS_PACKAGE"
+ fi
+ if [ "$THIS_PACKAGE" != "$RET" ]; then
+ echo "Please be sure to run \"dpkg --configure $RET\"."
+ fi
+ echo "/usr/sbin/x2gothinclientd" > $DEFAULT_DISPLAY_MANAGER_FILE
+ fi
+fi
+
+# remove the displaced old default display manager file if it exists
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+ rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
+fi
+
+# debconf hangs if gdm gets started below without this
+db_stop || true
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/x2gothinclient-daemon.prerm b/debian/x2gothinclient-displaymanager.prerm
similarity index 95%
rename from debian/x2gothinclient-daemon.prerm
rename to debian/x2gothinclient-displaymanager.prerm
index 9b7fb81..b15e762 100755
--- a/debian/x2gothinclient-daemon.prerm
+++ b/debian/x2gothinclient-displaymanager.prerm
@@ -1,6 +1,6 @@
#! /bin/sh
-# prerm script for x2gothinclient
+# prerm script for x2gothinclient-displaymanager
#
# see: dh_installdeb(1)
@@ -20,7 +20,7 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-THIS_PACKAGE=x2gothinclient
+THIS_PACKAGE=x2gothinclient-displaymanager
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
diff --git a/debian/x2gothinclient-daemon.templates b/debian/x2gothinclient-displaymanager.templates
similarity index 100%
rename from debian/x2gothinclient-daemon.templates
rename to debian/x2gothinclient-displaymanager.templates
diff --git a/debian/x2gothinclientmanagement.dirs b/debian/x2gothinclient-management.dirs
similarity index 100%
rename from debian/x2gothinclientmanagement.dirs
rename to debian/x2gothinclient-management.dirs
diff --git a/debian/x2gothinclient-management.docs b/debian/x2gothinclient-management.docs
new file mode 100644
index 0000000..732fe65
--- /dev/null
+++ b/debian/x2gothinclient-management.docs
@@ -0,0 +1,4 @@
+management/README
+management/README.hostname
+README.howto
+README.qemu
\ No newline at end of file
diff --git a/debian/x2gothinclient-management.install b/debian/x2gothinclient-management.install
new file mode 100644
index 0000000..2d02215
--- /dev/null
+++ b/debian/x2gothinclient-management.install
@@ -0,0 +1,4 @@
+management/sbin/x2gothinclient_* usr/sbin/
+management/etc/x2gothinclient_* etc/x2go/
+management/share/etc/ usr/share/x2go/tce/
+management/share/tftpboot usr/share/x2go/tce/
diff --git a/debian/x2gothinclient-management.manpages b/debian/x2gothinclient-management.manpages
new file mode 100644
index 0000000..a4213e0
--- /dev/null
+++ b/debian/x2gothinclient-management.manpages
@@ -0,0 +1 @@
+management/man/*.8
diff --git a/debian/x2gothinclient-minidesktop.init b/debian/x2gothinclient-minidesktop.init
index dc6cec1..bccd54b 120000
--- a/debian/x2gothinclient-minidesktop.init
+++ b/debian/x2gothinclient-minidesktop.init
@@ -1 +1 @@
-../x2gothinclient-minidesktop/init/x2gothinclient-minidesktop.init
\ No newline at end of file
+../minidesktop/init/x2gothinclient-minidesktop.init
\ No newline at end of file
diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install
index 6a9ce6e..16086ba 100644
--- a/debian/x2gothinclient-minidesktop.install
+++ b/debian/x2gothinclient-minidesktop.install
@@ -1,6 +1,6 @@
-x2gothinclient-minidesktop/etc/* etc/x2go/
-x2gothinclient-minidesktop/autostart/x2gothinclient-minidesktop.desktop etc/xdg/autostart/
-x2gothinclient-minidesktop/seeds/preseed_nodm usr/share/x2gothinclient/minidesktop/
-x2gothinclient-minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/
-x2gothinclient-minidesktop/mate-panel-layout/* usr/share/mate-panel/layouts/
-x2gothinclient-minidesktop/background/*.svg usr/share/images/
+minidesktop/etc/* etc/x2go/
+minidesktop/autostart/x2gothinclient-minidesktop.desktop etc/xdg/autostart/
+minidesktop/seeds/preseed_nodm usr/share/x2gothinclient/minidesktop/
+minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/
+minidesktop/mate-panel-layout/* usr/share/mate-panel/layouts/
+minidesktop/background/*.svg usr/share/images/
diff --git a/debian/x2gothinclient-minidesktop.postinst b/debian/x2gothinclient-minidesktop.postinst
index cbd1ac9..50876cc 100755
--- a/debian/x2gothinclient-minidesktop.postinst
+++ b/debian/x2gothinclient-minidesktop.postinst
@@ -17,8 +17,6 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-THIS_PACKAGE=x2gothinclient-minidesktop-mate
-
case "$1" in
configure)
glib-compile-schemas /usr/share/glib-2.0/schemas/
diff --git a/debian/x2gosmartcardrules.dirs b/debian/x2gothinclient-smartcardrules.dirs
similarity index 100%
rename from debian/x2gosmartcardrules.dirs
rename to debian/x2gothinclient-smartcardrules.dirs
diff --git a/debian/x2gothinclient-smartcardrules.install b/debian/x2gothinclient-smartcardrules.install
new file mode 100644
index 0000000..fe7a1da
--- /dev/null
+++ b/debian/x2gothinclient-smartcardrules.install
@@ -0,0 +1,3 @@
+smartcardrules/21-x2gognupgccid.rules lib/udev/rules.d/
+smartcardrules/x2gognupgccid usr/lib/x2go/tce/
+
diff --git a/debian/x2gothinclient-smartcardrules.manpages b/debian/x2gothinclient-smartcardrules.manpages
new file mode 100644
index 0000000..736531f
--- /dev/null
+++ b/debian/x2gothinclient-smartcardrules.manpages
@@ -0,0 +1 @@
+smartcardrules/man/x2gognupgccid.8
diff --git a/debian/x2gothinclient-usbmount.install b/debian/x2gothinclient-usbmount.install
new file mode 100644
index 0000000..6e6e807
--- /dev/null
+++ b/debian/x2gothinclient-usbmount.install
@@ -0,0 +1,3 @@
+usbmount/61-x2gousbmount.rules lib/udev/rules.d/
+usbmount/x2gousbmount usr/lib/x2go/tce/
+
diff --git a/debian/x2gothinclient-usbmount.manpages b/debian/x2gothinclient-usbmount.manpages
new file mode 100644
index 0000000..23d9f04
--- /dev/null
+++ b/debian/x2gothinclient-usbmount.manpages
@@ -0,0 +1 @@
+usbmount/man/x2gousbmount.8
diff --git a/debian/x2gothinclient.postinst b/debian/x2gothinclient.postinst
new file mode 100755
index 0000000..c0ca1e4
--- /dev/null
+++ b/debian/x2gothinclient.postinst
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+# prerm script for x2gothinclient
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# source debconf's configuration module
+. /usr/share/debconf/confmodule
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+THIS_PACKAGE=x2gothinclient
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+if [ "$1" = "configure" ]; then
+
+ # disown this question
+ db_unregister shared/default-x-display-manager || true
+
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/x2gothinclient-daemon.preinst b/debian/x2gothinclient.preinst
similarity index 96%
rename from debian/x2gothinclient-daemon.preinst
rename to debian/x2gothinclient.preinst
index c8ae413..35df2e5 100755
--- a/debian/x2gothinclient-daemon.preinst
+++ b/debian/x2gothinclient.preinst
@@ -1,5 +1,5 @@
#!/bin/sh
-# preinst script for x2gothinclient
+# preinst script for x2gothinclient-daemon
#
# see: dh_installdeb(1)
diff --git a/debian/x2gothinclientmanagement.docs b/debian/x2gothinclientmanagement.docs
deleted file mode 100644
index 49f3949..0000000
--- a/debian/x2gothinclientmanagement.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-x2gothinclientmanagement/README
-x2gothinclientmanagement/README.hostname
-README.howto
-README.qemu
\ No newline at end of file
diff --git a/debian/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install
deleted file mode 100644
index ee16044..0000000
--- a/debian/x2gothinclientmanagement.install
+++ /dev/null
@@ -1,4 +0,0 @@
-x2gothinclientmanagement/sbin/x2gothinclient_* usr/sbin/
-x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/
-x2gothinclientmanagement/share/etc/ usr/share/x2go/tce/
-x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/
diff --git a/debian/x2gothinclientmanagement.manpages b/debian/x2gothinclientmanagement.manpages
deleted file mode 100644
index ecc840a..0000000
--- a/debian/x2gothinclientmanagement.manpages
+++ /dev/null
@@ -1 +0,0 @@
-x2gothinclientmanagement/man/*.8
diff --git a/debian/x2gousbmount.install b/debian/x2gousbmount.install
deleted file mode 100644
index 1760792..0000000
--- a/debian/x2gousbmount.install
+++ /dev/null
@@ -1,3 +0,0 @@
-x2gousbmount/61-x2gousbmount.rules lib/udev/rules.d/
-x2gousbmount/x2gousbmount usr/lib/x2go/tce/
-
diff --git a/debian/x2gousbmount.manpages b/debian/x2gousbmount.manpages
deleted file mode 100644
index 90ded49..0000000
--- a/debian/x2gousbmount.manpages
+++ /dev/null
@@ -1 +0,0 @@
-x2gousbmount/man/x2gousbmount.8
diff --git a/displaymanager/etc/x2gothinclient-displaymanager_background.svg b/displaymanager/etc/x2gothinclient-displaymanager_background.svg
new file mode 120000
index 0000000..5dfd76b
--- /dev/null
+++ b/displaymanager/etc/x2gothinclient-displaymanager_background.svg
@@ -0,0 +1 @@
+../../management/share/etc/x2gothinclient-displaymanager_background.svg
\ No newline at end of file
diff --git a/displaymanager/etc/x2gothinclient-displaymanager_start b/displaymanager/etc/x2gothinclient-displaymanager_start
new file mode 120000
index 0000000..31544e3
--- /dev/null
+++ b/displaymanager/etc/x2gothinclient-displaymanager_start
@@ -0,0 +1 @@
+../../management/share/etc/x2gothinclient-displaymanager_start
\ No newline at end of file
diff --git a/x2gothinclient-daemon/init/x2gothinclient.init b/displaymanager/init/x2gothinclient-displaymanager.init
similarity index 95%
rename from x2gothinclient-daemon/init/x2gothinclient.init
rename to displaymanager/init/x2gothinclient-displaymanager.init
index 7c2b2e9..3025b2c 100644
--- a/x2gothinclient-daemon/init/x2gothinclient.init
+++ b/displaymanager/init/x2gothinclient-displaymanager.init
@@ -43,7 +43,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
export HOSTNAME
DAEMON=/usr/sbin/x2gothinclientd
NAME=x2gothinclient
-DESC="X2Go Thinclient Service"
+DESC="X2Go Thinclient Display Manager"
test -x $DAEMON || exit 0
if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient_start ]; then
@@ -52,9 +52,6 @@ if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient_sta
exit 0
fi
-# pre-init X2Go Thin Client through init script...
-test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init
-
# To start x2gothinclient even if it is not the default display manager, change
# HEED_DEFAULT_DISPLAY_MANAGER to "false."
HEED_DEFAULT_DISPLAY_MANAGER=${HEED_DEFAULT_DISPLAY_MANAGER:-true}
diff --git a/x2gothinclient-daemon/man/x2gothinclientd.8 b/displaymanager/man/x2gothinclientd.8
similarity index 100%
rename from x2gothinclient-daemon/man/x2gothinclientd.8
rename to displaymanager/man/x2gothinclientd.8
diff --git a/x2gothinclient-daemon/sbin/x2gothinclientd b/displaymanager/sbin/x2gothinclientd
similarity index 100%
rename from x2gothinclient-daemon/sbin/x2gothinclientd
rename to displaymanager/sbin/x2gothinclientd
diff --git a/x2gothinclientmanagement/README b/management/README
similarity index 100%
rename from x2gothinclientmanagement/README
rename to management/README
diff --git a/x2gothinclientmanagement/README.hostname b/management/README.hostname
similarity index 100%
rename from x2gothinclientmanagement/README.hostname
rename to management/README.hostname
diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/management/etc/x2gothinclient_settings
similarity index 100%
rename from x2gothinclientmanagement/etc/x2gothinclient_settings
rename to management/etc/x2gothinclient_settings
diff --git a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 b/management/man/x2gothinclient_cleanup.8
similarity index 100%
rename from x2gothinclientmanagement/man/x2gothinclient_cleanup.8
rename to management/man/x2gothinclient_cleanup.8
diff --git a/x2gothinclientmanagement/man/x2gothinclient_create.8 b/management/man/x2gothinclient_create.8
similarity index 100%
rename from x2gothinclientmanagement/man/x2gothinclient_create.8
rename to management/man/x2gothinclient_create.8
diff --git a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 b/management/man/x2gothinclient_preptftpboot.8
similarity index 100%
rename from x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8
rename to management/man/x2gothinclient_preptftpboot.8
diff --git a/x2gothinclientmanagement/man/x2gothinclient_shell.8 b/management/man/x2gothinclient_shell.8
similarity index 100%
rename from x2gothinclientmanagement/man/x2gothinclient_shell.8
rename to management/man/x2gothinclient_shell.8
diff --git a/x2gothinclientmanagement/man/x2gothinclient_update.8 b/management/man/x2gothinclient_update.8
similarity index 100%
rename from x2gothinclientmanagement/man/x2gothinclient_update.8
rename to management/man/x2gothinclient_update.8
diff --git a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 b/management/man/x2gothinclient_upgrade.8
similarity index 100%
rename from x2gothinclientmanagement/man/x2gothinclient_upgrade.8
rename to management/man/x2gothinclient_upgrade.8
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/management/sbin/x2gothinclient_cleanup
similarity index 100%
rename from x2gothinclientmanagement/sbin/x2gothinclient_cleanup
rename to management/sbin/x2gothinclient_cleanup
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/management/sbin/x2gothinclient_create
similarity index 100%
rename from x2gothinclientmanagement/sbin/x2gothinclient_create
rename to management/sbin/x2gothinclient_create
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot b/management/sbin/x2gothinclient_preptftpboot
similarity index 100%
rename from x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot
rename to management/sbin/x2gothinclient_preptftpboot
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/management/sbin/x2gothinclient_shell
similarity index 100%
rename from x2gothinclientmanagement/sbin/x2gothinclient_shell
rename to management/sbin/x2gothinclient_shell
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/management/sbin/x2gothinclient_update
similarity index 100%
rename from x2gothinclientmanagement/sbin/x2gothinclient_update
rename to management/sbin/x2gothinclient_update
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/management/sbin/x2gothinclient_upgrade
similarity index 100%
rename from x2gothinclientmanagement/sbin/x2gothinclient_upgrade
rename to management/sbin/x2gothinclient_upgrade
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient-daemon_background.svg b/management/share/etc/x2gothinclient-displaymanager_background.svg
similarity index 100%
rename from x2gothinclientmanagement/share/etc/x2gothinclient-daemon_background.svg
rename to management/share/etc/x2gothinclient-displaymanager_background.svg
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient-daemon_start b/management/share/etc/x2gothinclient-displaymanager_start
similarity index 100%
rename from x2gothinclientmanagement/share/etc/x2gothinclient-daemon_start
rename to management/share/etc/x2gothinclient-displaymanager_start
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_background.svg b/management/share/etc/x2gothinclient-minidesktop_background.svg
similarity index 100%
rename from x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_background.svg
rename to management/share/etc/x2gothinclient-minidesktop_background.svg
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_start b/management/share/etc/x2gothinclient-minidesktop_start
similarity index 100%
rename from x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_start
rename to management/share/etc/x2gothinclient-minidesktop_start
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient-daemon_init b/management/share/etc/x2gothinclient_init
similarity index 100%
rename from x2gothinclientmanagement/share/etc/x2gothinclient-daemon_init
rename to management/share/etc/x2gothinclient_init
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient-daemon_sessions b/management/share/etc/x2gothinclient_sessions
similarity index 100%
rename from x2gothinclientmanagement/share/etc/x2gothinclient-daemon_sessions
rename to management/share/etc/x2gothinclient_sessions
diff --git a/x2gothinclientmanagement/share/tftpboot/default.cfg b/management/share/tftpboot/default.cfg
similarity index 100%
rename from x2gothinclientmanagement/share/tftpboot/default.cfg
rename to management/share/tftpboot/default.cfg
diff --git a/x2gothinclientmanagement/share/tftpboot/local-boot.cfg b/management/share/tftpboot/local-boot.cfg
similarity index 100%
rename from x2gothinclientmanagement/share/tftpboot/local-boot.cfg
rename to management/share/tftpboot/local-boot.cfg
diff --git a/x2gothinclientmanagement/share/tftpboot/memtest.cfg b/management/share/tftpboot/memtest.cfg
similarity index 100%
rename from x2gothinclientmanagement/share/tftpboot/memtest.cfg
rename to management/share/tftpboot/memtest.cfg
diff --git a/x2gothinclientmanagement/share/tftpboot/pxelinux.cfg/default b/management/share/tftpboot/pxelinux.cfg/default
similarity index 100%
rename from x2gothinclientmanagement/share/tftpboot/pxelinux.cfg/default
rename to management/share/tftpboot/pxelinux.cfg/default
diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-simple-splash.png b/management/share/tftpboot/x2go-simple-splash.png
similarity index 100%
rename from x2gothinclientmanagement/share/tftpboot/x2go-simple-splash.png
rename to management/share/tftpboot/x2go-simple-splash.png
diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png b/management/share/tftpboot/x2go-splash.png
similarity index 100%
rename from x2gothinclientmanagement/share/tftpboot/x2go-splash.png
rename to management/share/tftpboot/x2go-splash.png
diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg b/management/share/tftpboot/x2go-tce.cfg
similarity index 100%
rename from x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg
rename to management/share/tftpboot/x2go-tce.cfg
diff --git a/x2gothinclient-minidesktop/autostart/x2gothinclient-minidesktop.desktop b/minidesktop/autostart/x2gothinclient-minidesktop.desktop
similarity index 100%
rename from x2gothinclient-minidesktop/autostart/x2gothinclient-minidesktop.desktop
rename to minidesktop/autostart/x2gothinclient-minidesktop.desktop
diff --git a/x2gothinclient-minidesktop/background/x2gotce-minidesktop-background.svg b/minidesktop/background/x2gotce-minidesktop-background.svg
similarity index 100%
rename from x2gothinclient-minidesktop/background/x2gotce-minidesktop-background.svg
rename to minidesktop/background/x2gotce-minidesktop-background.svg
diff --git a/minidesktop/etc/x2gothinclient-minidesktop_background.svg b/minidesktop/etc/x2gothinclient-minidesktop_background.svg
new file mode 120000
index 0000000..c0a1cae
--- /dev/null
+++ b/minidesktop/etc/x2gothinclient-minidesktop_background.svg
@@ -0,0 +1 @@
+../../management/share/etc/x2gothinclient-minidesktop_background.svg
\ No newline at end of file
diff --git a/minidesktop/etc/x2gothinclient-minidesktop_start b/minidesktop/etc/x2gothinclient-minidesktop_start
new file mode 120000
index 0000000..25ab5f8
--- /dev/null
+++ b/minidesktop/etc/x2gothinclient-minidesktop_start
@@ -0,0 +1 @@
+../../management/share/etc/x2gothinclient-minidesktop_start
\ No newline at end of file
diff --git a/x2gothinclient-minidesktop/init/x2gothinclient-minidesktop.init b/minidesktop/init/x2gothinclient-minidesktop.init
similarity index 94%
rename from x2gothinclient-minidesktop/init/x2gothinclient-minidesktop.init
rename to minidesktop/init/x2gothinclient-minidesktop.init
index 2695d04..16e6bbf 100644
--- a/x2gothinclient-minidesktop/init/x2gothinclient-minidesktop.init
+++ b/minidesktop/init/x2gothinclient-minidesktop.init
@@ -10,6 +10,10 @@
# Description: Prepare X2Go TCE MATE Desktop for usage
### END INIT INFO
+set -e
+
+. /lib/lsb/init-functions
+
case "$1" in
start|"")
exit 0
diff --git a/x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout b/minidesktop/mate-panel-layout/x2gothinclient-minidesktop.layout
similarity index 100%
rename from x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout
rename to minidesktop/mate-panel-layout/x2gothinclient-minidesktop.layout
diff --git a/x2gothinclient-minidesktop/schema-overrides/20_x2gothinclient-minidesktop-mate.gschema.override b/minidesktop/schema-overrides/20_x2gothinclient-minidesktop.gschema.override
similarity index 100%
rename from x2gothinclient-minidesktop/schema-overrides/20_x2gothinclient-minidesktop-mate.gschema.override
rename to minidesktop/schema-overrides/20_x2gothinclient-minidesktop.gschema.override
diff --git a/x2gothinclient-minidesktop/seeds/preseed_nodm b/minidesktop/seeds/preseed_nodm
similarity index 100%
rename from x2gothinclient-minidesktop/seeds/preseed_nodm
rename to minidesktop/seeds/preseed_nodm
diff --git a/x2gosmartcardrules/21-x2gognupgccid.rules b/smartcardrules/21-x2gognupgccid.rules
similarity index 100%
rename from x2gosmartcardrules/21-x2gognupgccid.rules
rename to smartcardrules/21-x2gognupgccid.rules
diff --git a/x2gosmartcardrules/man/x2gognupgccid.8 b/smartcardrules/man/x2gognupgccid.8
similarity index 100%
rename from x2gosmartcardrules/man/x2gognupgccid.8
rename to smartcardrules/man/x2gognupgccid.8
diff --git a/x2gosmartcardrules/x2gognupgccid b/smartcardrules/x2gognupgccid
similarity index 100%
rename from x2gosmartcardrules/x2gognupgccid
rename to smartcardrules/x2gognupgccid
diff --git a/x2gousbmount/61-x2gousbmount.rules b/usbmount/61-x2gousbmount.rules
similarity index 100%
rename from x2gousbmount/61-x2gousbmount.rules
rename to usbmount/61-x2gousbmount.rules
diff --git a/x2gousbmount/man/x2gousbmount.8 b/usbmount/man/x2gousbmount.8
similarity index 100%
rename from x2gousbmount/man/x2gousbmount.8
rename to usbmount/man/x2gousbmount.8
diff --git a/x2gousbmount/x2gousbmount b/usbmount/x2gousbmount
similarity index 100%
rename from x2gousbmount/x2gousbmount
rename to usbmount/x2gousbmount
diff --git a/x2gothinclient-daemon/etc/x2gothinclient-daemon_background.svg b/x2gothinclient-daemon/etc/x2gothinclient-daemon_background.svg
deleted file mode 120000
index bfcf1f1..0000000
--- a/x2gothinclient-daemon/etc/x2gothinclient-daemon_background.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../x2gothinclientmanagement/share/etc/x2gothinclient-daemon_background.svg
\ No newline at end of file
diff --git a/x2gothinclient-daemon/etc/x2gothinclient-daemon_init b/x2gothinclient-daemon/etc/x2gothinclient-daemon_init
deleted file mode 120000
index 0e7cfff..0000000
--- a/x2gothinclient-daemon/etc/x2gothinclient-daemon_init
+++ /dev/null
@@ -1 +0,0 @@
-../../x2gothinclientmanagement/share/etc/x2gothinclient-daemon_init
\ No newline at end of file
diff --git a/x2gothinclient-daemon/etc/x2gothinclient-daemon_sessions b/x2gothinclient-daemon/etc/x2gothinclient-daemon_sessions
deleted file mode 120000
index e39c306..0000000
--- a/x2gothinclient-daemon/etc/x2gothinclient-daemon_sessions
+++ /dev/null
@@ -1 +0,0 @@
-../../x2gothinclientmanagement/share/etc/x2gothinclient-daemon_sessions
\ No newline at end of file
diff --git a/x2gothinclient-daemon/etc/x2gothinclient-daemon_start b/x2gothinclient-daemon/etc/x2gothinclient-daemon_start
deleted file mode 120000
index 17a7e22..0000000
--- a/x2gothinclient-daemon/etc/x2gothinclient-daemon_start
+++ /dev/null
@@ -1 +0,0 @@
-../../x2gothinclientmanagement/share/etc/x2gothinclient-daemon_start
\ No newline at end of file
diff --git a/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_background.svg b/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_background.svg
deleted file mode 120000
index 6ca96b0..0000000
--- a/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_background.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_background.svg
\ No newline at end of file
diff --git a/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_init b/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_init
deleted file mode 120000
index 2de14af..0000000
--- a/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_init
+++ /dev/null
@@ -1 +0,0 @@
-../../x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_init
\ No newline at end of file
diff --git a/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_sessions b/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_sessions
deleted file mode 120000
index 41d67d8..0000000
--- a/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_sessions
+++ /dev/null
@@ -1 +0,0 @@
-../../x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_sessions
\ No newline at end of file
diff --git a/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_start b/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_start
deleted file mode 120000
index aac6aaf..0000000
--- a/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_start
+++ /dev/null
@@ -1 +0,0 @@
-../../x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_start
\ No newline at end of file
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_init b/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_init
deleted file mode 100755
index 3f922ca..0000000
--- a/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_init
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
-# Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Moritz 'Morty' Struebe <Moritz.Struebe at informatik.uni-erlangen.de>
-# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
-# X2Go is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# X2Go is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-if [ -z "$X2GO_HANDLE_DAEMON" ]; then
- mkdir -p ~x2gothinclient
- mkdir -p ~x2gothinclient/.x2goclient
- if [ -e /etc/x2go/x2gothinclient_sessions ]; then
- cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions
- fi
- if [ -e /etc/x2go/freerdp/known_hosts ]; then
- mkdir -p ~x2gothinclient/.freerdp
- cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts
- fi
- if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then
- mkdir -p ~x2gothinclient/Desktop
- cp /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/
- fi
- mkdir -p ~x2gothinclient/.kde
- mkdir -p ~x2gothinclient/.kde/socket-`hostname`
- mkdir -p ~x2gothinclient/mounts
- mkdir -p ~x2gothinclient/export
- mkdir -p ~x2gothinclient/logins
- mkdir -p ~x2gothinclient/.ssh
- mkdir -p ~x2gothinclient/.x2go
- chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf
- chmod go-rwx ~x2gothinclient -Rf
-fi
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_sessions b/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_sessions
deleted file mode 100644
index 525c74e..0000000
--- a/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_sessions
+++ /dev/null
@@ -1,66 +0,0 @@
-[20100623163928371]
-defsndport = false
-useiconv = false
-iconvfrom = ISO8859-15
-height = 768
-export =
-speed = 4
-fullscreen = true
-width = 1024
-quality = 9
-xdmcpserver = localhost
-soundtunnel = 1
-rdpoptions =
-soundsystem = pulse
-print = 1
-type = auto
-sndport = 4713
-usekbd = true
-fstunnel = true
-applications = OFFICE, WWWBROWSER, MAILCLIENT, TERMINAL
-host = 192.168.0.254
-link = ADSL
-user = <USER>
-key =
-startsoundsystem = false
-icon =
-sound = true
-rootless = false
-name = X2Go.EXAMPLE
-iconvto = UTF-8
-rdpserver =
-useexports = true
-command = MATE
-dpi = 96
-sshport = 22
-setdpi = false
-pack = 16m-jpeg
-
-[20120607130604224872]
-height = 768
-export =
-fullscreen = true
-useexports = 1
-width = 1024
-speed = 4
-rdpoptions =
-soundsystem = pulse
-print = true
-type = auto
-sndport = 4713
-usekbd = true
-host = rdpserver.your-intranet.local
-multidisp=false
-sound=false
-rootless=false
-name=DirectRDP.Example
-command=RDP
-dpi=96
-published=false
-setdpi=false
-user=<USER>
-maxdim=false
-rdpclient=xfreerdp
-directrdpsettings=-d YOUR-DOMAIN --plugin rdpsnd --plugin rdpdr --data disk:media:/media --
-rdpport=3389
-directrdp=true
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
More information about the x2go-commits
mailing list