Merge branch 'x2gosessiontype'

Conflicts (resolved by Mike Gabriel):
	debian/changelog

4 files changed, 15 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index e24e883..8373bad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 lightdm-remote-session-x2go (0.0.1.0-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * New upstream version (0.0.1.0):
+    - 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.
+    - Prepare for becoming able to use PyHoca-CLI _or_ X2Go Client for
+      handling the X2Go session being launched via remote login.
 
  -- 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..596f83c 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
@@ -21,15 +21,12 @@ Depends:
  ${misc:Depends},
  socat,
  zenity,
- pyhoca-cli (>= 0.2.1.0-0~),
+ pyhoca-cli (>= 0.2.1.0-0~) | x2goclient (>= 4.0.1.1-0~),
  libpam-x2go,
- lightdm (>= 1.3.3-0~)
-Conflicts:
- lightdm-remote-session-freerdp,
-Replaces:
- lightdm-remote-session-freerdp,
+ 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.
+ to a full screen X2Go session using LightDM and PyHoca / Python X2Go
+ or X2Go Client.
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