[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-73-g108e3eb

[X2Go dev team]

The branch, build-baikal has been updated
       via  108e3eb7b165843884c9c04252b8d8f489ce4da5 (commit)
      from  ef76db4576387f2b1abff9405eaa6bee32e1a249 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                               |    2 ++
 debian/x2goserver.install                      |   27 ++++++++++++++++++------
 debian/x2goserver.link                         |    2 ++
 x2goserver/bin/{ => compat}/x2goresume         |    0
 x2goserver/bin/{ => compat}/x2gosuspend-agent  |    0
 x2goserver/bin/{ => compat}/x2goterminate      |    0
 x2goserver/bin/{ => compat}/x2goumount         |    0
 x2goserver/bin/{ => compat}/x2goumount_session |    0
 x2goserver/{bin => lib}/x2gochangestatus       |    0
 x2goserver/{bin => lib}/x2gocreatesession      |    0
 x2goserver/{bin => lib}/x2gogetagent           |    0
 x2goserver/{bin => lib}/x2gogetdisplays        |    0
 x2goserver/{bin => lib}/x2gogetports           |    0
 x2goserver/{bin => lib}/x2gogetservers         |    0
 x2goserver/{bin => lib}/x2goinsertport         |    0
 x2goserver/{bin => lib}/x2goinsertsession      |    0
 x2goserver/{bin => lib}/x2golistsessions_root  |    0
 x2goserver/{bin => lib}/x2golistsessions_sql   |    0
 x2goserver/{bin => lib}/x2gosessionlimit       |    0
 x2goserver/{bin => lib}/x2gosqlitewrapper      |    0
 20 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 debian/x2goserver.link
 rename x2goserver/bin/{ => compat}/x2goresume (100%)
 rename x2goserver/bin/{ => compat}/x2gosuspend-agent (100%)
 rename x2goserver/bin/{ => compat}/x2goterminate (100%)
 rename x2goserver/bin/{ => compat}/x2goumount (100%)
 rename x2goserver/bin/{ => compat}/x2goumount_session (100%)
 rename x2goserver/{bin => lib}/x2gochangestatus (100%)
 rename x2goserver/{bin => lib}/x2gocreatesession (100%)
 rename x2goserver/{bin => lib}/x2gogetagent (100%)
 rename x2goserver/{bin => lib}/x2gogetdisplays (100%)
 rename x2goserver/{bin => lib}/x2gogetports (100%)
 rename x2goserver/{bin => lib}/x2gogetservers (100%)
 rename x2goserver/{bin => lib}/x2goinsertport (100%)
 rename x2goserver/{bin => lib}/x2goinsertsession (100%)
 rename x2goserver/{bin => lib}/x2golistsessions_root (100%)
 rename x2goserver/{bin => lib}/x2golistsessions_sql (100%)
 rename x2goserver/{bin => lib}/x2gosessionlimit (100%)
 rename x2goserver/{bin => lib}/x2gosqlitewrapper (100%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a01fa12..718c8d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Rename x2goumount_session calls to x2goumount-session calls in x2goserver
     internal scripts.
   * React to bug #627990, prefer man2html-base over man2html.
+  * Re-arranged script files in /bin and /lib directories, this is
+    still compensated by dh_install and dh_link and needs more work.
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/debian/x2goserver.install b/debian/x2goserver.install
index d33709c..acfb3b8 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -1,6 +1,21 @@
-x2goserver/bin/x2go*      /usr/bin/
-x2goserver/sbin/x2go*     /usr/sbin/
-x2goserver/etc/x2gosql/sql         /etc/x2go/x2gosql/
-x2goserver/etc/x2goserver.conf     /etc/x2go/
-x2goserver/lib/x2godbwrapper.pm    /usr/lib/x2go/
-x2goserver/VERSION.x2goserver      /usr/share/x2go/versions/
\ No newline at end of file
+x2goserver/bin/x2go*                    /usr/bin/
+x2goserver/sbin/x2go*                   /usr/sbin/
+x2goserver/etc/x2gosql/sql              /etc/x2go/x2gosql/
+x2goserver/etc/x2goserver.conf          /etc/x2go/
+x2goserver/lib/x2godbwrapper.pm         /usr/lib/x2go/
+x2goserver/VERSION.x2goserver           /usr/share/x2go/versions/
+# the following executables should go to /usr/lib/x2go
+x2goserver/lib/x2gochangestatus         /usr/bin
+x2goserver/lib/x2gocreatesession        /usr/bin
+x2goserver/lib/x2gogetagent             /usr/bin
+x2goserver/lib/x2gogetdisplays          /usr/bin
+x2goserver/lib/x2gogetports             /usr/bin
+x2goserver/lib/x2gogetservers           /usr/bin
+x2goserver/lib/x2goinsertport           /usr/bin
+x2goserver/lib/x2goinsertsession        /usr/bin
+x2goserver/lib/x2gosessionlimit         /usr/bin
+x2goserver/lib/x2gosqlitewrapper        /usr/bin
+x2goserver/lib/x2golistsessions_sql     /usr/bin
+x2goserver/lib/x2golistsessions_root    /usr/bin
+# compatibility
+x2goserver/bin/compat/x2go*             /usr/bin
diff --git a/debian/x2goserver.link b/debian/x2goserver.link
new file mode 100644
index 0000000..8722bcf
--- /dev/null
+++ b/debian/x2goserver.link
@@ -0,0 +1,2 @@
+# compatibility
+/usr/bin/x2goumount-session /usr/bin/x2goumount_session
\ No newline at end of file
diff --git a/x2goserver/bin/x2goresume b/x2goserver/bin/compat/x2goresume
similarity index 100%
rename from x2goserver/bin/x2goresume
rename to x2goserver/bin/compat/x2goresume
diff --git a/x2goserver/bin/x2gosuspend-agent b/x2goserver/bin/compat/x2gosuspend-agent
similarity index 100%
rename from x2goserver/bin/x2gosuspend-agent
rename to x2goserver/bin/compat/x2gosuspend-agent
diff --git a/x2goserver/bin/x2goterminate b/x2goserver/bin/compat/x2goterminate
similarity index 100%
rename from x2goserver/bin/x2goterminate
rename to x2goserver/bin/compat/x2goterminate
diff --git a/x2goserver/bin/x2goumount b/x2goserver/bin/compat/x2goumount
similarity index 100%
rename from x2goserver/bin/x2goumount
rename to x2goserver/bin/compat/x2goumount
diff --git a/x2goserver/bin/x2goumount_session b/x2goserver/bin/compat/x2goumount_session
similarity index 100%
rename from x2goserver/bin/x2goumount_session
rename to x2goserver/bin/compat/x2goumount_session
diff --git a/x2goserver/bin/x2gochangestatus b/x2goserver/lib/x2gochangestatus
similarity index 100%
rename from x2goserver/bin/x2gochangestatus
rename to x2goserver/lib/x2gochangestatus
diff --git a/x2goserver/bin/x2gocreatesession b/x2goserver/lib/x2gocreatesession
similarity index 100%
rename from x2goserver/bin/x2gocreatesession
rename to x2goserver/lib/x2gocreatesession
diff --git a/x2goserver/bin/x2gogetagent b/x2goserver/lib/x2gogetagent
similarity index 100%
rename from x2goserver/bin/x2gogetagent
rename to x2goserver/lib/x2gogetagent
diff --git a/x2goserver/bin/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays
similarity index 100%
rename from x2goserver/bin/x2gogetdisplays
rename to x2goserver/lib/x2gogetdisplays
diff --git a/x2goserver/bin/x2gogetports b/x2goserver/lib/x2gogetports
similarity index 100%
rename from x2goserver/bin/x2gogetports
rename to x2goserver/lib/x2gogetports
diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/lib/x2gogetservers
similarity index 100%
rename from x2goserver/bin/x2gogetservers
rename to x2goserver/lib/x2gogetservers
diff --git a/x2goserver/bin/x2goinsertport b/x2goserver/lib/x2goinsertport
similarity index 100%
rename from x2goserver/bin/x2goinsertport
rename to x2goserver/lib/x2goinsertport
diff --git a/x2goserver/bin/x2goinsertsession b/x2goserver/lib/x2goinsertsession
similarity index 100%
rename from x2goserver/bin/x2goinsertsession
rename to x2goserver/lib/x2goinsertsession
diff --git a/x2goserver/bin/x2golistsessions_root b/x2goserver/lib/x2golistsessions_root
similarity index 100%
rename from x2goserver/bin/x2golistsessions_root
rename to x2goserver/lib/x2golistsessions_root
diff --git a/x2goserver/bin/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql
similarity index 100%
rename from x2goserver/bin/x2golistsessions_sql
rename to x2goserver/lib/x2golistsessions_sql
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/lib/x2gosessionlimit
similarity index 100%
rename from x2goserver/bin/x2gosessionlimit
rename to x2goserver/lib/x2gosessionlimit
diff --git a/x2goserver/bin/x2gosqlitewrapper b/x2goserver/lib/x2gosqlitewrapper
similarity index 100%
rename from x2goserver/bin/x2gosqlitewrapper
rename to x2goserver/lib/x2gosqlitewrapper


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).