diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-04-26 00:59:49 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-04-26 00:59:49 +0200 |
| commit | 6564651bcd196f7f0fa263db83d0775974bf4a1c (patch) | |
| tree | 6e329acf64c71c0a576cda02def2c77189ed7982 /debian/control | |
| parent | ace27c4a149b0b7d115c2ce1fee358386fb03eaf (diff) | |
| parent | 3590ecd60a4ce1f99f5d4c07d787dc134904894a (diff) | |
| download | lightdm-remote-session-x2go-6564651bcd196f7f0fa263db83d0775974bf4a1c.tar.gz lightdm-remote-session-x2go-6564651bcd196f7f0fa263db83d0775974bf4a1c.tar.bz2 lightdm-remote-session-x2go-6564651bcd196f7f0fa263db83d0775974bf4a1c.zip | |
Merge branch 'x2gosessiontype'
Conflicts (resolved by Mike Gabriel):
debian/changelog
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 13 |
1 files changed, 5 insertions, 8 deletions
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. |