[X2Go-Commits] lightdm-remote-session-x2go.git - x2gosessiontype (branch) updated: b396c574a0c3373d3b807e5ea629670cf7cc6150
X2Go dev team
git-admin at x2go.org
Wed Apr 24 17:54:43 CEST 2013
The branch, x2gosessiontype has been updated
via b396c574a0c3373d3b807e5ea629670cf7cc6150 (commit)
from 6f3eefc484fd60aa21d3b3e8af5c4ab0bf411234 (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:
.bzrignore => .gitgnore | 0
Makefile.am | 32 ++++++++++----------
configure.ac | 2 +-
debian/changelog | 7 +++++
debian/compat | 1 +
debian/control | 28 +++++++++++++++++
debian/copyright | 29 ++++++++++++++++++
debian/rules | 8 +++++
debian/source/format | 1 +
debian/watch | 2 ++
freerdp-session.in | 9 ------
freerdp.desktop.in | 8 -----
...on-freerdp.in => lightdm-remote-session-x2go.in | 2 +-
lightdm-remote-freerdp => lightdm-remote-x2go | 4 +--
socket-sucker.c | 2 +-
...rdp-session-wrapper.c => x2go-session-wrapper.c | 2 +-
x2go-session.in | 9 ++++++
x2go.desktop.in | 8 +++++
18 files changed, 115 insertions(+), 39 deletions(-)
copy .bzrignore => .gitgnore (100%)
create mode 100644 debian/changelog
create mode 100644 debian/compat
create mode 100644 debian/control
create mode 100644 debian/copyright
create mode 100644 debian/rules
create mode 100644 debian/source/format
create mode 100644 debian/watch
delete mode 100755 freerdp-session.in
delete mode 100644 freerdp.desktop.in
rename lightdm-remote-session-freerdp.in => lightdm-remote-session-x2go.in (97%)
rename lightdm-remote-freerdp => lightdm-remote-x2go (72%)
rename freerdp-session-wrapper.c => x2go-session-wrapper.c (95%)
create mode 100755 x2go-session.in
create mode 100644 x2go.desktop.in
The diff of changes is:
diff --git a/.bzrignore b/.gitgnore
similarity index 100%
copy from .bzrignore
copy to .gitgnore
diff --git a/Makefile.am b/Makefile.am
index 44c2938..fcdb845 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,33 +1,33 @@
pam_sessiondir = $(sysconfdir)/pam.d/
pam_session_DATA = \
- lightdm-remote-freerdp
+ lightdm-remote-x2go
lightdm_sessiondir = $(datadir)/lightdm/remote-sessions
lightdm_session_DATA = \
- freerdp.desktop
+ x2go.desktop
%.desktop: %.desktop.in
@sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
session_startdir = $(pkgdatadir)
session_start_SCRIPTS = \
- freerdp-session
+ x2go-session
-freerdp-session: freerdp-session.in
+x2go-session: x2go-session.in
@sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
@chmod +x $@
apparmordir = $(sysconfdir)/apparmor.d/
apparmor_DATA = \
- lightdm-remote-session-freerdp
+ lightdm-remote-session-x2go
-lightdm-remote-session-freerdp: lightdm-remote-session-freerdp.in
+lightdm-remote-session-x2go: lightdm-remote-session-x2go.in
@sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
pkglibexec_PROGRAMS = \
socket-sucker \
- freerdp-session-wrapper
+ x2go-session-wrapper
socket_sucker_SOURCES = \
socket-sucker.c
@@ -37,22 +37,22 @@ socket_sucker_CFLAGS = \
socket_sucker_LDFLAGS = \
-pie
-freerdp_session_wrapper_SOURCES = \
- freerdp-session-wrapper.c
-freerdp_session_wrapper_CFLAGS = \
+x2go_session_wrapper_SOURCES = \
+ x2go-session-wrapper.c
+x2go_session_wrapper_CFLAGS = \
-DPKGDATADIR="\"$(pkgdatadir)\"" \
-Wall -Werror
EXTRA_DIST = \
$(pam_session_DATA) \
- freerdp.desktop.in \
- freerdp-session.in \
- lightdm-remote-session-freerdp.in
+ x2go.desktop.in \
+ x2go-session.in \
+ lightdm-remote-session-x2go.in
CLEANFILES = \
- freerdp.desktop \
- freerdp-session \
- lightdm-remote-session-freerdp
+ x2go.desktop \
+ x2go-session \
+ lightdm-remote-session-x2go
DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
diff --git a/configure.ac b/configure.ac
index 4216307..6bdc96d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lightdm-remote-session-freerdp], [1.0])
+AC_INIT([lightdm-remote-session-x2go], [1.0])
AM_INIT_AUTOMAKE([1.11 -Wno-portability])
AM_SILENT_RULES([yes])
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..352a76b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,7 @@
+lightdm-remote-session-freerdp (0.1-0~x2go1) UNRELEASED; urgency=low
+
+ * Initial upstream release. Forked from Canonical's
+ lightdm-remote-session-freerdp.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 08 Nov 2012 22:27:37 +0100
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..a5c5eaf
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,28 @@
+ource: lightdm-remote-session-x2go
+Section: misc
+Priority: extra
+Maintainer: X2Go Developers <x2go-dev at lists.berlios.de>
+Uploaders:
+ Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Build-Depends:
+ debhelper (>= 9),
+ dh-apparmor,
+Standards-Version: 3.9.3
+Homepage: http://wiki.x2go.org
+Vcs-Git: git://code.x2go.org/lightdm-remote-session-x2go
+Vcs-Browser: http://code.x2go.org/gitweb?p=lightdm-remote-session-x2go.git;a=summary
+
+Package: lightdm-remote-session-x2go
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ zenity,
+ pyhoca-cli,
+ libpam-x2go,
+ lightdm (>= 1.3.3-0~)
+Suggests:
+ apparmor,
+Description: Log into X2Go sessions via LightDM
+ The configuration files needed and scripts required to login
+ to a full screen X2Go session using LightDM and PyHoca / Python X2Go.
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..8ff5501
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,29 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: lightdm-remote-session-x2go
+Source: http://launchpad.net/lightdm-remote-session-x2go
+
+Files: *
+Copyright: 2012, Canonical Ltd.
+License: GPL-3
+
+Files: debian/*
+Copyright:
+ 2012, Canonical Ltd.
+ 2012, Mike Gabriel (X2Go Project) <mike.gabriel at das-netzwerkteam.de>
+License: GPL-3
+
+License: GPL-3
+ This package 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; version 3 of the License.
+ .
+ This package 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, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/rules b/debian/rules
new file mode 100644
index 0000000..18a6333
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
+
+override_dh_installdeb:
+ dh_apparmor --profile-name=lightdm-remote-session-x2go -plightdm-remote-session-x2go
+ dh_installdeb
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..9f67427
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..b4cc38d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://launchpad.net/lightdm-remote-session-freerdp/+download .*/lightdm-remote-session-freerdp-(.+)\.tar\.gz
diff --git a/freerdp-session.in b/freerdp-session.in
deleted file mode 100755
index 7eaead3..0000000
--- a/freerdp-session.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [ -e ~/.freerdp-socket ]; then
- @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so -f --from-stdin
-else
- zenity --warning --text="Unable to locate FreeRDP socket"
-fi;
-
-rm -f ~/.freerdp-socket
diff --git a/freerdp.desktop.in b/freerdp.desktop.in
deleted file mode 100644
index 6eb26d4..0000000
--- a/freerdp.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=FreeRDP
-Comment=Full Screen RDP session
-Exec=@pkglibexecdir@/freerdp-session-wrapper
-TryExec=@pkglibexecdir@/freerdp-session-wrapper
-Icon=
-Type=Application
-X-LightDM-PAM-Service=lightdm-remote-freerdp
diff --git a/lightdm-remote-session-freerdp.in b/lightdm-remote-session-x2go.in
similarity index 97%
rename from lightdm-remote-session-freerdp.in
rename to lightdm-remote-session-x2go.in
index 38772f2..ff1a656 100644
--- a/lightdm-remote-session-freerdp.in
+++ b/lightdm-remote-session-x2go.in
@@ -5,7 +5,7 @@
#include <tunables/global>
- at pkglibexecdir@/freerdp-session-wrapper {
+ at pkglibexecdir@/x2go-session-wrapper {
#include <abstractions/authentication>
#include <abstractions/nameservice>
#include <abstractions/wutmp>
diff --git a/lightdm-remote-freerdp b/lightdm-remote-x2go
similarity index 72%
rename from lightdm-remote-freerdp
rename to lightdm-remote-x2go
index d79bc2e..86c3206 100644
--- a/lightdm-remote-freerdp
+++ b/lightdm-remote-x2go
@@ -2,6 +2,6 @@
auth requisite pam_nologin.so
auth required pam_env.so readenv=1
auth required pam_env.so readenv=1 envfile=/etc/default/locale
-auth required pam_freerdp.so
+auth required pam_x2go.so
session required pam_limits.so
-session required pam_freerdp.so
+session required pam_x2go.so
diff --git a/socket-sucker.c b/socket-sucker.c
index 8e8ad25..007dbf1 100644
--- a/socket-sucker.c
+++ b/socket-sucker.c
@@ -42,7 +42,7 @@ main (int argc, char * argv[])
serv_addr.sun_family = AF_UNIX;
- int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".freerdp-socket");
+ int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".x2go-socket");
if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) {
return -1;
}
diff --git a/freerdp-session-wrapper.c b/x2go-session-wrapper.c
similarity index 95%
rename from freerdp-session-wrapper.c
rename to x2go-session-wrapper.c
index 8c31fab..d6bc9a9 100644
--- a/freerdp-session-wrapper.c
+++ b/x2go-session-wrapper.c
@@ -23,7 +23,7 @@ int
main (int argc, char * argv[])
{
char * args[2];
- args[0] = PKGDATADIR "/freerdp-session";
+ args[0] = PKGDATADIR "/x2go-session";
args[1] = NULL;
execvp(args[0], args);
diff --git a/x2go-session.in b/x2go-session.in
new file mode 100755
index 0000000..bfdf5e9
--- /dev/null
+++ b/x2go-session.in
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -e ~/.x2go-socket ]; then
+ @pkglibexecdir@/socket-sucker | /usr/bin/xx2go --plugin rdpsnd.so -f --from-stdin
+else
+ zenity --warning --text="Unable to locate FreeRDP socket"
+fi;
+
+rm -f ~/.x2go-socket
diff --git a/x2go.desktop.in b/x2go.desktop.in
new file mode 100644
index 0000000..a8b6ad5
--- /dev/null
+++ b/x2go.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=FreeRDP
+Comment=Full Screen RDP session
+Exec=@pkglibexecdir@/x2go-session-wrapper
+TryExec=@pkglibexecdir@/x2go-session-wrapper
+Icon=
+Type=Application
+X-LightDM-PAM-Service=lightdm-remote-x2go
hooks/post-receive
--
lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM)
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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).
More information about the x2go-commits
mailing list