Skip to content

Commit

Permalink
rdesktop: 2.0-1.8.2-1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
steffenhoenig committed Oct 1, 2014
1 parent dc040d3 commit 5551731
Show file tree
Hide file tree
Showing 25 changed files with 41 additions and 24 deletions.
1 change: 0 additions & 1 deletion rdesktop/rdesktop-2.0-1.7.1/debian/files

This file was deleted.

2 changes: 0 additions & 2 deletions rdesktop/rdesktop-2.0-1.7.1/debian/rdesktop/DEBIAN/md5sums

This file was deleted.

File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
rdesktop (2.0-1.7.1-5) UNRELEASED; urgency=medium
rdesktop (2.0-1.8.2-1) unstable; urgency=medium

* switched rdesktop 1.8 to default and the 1.7 to legacy

-- Steffen Hoenig <s.hoenig@openthinclient.com> Wed, 01 Oct 2014 13:18:48 +0200

rdesktop (2.0-1.7.1-5) unstable; urgency=medium

* added external rdesktop 1.8.2 binary with usbrdr support (usbrdr binaries
are not part of the package)

-- Steffen Hoenig <s.hoenig@openthinclient.com> Sat, 27 Sep 2014 17:44:13 +0200
-- Steffen Hoenig <s.hoenig@openthinclient.com> Wed, 01 Oct 2014 13:17:21 +0200

rdesktop (2.0-1.7.1-4) unstable; urgency=low

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions rdesktop/rdesktop-2.0-1.8.2/debian/files
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rdesktop_2.0-1.8.2-1_i386.deb x11 optional
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: rdesktop
Version: 2.0-1.7.1-5
Version: 2.0-1.8.2-1
Architecture: i386
Maintainer: Joern Frenzel <t.bauspiess@openthinclient.com>
Installed-Size: 486
Expand Down
2 changes: 2 additions & 0 deletions rdesktop/rdesktop-2.0-1.8.2/debian/rdesktop/DEBIAN/md5sums
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
d5b18c0cbd3ee9c05c2253df0016f0a6 schema/application/rdesktop.xml
98a65cd611ddf575b6bf58aee535756d sfs/package/rdesktop.sfs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<label lang="de" value="Nein"/>
</option>
</choice>
<choice name="Rdesktop_18" value="No">
<label lang="en" value="rdesktop 1.8"/>
<label lang="de" value="rdesktop 1.8"/>
<choice name="Rdesktop_legacy" value="No">
<label lang="en" value="rdesktop (legacy)"/>
<label lang="de" value="rdesktop (legacy)"/>
<option name="Yes" value="Yes">
<label lang="en" value="Yes"/>
<label lang="de" value="Ja"/>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<label lang="de" value="Nein"/>
</option>
</choice>
<choice name="Rdesktop_18" value="No">
<label lang="en" value="rdesktop 1.8"/>
<label lang="de" value="rdesktop 1.8"/>
<choice name="Rdesktop_legacy" value="No">
<label lang="en" value="rdesktop (legacy)"/>
<label lang="de" value="rdesktop (legacy)"/>
<option name="Yes" value="Yes">
<label lang="en" value="Yes"/>
<label lang="de" value="Ja"/>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ if depth != '__auto__':
#
WindowType = l.ENTRY.get('Application.Window.WindowType', 'fullscreen')
if WindowType == 'fullscreen':
parameter += ' -f '
parameter += ' -f '
elif WindowType == 'save-taskbar':
# get dims
# get dims
dims = u.getFullscreenDimensions()
parameter += ' -D -g' + dims + ' '
elif WindowType == 'manual':
Expand All @@ -56,8 +56,8 @@ if l.ENTRY.get('Application.Connection.BitmapUpdates', 'False') == 'True':
parameter += ' -b '


## seriel
#
## seriel
#
if l.ENTRY.get('Application.Connection.Com1', 'False') == 'True':
parameter += ' -r comport:COM1=/dev/ttyS0'
if l.ENTRY.get('Application.Connection.Com2', 'False') == 'True':
Expand Down Expand Up @@ -91,7 +91,7 @@ if sso_type == 'Yes' and tcos_username != "tcos" and tcos_username != None:
parameter += ' -p ' + u.shellQuote(password)
except:
pass
else:
else:
username = l.ENTRY.get('Application.Account.User', '')
if username != '':
parameter += ' -u ' + username
Expand All @@ -105,7 +105,6 @@ else:
# own color map if screen palette based
if u.getScreenDepth() == '8':
parameter += ' -C'

exit_action = l.ENTRY.get('General.ExitAction', '')
start_deferral = int(l.ENTRY.get('General.StartDeferral', 0))
if start_deferral != 0 :
Expand All @@ -116,10 +115,10 @@ if start_deferral != 0 :
#
server_list = l.ENTRY.get('Application.Server', 'tserver').split()

if l.ENTRY.get('General.Rdesktop18', ''):
app="/opt/rdesktop/bin/rdesktop"
else:
if l.ENTRY.get('General.Rdesktop_legacy', ''):
app="/usr/bin/rdesktop"
else:
app="/opt/rdesktop/bin/rdesktop"


while True:
Expand All @@ -133,7 +132,6 @@ while True:
break
if exit_action != 'Restart':
break

if exit_action == 'Logout':
os.system("tcos-logout")
elif exit_action == 'Reboot':
Expand Down
17 changes: 15 additions & 2 deletions rdesktop/rdesktop.changelog
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
rdesktop (2.0-1.7.1-4) UNRELEASED; urgency=low
rdesktop (2.0-1.8.2-1) unstable; urgency=medium

* switched rdesktop 1.8 to default and the 1.7 to legacy

-- Steffen Hoenig <s.hoenig@openthinclient.com> Wed, 01 Oct 2014 13:18:48 +0200

rdesktop (2.0-1.7.1-5) unstable; urgency=medium

* added external rdesktop 1.8.2 binary with usbrdr support (usbrdr binaries
are not part of the package)

-- Steffen Hoenig <s.hoenig@openthinclient.com> Wed, 01 Oct 2014 13:17:21 +0200

rdesktop (2.0-1.7.1-4) unstable; urgency=low

* re-integrated sso capability

-- Steffen Hoenig <s.hoenig@openthinclient.com> Mon, 11 Aug 2014 17:08:43 +0200
-- Steffen Hoenig <s.hoenig@openthinclient.com> Sat, 27 Sep 2014 17:44:10 +0200

rdesktop (2.0-1.7.1-3) unstable; urgency=low

Expand Down

0 comments on commit 5551731

Please sign in to comment.