[X2Go-Commits] [x2gothinclient] 01/03: debian/control: Rename bin:package: x2gothinclient -> x2gothinclient-daemon.

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 e2519343397ed84c45c3eb86c8919dedbb323697
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Aug 23 01:57:13 2014 +0200

    debian/control: Rename bin:package: x2gothinclient -> x2gothinclient-daemon.
---
 debian/changelog                                   |    2 ++
 debian/control                                     |   23 +++++++++++++-------
 ...nclient.config => x2gothinclient-daemon.config} |    0
 ...othinclient.dirs => x2gothinclient-daemon.dirs} |    0
 ...ent.examples => x2gothinclient-daemon.examples} |    0
 debian/x2gothinclient-daemon.init                  |    1 +
 ...lient.install => x2gothinclient-daemon.install} |    0
 ...ent.manpages => x2gothinclient-daemon.manpages} |    0
 ...ent.postinst => x2gothinclient-daemon.postinst} |    0
 ...nclient.postrm => x2gothinclient-daemon.postrm} |    0
 ...lient.preinst => x2gothinclient-daemon.preinst} |    0
 ...hinclient.prerm => x2gothinclient-daemon.prerm} |    0
 ...t.templates => x2gothinclient-daemon.templates} |    0
 debian/x2gothinclient-minidesktop.install          |    3 ++-
 debian/x2gothinclient.init                         |    1 -
 .../etc/freerdp/known_hosts                        |    0
 .../etc/x2gothinclient-daemon_background.svg       |    1 +
 .../etc/x2gothinclient-daemon_init                 |    1 +
 .../etc/x2gothinclient-daemon_sessions             |    1 +
 .../etc/x2gothinclient-daemon_start                |    1 +
 .../init/x2gothinclient.init                       |    0
 .../man/x2gothinclientd.8                          |    0
 .../sbin/x2gothinclientd                           |    0
 .../etc/x2gothinclient-minidesktop_background.svg  |    1 +
 .../etc/x2gothinclient-minidesktop_init            |    1 +
 .../etc/x2gothinclient-minidesktop_sessions        |    1 +
 .../etc/x2gothinclient-minidesktop_start           |    1 +
 x2gothinclient/etc                                 |    1 -
 ...nd.svg => x2gothinclient-daemon_background.svg} |    0
 ...othinclient_init => x2gothinclient-daemon_init} |    0
 ...ent_sessions => x2gothinclient-daemon_sessions} |    0
 ...hinclient_start => x2gothinclient-daemon_start} |    2 +-
 ...g => x2gothinclient-minidesktop_background.svg} |    0
 ...client_init => x2gothinclient-minidesktop_init} |    0
 ...essions => x2gothinclient-minidesktop_sessions} |    0
 ...ient_start => x2gothinclient-minidesktop_start} |    3 +--
 36 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48ce978..7b43ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low
       (x2gothinclient_shell or x2gothinclient_upgrade).
     - Avoid x2gothinclient_init failures, use if..then..fi instead of
       the test command.
+  * debian/control:
+    + Rename bin:package: x2gothinclient -> x2gothinclient-daemon.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Feb 2014 12:03:00 +0100
 
diff --git a/debian/control b/debian/control
index 0b9fdae..b77a50e 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Depends:
  plymouth-themes-all,
  pulseaudio-x11 | pulseaudio,
  syslinux,
- x2gothinclient,
+ x2gothinclient-daemon | x2gothinclient-minidesktop,
 Recommends:
  acpid,
  gnupg-agent,
@@ -109,6 +109,8 @@ Breaks:
  x2gothinclient-minidesktop-mate,
 Replaces:
  x2gothinclient-minidesktop-mate,
+Conflicts:
+ x2gothinclient-daemon,
 Description: Minimal desktop for X2Go Thin Client chroot (based on MATE)
  X2Go is a server based computing environment with
     - session resuming
@@ -126,7 +128,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
+Package: x2gothinclient-daemon
 Architecture: all
 Depends:
  ${misc:Depends},
@@ -139,11 +141,16 @@ Depends:
  dbus-x11,
  policykit-1,
  libfile-path-expand-perl,
-Suggests:
+Provides:
+ x2gothinclient,
 Breaks:
- x2gothinshutdown
+ x2gothinshutdown,
+ x2gothinclient,
 Replaces:
- x2gothinshutdown
+ x2gothinshutdown,
+ x2gothinclient,
+Conflicts:
+ x2gothinclient-minidesktop,
 Description: login daemon starting x2goclient in displaymanager mode
  X2Go is a server based computing environment with
     - session resuming
@@ -154,8 +161,8 @@ Description: login daemon starting x2goclient in displaymanager mode
     - audio support
     - authentication by smartcard and USB stick
  .
- x2gothinclient:
- ---------------
+ x2gothinclient-daemon:
+ ----------------------
  IMPORTANT: Use this Package only for the X2Go Thin Client Environment
  (This package is meant to be installed in a CHROOT environment!!!)
  .
@@ -224,7 +231,7 @@ Package: x2gosmartcardrules
 Architecture: all
 Depends:
  ${misc:Depends},
- udev
+ udev,
 Description: UDEV rules for smartcard readers
  X2Go is a server based computing environment with
     - session resuming
diff --git a/debian/x2gothinclient.config b/debian/x2gothinclient-daemon.config
similarity index 100%
rename from debian/x2gothinclient.config
rename to debian/x2gothinclient-daemon.config
diff --git a/debian/x2gothinclient.dirs b/debian/x2gothinclient-daemon.dirs
similarity index 100%
rename from debian/x2gothinclient.dirs
rename to debian/x2gothinclient-daemon.dirs
diff --git a/debian/x2gothinclient.examples b/debian/x2gothinclient-daemon.examples
similarity index 100%
rename from debian/x2gothinclient.examples
rename to debian/x2gothinclient-daemon.examples
diff --git a/debian/x2gothinclient-daemon.init b/debian/x2gothinclient-daemon.init
new file mode 120000
index 0000000..a847a27
--- /dev/null
+++ b/debian/x2gothinclient-daemon.init
@@ -0,0 +1 @@
+../x2gothinclient-daemon/init/x2gothinclient.init
\ No newline at end of file
diff --git a/debian/x2gothinclient.install b/debian/x2gothinclient-daemon.install
similarity index 100%
rename from debian/x2gothinclient.install
rename to debian/x2gothinclient-daemon.install
diff --git a/debian/x2gothinclient.manpages b/debian/x2gothinclient-daemon.manpages
similarity index 100%
rename from debian/x2gothinclient.manpages
rename to debian/x2gothinclient-daemon.manpages
diff --git a/debian/x2gothinclient.postinst b/debian/x2gothinclient-daemon.postinst
similarity index 100%
rename from debian/x2gothinclient.postinst
rename to debian/x2gothinclient-daemon.postinst
diff --git a/debian/x2gothinclient.postrm b/debian/x2gothinclient-daemon.postrm
similarity index 100%
rename from debian/x2gothinclient.postrm
rename to debian/x2gothinclient-daemon.postrm
diff --git a/debian/x2gothinclient.preinst b/debian/x2gothinclient-daemon.preinst
similarity index 100%
rename from debian/x2gothinclient.preinst
rename to debian/x2gothinclient-daemon.preinst
diff --git a/debian/x2gothinclient.prerm b/debian/x2gothinclient-daemon.prerm
similarity index 100%
rename from debian/x2gothinclient.prerm
rename to debian/x2gothinclient-daemon.prerm
diff --git a/debian/x2gothinclient.templates b/debian/x2gothinclient-daemon.templates
similarity index 100%
rename from debian/x2gothinclient.templates
rename to debian/x2gothinclient-daemon.templates
diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install
index 79c5825..6a9ce6e 100644
--- a/debian/x2gothinclient-minidesktop.install
+++ b/debian/x2gothinclient-minidesktop.install
@@ -1,5 +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/
-x2gothinclient-minidesktop/autostart/x2gothinclient-minidesktop.desktop etc/xdg/autostart/
\ No newline at end of file
diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init
deleted file mode 120000
index 0161066..0000000
--- a/debian/x2gothinclient.init
+++ /dev/null
@@ -1 +0,0 @@
-../x2gothinclient/init/x2gothinclient.init
\ No newline at end of file
diff --git a/x2gothinclientmanagement/share/etc/freerdp/known_hosts b/x2gothinclient-chroot/etc/freerdp/known_hosts
similarity index 100%
rename from x2gothinclientmanagement/share/etc/freerdp/known_hosts
rename to x2gothinclient-chroot/etc/freerdp/known_hosts
diff --git a/x2gothinclient-daemon/etc/x2gothinclient-daemon_background.svg b/x2gothinclient-daemon/etc/x2gothinclient-daemon_background.svg
new file mode 120000
index 0000000..bfcf1f1
--- /dev/null
+++ b/x2gothinclient-daemon/etc/x2gothinclient-daemon_background.svg
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 0000000..0e7cfff
--- /dev/null
+++ b/x2gothinclient-daemon/etc/x2gothinclient-daemon_init
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 0000000..e39c306
--- /dev/null
+++ b/x2gothinclient-daemon/etc/x2gothinclient-daemon_sessions
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 0000000..17a7e22
--- /dev/null
+++ b/x2gothinclient-daemon/etc/x2gothinclient-daemon_start
@@ -0,0 +1 @@
+../../x2gothinclientmanagement/share/etc/x2gothinclient-daemon_start
\ No newline at end of file
diff --git a/x2gothinclient/init/x2gothinclient.init b/x2gothinclient-daemon/init/x2gothinclient.init
similarity index 100%
rename from x2gothinclient/init/x2gothinclient.init
rename to x2gothinclient-daemon/init/x2gothinclient.init
diff --git a/x2gothinclient/man/x2gothinclientd.8 b/x2gothinclient-daemon/man/x2gothinclientd.8
similarity index 100%
rename from x2gothinclient/man/x2gothinclientd.8
rename to x2gothinclient-daemon/man/x2gothinclientd.8
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient-daemon/sbin/x2gothinclientd
similarity index 100%
rename from x2gothinclient/sbin/x2gothinclientd
rename to x2gothinclient-daemon/sbin/x2gothinclientd
diff --git a/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_background.svg b/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_background.svg
new file mode 120000
index 0000000..6ca96b0
--- /dev/null
+++ b/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_background.svg
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 0000000..2de14af
--- /dev/null
+++ b/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_init
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 0000000..41d67d8
--- /dev/null
+++ b/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_sessions
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 0000000..aac6aaf
--- /dev/null
+++ b/x2gothinclient-minidesktop/etc/x2gothinclient-minidesktop_start
@@ -0,0 +1 @@
+../../x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_start
\ No newline at end of file
diff --git a/x2gothinclient/etc b/x2gothinclient/etc
deleted file mode 120000
index 89e9d47..0000000
--- a/x2gothinclient/etc
+++ /dev/null
@@ -1 +0,0 @@
-../x2gothinclientmanagement/share/etc
\ No newline at end of file
diff --git a/x2gothinclientmanagement/share/etc/x2goclient-background.svg b/x2gothinclientmanagement/share/etc/x2gothinclient-daemon_background.svg
similarity index 100%
copy from x2gothinclientmanagement/share/etc/x2goclient-background.svg
copy to x2gothinclientmanagement/share/etc/x2gothinclient-daemon_background.svg
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_init b/x2gothinclientmanagement/share/etc/x2gothinclient-daemon_init
similarity index 100%
copy from x2gothinclientmanagement/share/etc/x2gothinclient_init
copy to x2gothinclientmanagement/share/etc/x2gothinclient-daemon_init
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_sessions b/x2gothinclientmanagement/share/etc/x2gothinclient-daemon_sessions
similarity index 100%
copy from x2gothinclientmanagement/share/etc/x2gothinclient_sessions
copy to x2gothinclientmanagement/share/etc/x2gothinclient-daemon_sessions
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_start b/x2gothinclientmanagement/share/etc/x2gothinclient-daemon_start
similarity index 96%
copy from x2gothinclientmanagement/share/etc/x2gothinclient_start
copy to x2gothinclientmanagement/share/etc/x2gothinclient-daemon_start
index 8a8ab74..de1475f 100755
--- a/x2gothinclientmanagement/share/etc/x2gothinclient_start
+++ b/x2gothinclientmanagement/share/etc/x2gothinclient-daemon_start
@@ -29,7 +29,7 @@
                     --thinclient \
                     --haltbt \
                     --read-exports-from=~/export \
-                    --background=/etc/x2go/x2goclient-background.svg \
+                    --background=/etc/x2go/x2gothinclient-background.svg \
                     --no-session-edit \
                     --session=X2Go.Example \
                     --add-to-known-hosts &
diff --git a/x2gothinclientmanagement/share/etc/x2goclient-background.svg b/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_background.svg
similarity index 100%
rename from x2gothinclientmanagement/share/etc/x2goclient-background.svg
rename to x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_background.svg
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_init b/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_init
similarity index 100%
rename from x2gothinclientmanagement/share/etc/x2gothinclient_init
rename to x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_init
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_sessions b/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_sessions
similarity index 100%
rename from x2gothinclientmanagement/share/etc/x2gothinclient_sessions
rename to x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_sessions
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_start b/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_start
similarity index 94%
rename from x2gothinclientmanagement/share/etc/x2gothinclient_start
rename to x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_start
index 8a8ab74..07d1592 100755
--- a/x2gothinclientmanagement/share/etc/x2gothinclient_start
+++ b/x2gothinclientmanagement/share/etc/x2gothinclient-minidesktop_start
@@ -26,10 +26,9 @@
                     --kbd-type=auto \
                     --set-kbd=1 \
                     --geometry=fullscreen \
-                    --thinclient \
                     --haltbt \
                     --read-exports-from=~/export \
-                    --background=/etc/x2go/x2goclient-background.svg \
+                    --background=/etc/x2go/x2gothinclient-background.svg \
                     --no-session-edit \
                     --session=X2Go.Example \
                     --add-to-known-hosts &

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git

More information about the x2go-commits mailing list