The branch, build-main has been updated discards ace27c4a149b0b7d115c2ce1fee358386fb03eaf (commit) discards 3587edc8d7098e36b37b0aaf160cd6ff8e0e5e8d (commit) via 15b8e5a35a380474a1303081f8d6ad8536a1524d (commit) via 265d4aa83104ced9ca5999de06b4c4255f693203 (commit) via 46b4cf9b82e311982f21915c29aa8d569cbc2033 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (ace27c4a149b0b7d115c2ce1fee358386fb03eaf) \ N -- N -- N (15b8e5a35a380474a1303081f8d6ad8536a1524d) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 | 6 +++--- .gitgnore | 6 +++--- Makefile.am | 14 +++++++------- debian/changelog | 5 ++++- debian/control | 6 +----- debian/copyright | 6 ++++-- debian/lightdm-remote-session-x2go.links | 1 - ...on-freerdp.in => lightdm-remote-session-x2go.in | 1 + x2go-session-wrapper.c | 2 +- x2go-session.in | 2 +- freerdp.desktop.in => x2go.desktop.in | 4 ++-- 11 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 debian/lightdm-remote-session-x2go.links rename lightdm-remote-session-freerdp.in => lightdm-remote-session-x2go.in (96%) rename freerdp.desktop.in => x2go.desktop.in (72%) The diff of changes is: diff --git a/.bzrignore b/.bzrignore index 127de56..2a2b5f5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,5 +1,5 @@ -socket-sucker -freerdp-session -freerdp.desktop +x2go-session +x2go.desktop +lightdm-remote-session-x2go compile .deps diff --git a/.gitgnore b/.gitgnore index 127de56..2a2b5f5 100644 --- a/.gitgnore +++ b/.gitgnore @@ -1,5 +1,5 @@ -socket-sucker -freerdp-session -freerdp.desktop +x2go-session +x2go.desktop +lightdm-remote-session-x2go compile .deps diff --git a/Makefile.am b/Makefile.am index fad0ac9..9207574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ pam_session_DATA = \ lightdm_sessiondir = $(datadir)/lightdm/remote-sessions lightdm_session_DATA = \ - freerdp.desktop + x2go.desktop %.desktop: %.desktop.in @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ @@ -20,9 +20,9 @@ x2go-session: x2go-session.in 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|\@libexecdir\@|$(libexecdir)|" $< > $@ libexec_PROGRAMS = \ @@ -36,14 +36,14 @@ x2go_session_wrapper_CFLAGS = \ EXTRA_DIST = \ $(pam_session_DATA) \ - freerdp.desktop.in \ + x2go.desktop.in \ x2go-session.in \ - lightdm-remote-session-freerdp.in + lightdm-remote-session-x2go.in CLEANFILES = \ - freerdp.desktop \ + x2go.desktop \ x2go-session \ - lightdm-remote-session-freerdp + lightdm-remote-session-x2go DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall diff --git a/debian/changelog b/debian/changelog index e24e883..5efdfba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ lightdm-remote-session-x2go (0.0.1.0-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.0.2): + - Stop being a drop-in replacement for lightdm-remote-login-freerdp. + Become an independent package that provides server type »x2go« to + the remote-login-service. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 24 Apr 2013 17:52:57 +0200 diff --git a/debian/control b/debian/control index f0b2e36..81ce8ed 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: dh-apparmor, cdbs, dh-autoreconf, -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 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 @@ -24,10 +24,6 @@ Depends: pyhoca-cli (>= 0.2.1.0-0~), libpam-x2go, lightdm (>= 1.3.3-0~) -Conflicts: - lightdm-remote-session-freerdp, -Replaces: - lightdm-remote-session-freerdp, Suggests: apparmor, Description: Log into X2Go sessions via LightDM diff --git a/debian/copyright b/debian/copyright index 086c43f..9ab1749 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,14 @@ Upstream-Name: lightdm-remote-session-x2go Source: http://code.x2go.org/gitweb?p=lightdm-remote-session-x2go.git;a=summary Files: * -Copyright: 2012, Canonical Ltd. +Copyright: + 2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de> + 2012, Canonical Ltd. License: GPL-3 Files: debian/* Copyright: - 2012, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de> + 2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de> 2012, Canonical Ltd. License: GPL-3 diff --git a/debian/lightdm-remote-session-x2go.links b/debian/lightdm-remote-session-x2go.links deleted file mode 100644 index c427b8c..0000000 --- a/debian/lightdm-remote-session-x2go.links +++ /dev/null @@ -1 +0,0 @@ -/etc/pam.d/lightdm-remote-x2go /etc/pam.d/lightdm-remote-freerdp \ No newline at end of file diff --git a/lightdm-remote-session-freerdp.in b/lightdm-remote-session-x2go.in similarity index 96% rename from lightdm-remote-session-freerdp.in rename to lightdm-remote-session-x2go.in index 9709a92..6a105ca 100644 --- a/lightdm-remote-session-freerdp.in +++ b/lightdm-remote-session-x2go.in @@ -2,6 +2,7 @@ # Profile for restricting lightdm remote session for X2Go # Based on the Guest Account Apparmor script from: # Author: Martin Pitt <martin.pitt@ubuntu.com> +# Mike Gabriel <mike.gabriel@das-netzwerkteam.de> #include <tunables/global> diff --git a/x2go-session-wrapper.c b/x2go-session-wrapper.c index 2bf3576..a640e5c 100644 --- a/x2go-session-wrapper.c +++ b/x2go-session-wrapper.c @@ -1,5 +1,5 @@ /* - * Copyright © 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + * Copyright © 2012-2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> * Copyright © 2012 Canonical Ltd. * * This program is free software: you can redistribute it and/or modify it diff --git a/x2go-session.in b/x2go-session.in index 1b3c739..787f163 100755 --- a/x2go-session.in +++ b/x2go-session.in @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright © 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright © 2012-2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Copyright © 2012 Canonical Ltd. # # This program is free software: you can redistribute it and/or modify it diff --git a/freerdp.desktop.in b/x2go.desktop.in similarity index 72% rename from freerdp.desktop.in rename to x2go.desktop.in index f976b14..d3c9609 100644 --- a/freerdp.desktop.in +++ b/x2go.desktop.in @@ -1,8 +1,8 @@ [Desktop Entry] -Name=FreeRDP +Name=X2Go Comment=Full Screen X2Go Session Exec=@libexecdir@/x2go-session-wrapper TryExec=@libexecdir@/x2go-session-wrapper Icon= Type=Application -X-LightDM-PAM-Service=lightdm-remote-freerdp +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).