[debian-edu-commits] debian-edu/ 02/03: Merge branch 'master' into wheezy-backports
Mike Gabriel
sunweaver at debian.org
Mon Aug 18 15:10:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch wheezy-backports
in repository italc.
commit 69acb4d25f77c9d6272dc3584cc6ca3fc7de1c36
Merge: ac71a34 3f463d0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Aug 14 23:19:47 2014 +0200
Merge branch 'master' into wheezy-backports
Conflicts (resolved by Mike Gabriel):
debian/changelog
CMakeLists.txt | 3 +-
COPYING | 43 +-
INSTALL | 1 +
README | 25 +-
cmake/modules/DetectMachine.cmake | 6 +-
debian/README.Debian | 16 +
debian/changelog | 52 +
debian/control | 3 +-
debian/copyright | 45 +-
debian/italc-client.config | 20 +-
debian/italc-client.lintian-overrides | 2 -
...001_set-static-libdir-and-rpath-for-cmake.patch | 34 +-
debian/patches/002_use-v4l-videodev2.patch | 15 -
debian/patches/004_x2go-nx-noxdamage.patch | 13 -
debian/patches/007_use-openssl-sha.patch | 16 +
debian/patches/021_man-page-patch-in.patch | 154 -
debian/patches/030_fix-man-pages.patch | 31 +
debian/patches/031_fix-spelling-errors.patch | 108 +-
debian/patches/series | 5 +-
debian/po/es.po | 301 +
debian/rules | 32 +
debian/watch | 1 +
doc/CrossCompilingForWindows.txt | 9 +-
iTALC.nsi.in | 11 +-
ica/ica.1 | 65 +-
ica/ica.rc | 4 +-
ica/ica.rc.in | 4 +-
ica/src/AccessDialogSlave.h | 4 +-
ica/src/DemoClient.h | 6 +-
ica/src/DemoClientSlave.h | 6 +-
ica/src/DemoServer.h | 4 +-
ica/src/DemoServerMaster.h | 4 +-
ica/src/DemoServerSlave.h | 4 +-
ica/src/DesktopAccessPermission.h | 4 +-
ica/src/IcaSlave.h | 4 +-
ica/src/InputLockSlave.h | 4 +-
ica/src/ItalcCoreServer.h | 4 +-
ica/src/ItalcSlaveManager.h | 4 +-
ica/src/ItalcVncServer.cpp | 63 +-
ica/src/ItalcVncServer.h | 4 +-
ica/src/MessageBoxSlave.h | 4 +-
ica/src/RfbItalcCursor.h | 4 +-
ica/src/RfbLZORLE.h | 4 +-
ica/src/ScreenLockSlave.h | 4 +-
ica/src/ScreenLockSlaveLauncher.h | 4 +-
ica/src/SystemTrayIconSlave.h | 4 +-
ica/src/WindowsService.h | 4 +-
ica/src/moc_AccessDialogSlave.cxx_parameters | 22 +
ica/src/moc_DemoClient.cxx_parameters | 22 +
ica/src/moc_DemoClientSlave.cxx_parameters | 22 +
ica/src/moc_DemoServer.cxx_parameters | 22 +
ica/src/moc_DemoServerMaster.cxx_parameters | 22 +
ica/src/moc_DemoServerSlave.cxx_parameters | 22 +
ica/src/moc_DesktopAccessPermission.cxx_parameters | 22 +
ica/src/moc_IcaSlave.cxx_parameters | 22 +
ica/src/moc_InputLockSlave.cxx_parameters | 22 +
ica/src/moc_ItalcCoreServer.cxx_parameters | 22 +
ica/src/moc_ItalcSlaveManager.cxx_parameters | 22 +
ica/src/moc_ItalcVncServer.cxx_parameters | 22 +
ica/src/moc_MessageBoxSlave.cxx_parameters | 22 +
ica/src/moc_RfbItalcCursor.cxx_parameters | 22 +
ica/src/moc_RfbLZORLE.cxx_parameters | 22 +
ica/src/moc_ScreenLockSlave.cxx_parameters | 22 +
ica/src/moc_ScreenLockSlaveLauncher.cxx_parameters | 22 +
ica/src/moc_SystemTrayIconSlave.cxx_parameters | 22 +
ica/src/moc_WindowsService.cxx_parameters | 22 +
ica/win32/CMakeLists.txt | 39 -
ica/win32/addon/logger/logmessages.dsw | 29 -
ica/win32/addon/logger/messages.h | 66 -
ica/win32/addon/logger/messages.mc | 26 -
ica/win32/addon/logger/messages.rc | 2 -
ica/win32/addon/ms-logon/MSLogonACL/.cvsignore | 4 -
ica/win32/addon/ms-logon/MSLogonACL/MSLogonACL.cpp | 117 -
ica/win32/addon/ms-logon/MSLogonACL/MSLogonACL.dsw | 29 -
ica/win32/addon/ms-logon/MSLogonACL/MSLogonACL.h | 28 -
ica/win32/addon/ms-logon/MSLogonACL/MSLogonACL.rc | 116 -
ica/win32/addon/ms-logon/MSLogonACL/buildtime.h | 3 -
ica/win32/addon/ms-logon/MSLogonACL/buildtime.in | 2 -
ica/win32/addon/ms-logon/MSLogonACL/resource.h | 15 -
.../addon/ms-logon/MSLogonACL/vncExportACL.cpp | 220 -
ica/win32/addon/ms-logon/MSLogonACL/vncExportACL.h | 56 -
.../addon/ms-logon/MSLogonACL/vncImportACL.cpp | 498 --
ica/win32/addon/ms-logon/MSLogonACL/vncImportACL.h | 87 -
ica/win32/addon/ms-logon/authSSP/.cvsignore | 4 -
ica/win32/addon/ms-logon/authSSP/Auth_Seq.h | 43 -
ica/win32/addon/ms-logon/authSSP/EventLogging.cpp | 158 -
ica/win32/addon/ms-logon/authSSP/EventLogging.h | 59 -
.../ms-logon/authSSP/GenClientServerContext.cpp | 370 --
.../ms-logon/authSSP/GenClientServerContext.h | 72 -
ica/win32/addon/ms-logon/authSSP/Readme.txt | 16 -
ica/win32/addon/ms-logon/authSSP/authSSP.cpp | 332 --
ica/win32/addon/ms-logon/authSSP/authSSP.def | 5 -
ica/win32/addon/ms-logon/authSSP/authSSP.dsw | 29 -
ica/win32/addon/ms-logon/authSSP/authSSP.h | 98 -
ica/win32/addon/ms-logon/authSSP/authSSP.rc | 116 -
ica/win32/addon/ms-logon/authSSP/buildtime.in | 2 -
ica/win32/addon/ms-logon/authSSP/resource.h | 15 -
.../addon/ms-logon/authSSP/vncAccessControl.cpp | 216 -
.../addon/ms-logon/authSSP/vncAccessControl.h | 45 -
ica/win32/addon/ms-logon/authSSP/vncSSP.cpp | 108 -
ica/win32/addon/ms-logon/authSSP/vncSSP.h | 52 -
.../addon/ms-logon/authSSP/vncSecurityEditor.cpp | 168 -
.../addon/ms-logon/authSSP/vncSecurityEditor.h | 71 -
.../ms-logon/authSSP/vncSecurityEditorProps.h | 66 -
ica/win32/addon/ms-logon/authadm/authadmin.cpp | 111 -
ica/win32/addon/ms-logon/authadm/authadmin.def | 4 -
ica/win32/addon/ms-logon/authadm/authadmin.dsw | 29 -
ica/win32/addon/ms-logon/authadm/authadmin.h | 23 -
ica/win32/addon/ms-logon/authadm/authadmin.rc | 112 -
ica/win32/addon/ms-logon/authadm/resource.h | 15 -
ica/win32/addon/ms-logon/ldapauth/ldapAuth.cpp | 638 --
ica/win32/addon/ms-logon/ldapauth/ldapAuth.h | 55 -
ica/win32/addon/ms-logon/ldapauth/ldapAuth.rc | 112 -
ica/win32/addon/ms-logon/ldapauth/ldapauth.def | 5 -
ica/win32/addon/ms-logon/ldapauth/ldapauth.dsw | 29 -
ica/win32/addon/ms-logon/ldapauth/resource.h | 15 -
ica/win32/addon/ms-logon/ldapauth9x/ldapAuth9x.cpp | 614 --
ica/win32/addon/ms-logon/ldapauth9x/ldapAuth9x.h | 57 -
ica/win32/addon/ms-logon/ldapauth9x/ldapAuth9x.rc | 112 -
ica/win32/addon/ms-logon/ldapauth9x/ldapauth9x.def | 5 -
ica/win32/addon/ms-logon/ldapauth9x/resource.h | 15 -
.../addon/ms-logon/ldapauthNT4/ldapAuthnt4.cpp | 656 ---
ica/win32/addon/ms-logon/ldapauthNT4/ldapAuthnt4.h | 55 -
.../addon/ms-logon/ldapauthNT4/ldapAuthnt4.rc | 112 -
.../addon/ms-logon/ldapauthNT4/ldapauthnt4.def | 5 -
.../addon/ms-logon/ldapauthNT4/ldapauthnt4.dsw | 29 -
ica/win32/addon/ms-logon/ldapauthNT4/resource.h | 15 -
ica/win32/addon/ms-logon/logging/logging.cpp | 314 -
ica/win32/addon/ms-logon/logging/logging.def | 8 -
ica/win32/addon/ms-logon/logging/logging.dsw | 29 -
ica/win32/addon/ms-logon/logging/logging.h | 38 -
ica/win32/addon/ms-logon/logging/logging.rc | 112 -
ica/win32/addon/ms-logon/logging/resource.h | 15 -
ica/win32/addon/ms-logon/testauth/ntlogon.cpp | 232 -
ica/win32/addon/ms-logon/testauth/resource.h | 15 -
ica/win32/addon/ms-logon/testauth/testauth.dsw | 53 -
ica/win32/addon/ms-logon/testauth/testauth.rc | 112 -
ica/win32/addon/ms-logon/workgrpdomnt4/resource.h | 15 -
.../addon/ms-logon/workgrpdomnt4/workgrpdomnt4.cpp | 886 ---
.../addon/ms-logon/workgrpdomnt4/workgrpdomnt4.def | 4 -
.../addon/ms-logon/workgrpdomnt4/workgrpdomnt4.dsw | 29 -
.../addon/ms-logon/workgrpdomnt4/workgrpdomnt4.h | 100 -
.../addon/ms-logon/workgrpdomnt4/workgrpdomnt4.rc | 112 -
ica/win32/addon/versioninfo.h | 76 -
ica/win32/common/Clipboard.cpp | 762 ---
ica/win32/common/Clipboard.h | 168 -
ica/win32/common/ScopeGuard.h | 320 -
ica/win32/common/win32_helpers.cpp | 99 -
ica/win32/common/win32_helpers.h | 72 -
ica/win32/rdr/Exception.h | 71 -
ica/win32/rdr/FdInStream.cxx | 387 --
ica/win32/rdr/FdInStream.h | 89 -
ica/win32/rdr/FdOutStream.cxx | 114 -
ica/win32/rdr/FdOutStream.h | 53 -
ica/win32/rdr/FixedMemOutStream.h | 52 -
ica/win32/rdr/InStream.cxx | 35 -
ica/win32/rdr/InStream.h | 145 -
ica/win32/rdr/Makefile.bcc32 | 33 -
ica/win32/rdr/Makefile.in | 18 -
ica/win32/rdr/MemInStream.h | 47 -
ica/win32/rdr/MemOutStream.h | 82 -
ica/win32/rdr/NullOutStream.cxx | 60 -
ica/win32/rdr/NullOutStream.h | 42 -
ica/win32/rdr/OutStream.h | 154 -
ica/win32/rdr/ZlibInStream.cxx | 125 -
ica/win32/rdr/ZlibInStream.h | 61 -
ica/win32/rdr/ZlibOutStream.cxx | 145 -
ica/win32/rdr/ZlibOutStream.h | 59 -
ica/win32/rdr/types.h | 36 -
ica/win32/ultravnc-italc.cpp | 277 -
ica/win32/ultravnc.cpp | 236 -
ica/win32/winvnc/DSMPlugin/DSMPlugin.cpp | 525 --
ica/win32/winvnc/DSMPlugin/DSMPlugin.h | 194 -
ica/win32/winvnc/Makefile.bcc32 | 117 -
ica/win32/winvnc/building.txt | 40 -
ica/win32/winvnc/crtdbg.h | 2 -
ica/win32/winvnc/history.txt | 740 ---
ica/win32/winvnc/libjpeg-turbo-win/jpeglib.h | 2 -
ica/win32/winvnc/lzo/minilzo.h | 2 -
ica/win32/winvnc/omnithread/nt.cpp | 965 ----
ica/win32/winvnc/omnithread/nt.h | 82 -
ica/win32/winvnc/omnithread/omnithread.h | 659 ---
ica/win32/winvnc/omnithread/threaddata.cpp | 83 -
ica/win32/winvnc/rfb/zrleEncode.h | 352 --
ica/win32/winvnc/rfb/zywrletemplate.c | 804 ---
ica/win32/winvnc/vnchooks/Makefile.bcc32 | 9 -
ica/win32/winvnc/vnchooks/SharedData.cpp | 42 -
ica/win32/winvnc/vnchooks/SharedData.h | 33 -
ica/win32/winvnc/vnchooks/VNCHooks-bcc32.def | 7 -
ica/win32/winvnc/vnchooks/VNCHooks-vc.def | 7 -
ica/win32/winvnc/vnchooks/VNCHooks.cpp | 1180 ----
ica/win32/winvnc/vnchooks/VNCHooks.def | 7 -
ica/win32/winvnc/vnchooks/VNCHooks.h | 73 -
ica/win32/winvnc/vnchooks/resource.h | 15 -
ica/win32/winvnc/vnchooks/vnchooks.dsp | 123 -
ica/win32/winvnc/vnchooks/vnchooks.rc | 109 -
ica/win32/winvnc/vnchooks/vnchooks.vcproj | 717 ---
ica/win32/winvnc/vnchooks/vnchooksVS2005.vcproj | 505 --
.../winvnc/vnchooks/vnchooks_vs90_Debug_Win32.lnt | 12 -
.../vnchooks/vnchooks_vs90_Release_Win32.lnt | 12 -
ica/win32/winvnc/winvnc.dsw | 260 -
ica/win32/winvnc/winvnc.sln | 345 --
ica/win32/winvnc/winvnc.sln.vloptions | 2 -
ica/win32/winvnc/winvnc/CpuUsage.cpp | 215 -
ica/win32/winvnc/winvnc/CpuUsage.h | 89 -
ica/win32/winvnc/winvnc/Dtwinver.cpp | 2074 -------
ica/win32/winvnc/winvnc/Dtwinver.h | 363 --
ica/win32/winvnc/winvnc/HideDesktop.cpp | 425 --
ica/win32/winvnc/winvnc/HideDesktop.h | 56 -
ica/win32/winvnc/winvnc/IPC.cpp | 200 -
ica/win32/winvnc/winvnc/IPC.h | 62 -
ica/win32/winvnc/winvnc/Localization.h | 202 -
ica/win32/winvnc/winvnc/TextChat.cpp | 852 ---
ica/win32/winvnc/winvnc/TextChat.h | 76 -
ica/win32/winvnc/winvnc/Timer.cpp | 39 -
ica/win32/winvnc/winvnc/Timer.h | 123 -
ica/win32/winvnc/winvnc/WINVNC.DSW | 29 -
ica/win32/winvnc/winvnc/benchmark.cpp | 152 -
ica/win32/winvnc/winvnc/black_layered.cpp | 334 --
ica/win32/winvnc/winvnc/buildtime.cpp | 22 -
ica/win32/winvnc/winvnc/d3des.c | 440 --
ica/win32/winvnc/winvnc/d3des.h | 51 -
ica/win32/winvnc/winvnc/getinfo.cpp | 589 --
ica/win32/winvnc/winvnc/helpers.cpp | 611 --
ica/win32/winvnc/winvnc/httpconnect.cpp | 1485 -----
ica/win32/winvnc/winvnc/httpconnect.h | 230 -
ica/win32/winvnc/winvnc/inifile.cpp | 213 -
ica/win32/winvnc/winvnc/inifile.h | 64 -
ica/win32/winvnc/winvnc/initipp.cpp | 186 -
ica/win32/winvnc/winvnc/keysymdef.h | 1595 -----
ica/win32/winvnc/winvnc/minmax.h | 48 -
ica/win32/winvnc/winvnc/read_write_ini.cpp | 308 -
ica/win32/winvnc/winvnc/res/AuthPanel.class | Bin 2916 -> 0 bytes
ica/win32/winvnc/winvnc/res/ButtonPanel.class | Bin 3209 -> 0 bytes
ica/win32/winvnc/winvnc/res/DH.class | Bin 2404 -> 0 bytes
ica/win32/winvnc/winvnc/res/FTPFrame.class | Bin 20602 -> 0 bytes
ica/win32/winvnc/winvnc/res/Finger.cur | Bin 326 -> 0 bytes
ica/win32/winvnc/winvnc/res/RecordingFrame.class | Bin 5971 -> 0 bytes
ica/win32/winvnc/winvnc/res/SessionRecorder.class | Bin 2642 -> 0 bytes
ica/win32/winvnc/winvnc/res/clipboardframe.class | Bin 2591 -> 0 bytes
ica/win32/winvnc/winvnc/res/descipher.class | Bin 8245 -> 0 bytes
ica/win32/winvnc/winvnc/res/ding_dong.wav | Bin 118662 -> 0 bytes
ica/win32/winvnc/winvnc/res/ftpframe$strcomp.class | Bin 618 -> 0 bytes
ica/win32/winvnc/winvnc/res/icon2.ico | Bin 297086 -> 0 bytes
ica/win32/winvnc/winvnc/res/optionsframe.class | Bin 6870 -> 0 bytes
ica/win32/winvnc/winvnc/res/rfbproto.class | Bin 25244 -> 0 bytes
ica/win32/winvnc/winvnc/res/runas.bmp | Bin 124342 -> 0 bytes
ica/win32/winvnc/winvnc/res/vnc-1.bmp | Bin 12342 -> 0 bytes
ica/win32/winvnc/winvnc/res/vnccanvas.class | Bin 21431 -> 0 bytes
ica/win32/winvnc/winvnc/res/vncviewer.class | Bin 16030 -> 0 bytes
ica/win32/winvnc/winvnc/res/vncviewer.jar | Bin 65311 -> 0 bytes
ica/win32/winvnc/winvnc/res/world3a.ico | Bin 297086 -> 0 bytes
ica/win32/winvnc/winvnc/resource.h | 312 -
ica/win32/winvnc/winvnc/rfb.h | 86 -
ica/win32/winvnc/winvnc/rfbMisc.h | 124 -
ica/win32/winvnc/winvnc/rfbRect.h | 117 -
ica/win32/winvnc/winvnc/rfbRegion.h | 31 -
ica/win32/winvnc/winvnc/rfbRegion_X11.cxx | 210 -
ica/win32/winvnc/winvnc/rfbRegion_X11.h | 87 -
ica/win32/winvnc/winvnc/rfbRegion_win32.cpp | 280 -
ica/win32/winvnc/winvnc/rfbRegion_win32.h | 93 -
ica/win32/winvnc/winvnc/rfbUpdateTracker.cpp | 224 -
ica/win32/winvnc/winvnc/rfbUpdateTracker.h | 112 -
ica/win32/winvnc/winvnc/security.cpp | 158 -
ica/win32/winvnc/winvnc/service.cpp | 1065 ----
ica/win32/winvnc/winvnc/service_motor.cpp | 898 ---
ica/win32/winvnc/winvnc/stdhdrs.cpp | 28 -
ica/win32/winvnc/winvnc/stdhdrs.h | 104 -
ica/win32/winvnc/winvnc/tableinitcmtemplate.cpp | 96 -
ica/win32/winvnc/winvnc/tableinittctemplate.cpp | 122 -
ica/win32/winvnc/winvnc/tabletranstemplate.cpp | 96 -
ica/win32/winvnc/winvnc/translate.cpp | 184 -
ica/win32/winvnc/winvnc/translate.h | 81 -
ica/win32/winvnc/winvnc/videodriver.cpp | 977 ----
ica/win32/winvnc/winvnc/videodriver.h | 103 -
ica/win32/winvnc/winvnc/videodrivercheck.cpp | 177 -
ica/win32/winvnc/winvnc/vistahook.cpp | 481 --
ica/win32/winvnc/winvnc/vncDesktopSW.cpp | 226 -
ica/win32/winvnc/winvnc/vncEncodeTight.cpp | 1614 ------
ica/win32/winvnc/winvnc/vncEncodeTight.h | 199 -
ica/win32/winvnc/winvnc/vncEncodeUltra.cpp | 406 --
ica/win32/winvnc/winvnc/vncEncodeUltra.h | 107 -
ica/win32/winvnc/winvnc/vncEncodeUltra2.cpp | 319 -
ica/win32/winvnc/winvnc/vncEncodeUltra2.h | 74 -
ica/win32/winvnc/winvnc/vncEncodeZlib.cpp | 683 ---
ica/win32/winvnc/winvnc/vncEncodeZlib.h | 123 -
ica/win32/winvnc/winvnc/vncEncodeZlibHex.cpp | 645 ---
ica/win32/winvnc/winvnc/vncEncodeZlibHex.h | 114 -
ica/win32/winvnc/winvnc/vncListDlg.cpp | 169 -
ica/win32/winvnc/winvnc/vncListDlg.h | 47 -
ica/win32/winvnc/winvnc/vncMultiMonitor.cpp | 156 -
ica/win32/winvnc/winvnc/vncOSVersion.cpp | 63 -
ica/win32/winvnc/winvnc/vncOSVersion.h | 30 -
ica/win32/winvnc/winvnc/vncabout.cpp | 220 -
ica/win32/winvnc/winvnc/vncabout.h | 58 -
ica/win32/winvnc/winvnc/vncacceptdialog.cpp | 204 -
ica/win32/winvnc/winvnc/vncacceptdialog.h | 73 -
ica/win32/winvnc/winvnc/vncauth.c | 187 -
ica/win32/winvnc/winvnc/vncauth.h | 48 -
ica/win32/winvnc/winvnc/vncbuffer.cpp | 1201 ----
ica/win32/winvnc/winvnc/vncbuffer.h | 158 -
ica/win32/winvnc/winvnc/vncclient.cpp | 6099 --------------------
ica/win32/winvnc/winvnc/vncclient.h | 605 --
ica/win32/winvnc/winvnc/vncconndialog.cpp | 402 --
ica/win32/winvnc/winvnc/vncconndialog.h | 69 -
ica/win32/winvnc/winvnc/vncdesktop.cpp | 2459 --------
ica/win32/winvnc/winvnc/vncdesktop.h | 537 --
ica/win32/winvnc/winvnc/vncdesktopsink.cpp | 751 ---
ica/win32/winvnc/winvnc/vncdesktopthread.cpp | 1334 -----
ica/win32/winvnc/winvnc/vncdesktopthread.h | 142 -
ica/win32/winvnc/winvnc/vncencodecorre.cpp | 522 --
ica/win32/winvnc/winvnc/vncencodecorre.h | 81 -
ica/win32/winvnc/winvnc/vncencodehext.cpp | 411 --
ica/win32/winvnc/winvnc/vncencodehext.h | 72 -
ica/win32/winvnc/winvnc/vncencodemgr.h | 926 ---
ica/win32/winvnc/winvnc/vncencoder.cpp | 445 --
ica/win32/winvnc/winvnc/vncencoder.h | 139 -
ica/win32/winvnc/winvnc/vncencoderCursor.cpp | 280 -
ica/win32/winvnc/winvnc/vncencoderre.cpp | 333 --
ica/win32/winvnc/winvnc/vncencoderre.h | 66 -
ica/win32/winvnc/winvnc/vncencodezrle.cpp | 221 -
ica/win32/winvnc/winvnc/vncencodezrle.h | 49 -
ica/win32/winvnc/winvnc/vnchttpconnect.cpp | 664 ---
ica/win32/winvnc/winvnc/vnchttpconnect.h | 70 -
ica/win32/winvnc/winvnc/vncinsthandler.cpp | 65 -
ica/win32/winvnc/winvnc/vncinsthandler.h | 52 -
ica/win32/winvnc/winvnc/vnckeymap.cpp | 832 ---
ica/win32/winvnc/winvnc/vnckeymap.h | 37 -
ica/win32/winvnc/winvnc/vnclog.cpp | 303 -
ica/win32/winvnc/winvnc/vnclog.h | 109 -
ica/win32/winvnc/winvnc/vnclogon.cpp | 143 -
ica/win32/winvnc/winvnc/vnclogon.h | 29 -
ica/win32/winvnc/winvnc/vncmemcpy.h | 57 -
ica/win32/winvnc/winvnc/vncmenu.cpp | 2014 -------
ica/win32/winvnc/winvnc/vncmenu.h | 140 -
ica/win32/winvnc/winvnc/vncntlm.cpp | 1127 ----
ica/win32/winvnc/winvnc/vncpasswd.h | 106 -
ica/win32/winvnc/winvnc/vncproperties.cpp | 2612 ---------
ica/win32/winvnc/winvnc/vncproperties.h | 185 -
ica/win32/winvnc/winvnc/vncpropertiesPoll.cpp | 1049 ----
ica/win32/winvnc/winvnc/vncpropertiesPoll.h | 119 -
ica/win32/winvnc/winvnc/vncserver.cpp | 2723 ---------
ica/win32/winvnc/winvnc/vncserver.h | 614 --
ica/win32/winvnc/winvnc/vncservice.cpp | 953 ---
ica/win32/winvnc/winvnc/vncservice.h | 122 -
ica/win32/winvnc/winvnc/vncsetauth.cpp | 685 ---
ica/win32/winvnc/winvnc/vncsetauth.h | 98 -
ica/win32/winvnc/winvnc/vncsockconnect.cpp | 227 -
ica/win32/winvnc/winvnc/vncsockconnect.h | 68 -
ica/win32/winvnc/winvnc/vnctimedmsgbox.cpp | 84 -
ica/win32/winvnc/winvnc/vnctimedmsgbox.h | 42 -
ica/win32/winvnc/winvnc/vsocket.cpp | 1144 ----
ica/win32/winvnc/winvnc/vsocket.h | 224 -
ica/win32/winvnc/winvnc/vtypes.h | 87 -
ica/win32/winvnc/winvnc/winvnc.cpp | 1132 ----
ica/win32/winvnc/winvnc/winvnc.dsp | 791 ---
ica/win32/winvnc/winvnc/winvnc.exe.manifest | 31 -
ica/win32/winvnc/winvnc/winvnc.exe.x64.manifest | 15 -
ica/win32/winvnc/winvnc/winvnc.exe.x86.manifest | 31 -
ica/win32/winvnc/winvnc/winvnc.h | 104 -
ica/win32/winvnc/winvnc/winvnc.rc | 708 ---
ica/win32/winvnc/winvnc/winvnc.vcproj | 4444 --------------
ica/win32/winvnc/winvnc/winvncVS2005.vcproj | 3213 -----------
ica/win32/winvnc/winvnc/winvnc_fr.rc | 686 ---
.../winvnc/winvnc/winvnc_vs90_Release_Win32.lnt | 80 -
ica/win32/winvnc/winvncvs2005.sln | 681 ---
ica/win32/winvnc/zlib/zlib.h | 1 -
ica/x11/common/sha1.c | 411 --
ica/x11/common/sha1.h | 101 -
ica/x11/libvncclient/h264.c | 644 +++
ica/x11/libvncclient/rfbproto.c | 24 +
ica/x11/libvncclient/vncviewer.c | 13 +
ica/x11/libvncserver/rfbregion.c | 2 +-
ica/x11/libvncserver/selbox.c | 2 +-
ica/x11/libvncserver/websockets.c | 1 +
ima/data/italc.desktop.in | 7 +-
ima/dialogs/Config.ui | 163 +
ima/italc.1 | 23 +-
ima/italc.rc | 4 +-
ima/italc.rc.in | 4 +-
ima/resources/splash.png | Bin 43092 -> 43105 bytes
ima/src/ClassroomManager.h | 4 +-
ima/src/Client.h | 6 +-
ima/src/ConfigWidget.h | 4 +-
ima/src/Dialogs.h | 6 +-
ima/src/MainToolBar.h | 4 +-
ima/src/MainWindow.h | 6 +-
ima/src/OverviewWidget.h | 4 +-
ima/src/RemoteControlWidget.h | 4 +-
ima/src/RunCommandsDialog.h | 4 +-
ima/src/SideBar.h | 4 +-
ima/src/SideBarWidget.h | 4 +-
ima/src/SnapshotList.h | 6 +-
ima/src/ToolButton.h | 6 +-
ima/src/moc_ClassroomManager.cxx_parameters | 22 +
ima/src/moc_Client.cxx_parameters | 22 +
ima/src/moc_ConfigWidget.cxx_parameters | 22 +
ima/src/moc_Dialogs.cxx_parameters | 22 +
ima/src/moc_MainToolBar.cxx_parameters | 22 +
ima/src/moc_MainWindow.cxx_parameters | 22 +
ima/src/moc_OverviewWidget.cxx_parameters | 22 +
ima/src/moc_RemoteControlWidget.cxx_parameters | 22 +
ima/src/moc_RunCommandsDialog.cxx_parameters | 22 +
ima/src/moc_SideBar.cxx_parameters | 22 +
ima/src/moc_SideBarWidget.cxx_parameters | 22 +
ima/src/moc_SnapshotList.cxx_parameters | 22 +
ima/src/moc_ToolButton.cxx_parameters | 22 +
imc/imc.1 | 40 +-
imc/imc.rc | 4 +-
imc/imc.rc.in | 4 +-
imc/src/FileSystemBrowser.h | 4 +-
imc/src/ImcCore.h | 6 +-
imc/src/KeyDirectoriesPage.h | 4 +-
imc/src/KeyFileAssistant.h | 4 +-
imc/src/KeyFileAssistantModePage.h | 4 +-
imc/src/LogonAclSettings.h | 4 +-
imc/src/LogonGroupEditor.h | 4 +-
imc/src/MainWindow.h | 6 +-
imc/src/SystemConfigurationModifier.cpp | 20 +-
imc/src/SystemConfigurationModifier.h | 4 +-
imc/src/Win32AclEditor.h | 4 +-
imc/src/moc_FileSystemBrowser.cxx_parameters | 22 +
imc/src/moc_ImcCore.cxx_parameters | 22 +
imc/src/moc_KeyDirectoriesPage.cxx_parameters | 22 +
imc/src/moc_KeyFileAssistant.cxx_parameters | 22 +
.../moc_KeyFileAssistantModePage.cxx_parameters | 22 +
imc/src/moc_LogonAclSettings.cxx_parameters | 22 +
imc/src/moc_LogonGroupEditor.cxx_parameters | 22 +
imc/src/moc_MainWindow.cxx_parameters | 22 +
.../moc_SystemConfigurationModifier.cxx_parameters | 22 +
imc/src/moc_Win32AclEditor.cxx_parameters | 22 +
imc/src/moc_netfw.cxx_parameters | 22 +
lib/include/AboutDialog.h | 4 +-
lib/include/AuthenticationCredentials.h | 6 +-
lib/include/Configuration/LocalStore.h | 6 +-
lib/include/Configuration/Object.h | 4 +-
lib/include/Configuration/Store.h | 4 +-
lib/include/Configuration/UiMapping.h | 6 +-
lib/include/Configuration/XmlStore.h | 4 +-
.../Configuration/moc_LocalStore.cxx_parameters | 22 +
.../Configuration/moc_Object.cxx_parameters | 22 +
lib/include/Configuration/moc_Store.cxx_parameters | 22 +
.../Configuration/moc_UiMapping.cxx_parameters | 22 +
.../Configuration/moc_XmlStore.cxx_parameters | 22 +
lib/include/DecoratedMessageBox.h | 4 +-
lib/include/DsaKey.h | 6 +-
lib/include/FastQImage.h | 9 +-
lib/include/Inject.h | 6 +-
lib/include/Ipc/Core.h | 6 +-
lib/include/Ipc/Master.h | 6 +-
lib/include/Ipc/QtSlaveLauncher.h | 4 +-
lib/include/Ipc/Slave.h | 4 +-
lib/include/Ipc/SlaveLauncher.h | 4 +-
lib/include/Ipc/moc_Core.cxx_parameters | 22 +
lib/include/Ipc/moc_Master.cxx_parameters | 22 +
lib/include/Ipc/moc_QtSlaveLauncher.cxx_parameters | 22 +
lib/include/Ipc/moc_Slave.cxx_parameters | 22 +
lib/include/Ipc/moc_SlaveLauncher.cxx_parameters | 22 +
lib/include/ItalcConfiguration.h | 4 +-
lib/include/ItalcCore.h | 4 +-
lib/include/ItalcCoreConnection.h | 4 +-
lib/include/ItalcRfbExt.h | 6 +-
lib/include/ItalcVncConnection.h | 4 +-
lib/include/LocalSystem.h | 6 +-
lib/include/LockWidget.h | 4 +-
lib/include/Logger.h | 6 +-
lib/include/LogonAuthentication.h | 4 +-
lib/include/PasswordDialog.h | 4 +-
lib/include/ProgressWidget.h | 4 +-
lib/include/QtUserEvents.h | 55 -
lib/include/QuadTree.h | 6 +-
lib/include/Snapshot.h | 6 +-
lib/include/SocketDevice.h | 4 +-
lib/include/SystemKeyTrapper.h | 4 +-
lib/include/VncView.h | 6 +-
lib/include/moc_AboutDialog.cxx_parameters | 22 +
.../moc_AuthenticationCredentials.cxx_parameters | 22 +
lib/include/moc_DecoratedMessageBox.cxx_parameters | 22 +
lib/include/moc_DsaKey.cxx_parameters | 22 +
lib/include/moc_FastQImage.cxx_parameters | 22 +
lib/include/moc_Inject.cxx_parameters | 22 +
lib/include/moc_ItalcConfiguration.cxx_parameters | 22 +
lib/include/moc_ItalcCore.cxx_parameters | 22 +
lib/include/moc_ItalcCoreConnection.cxx_parameters | 22 +
lib/include/moc_ItalcRfbExt.cxx_parameters | 22 +
lib/include/moc_ItalcVncConnection.cxx_parameters | 22 +
lib/include/moc_LocalSystem.cxx_parameters | 22 +
lib/include/moc_LockWidget.cxx_parameters | 22 +
lib/include/moc_Logger.cxx_parameters | 22 +
lib/include/moc_LogonAuthentication.cxx_parameters | 22 +
lib/include/moc_PasswordDialog.cxx_parameters | 22 +
lib/include/moc_ProgressWidget.cxx_parameters | 22 +
lib/include/moc_QuadTree.cxx_parameters | 22 +
lib/include/moc_Snapshot.cxx_parameters | 22 +
lib/include/moc_SocketDevice.cxx_parameters | 22 +
lib/include/moc_SystemKeyTrapper.cxx_parameters | 22 +
lib/include/moc_VncView.cxx_parameters | 22 +
lib/include/rfb/rfbclient.h | 4 +
lib/include/rfb/rfbproto.h | 17 +
lib/resources/ar.qm | Bin 64946 -> 64974 bytes
lib/resources/ar.ts | 48 +-
lib/resources/cs.ts | 20 +-
lib/resources/de.qm | Bin 74498 -> 74065 bytes
lib/resources/de.ts | 24 +-
lib/resources/el.ts | 20 +-
lib/resources/es.ts | 20 +-
lib/resources/fi.ts | 20 +-
lib/resources/fr.ts | 20 +-
lib/resources/he.qm | Bin 41891 -> 42140 bytes
lib/resources/he.ts | 30 +-
lib/resources/hu.qm | Bin 77521 -> 77549 bytes
lib/resources/hu.ts | 4 +-
lib/resources/it.qm | Bin 80570 -> 80489 bytes
lib/resources/it.ts | 20 +-
lib/resources/nl.ts | 20 +-
lib/resources/nn.ts | 20 +-
lib/resources/pl.ts | 20 +-
lib/resources/pt_br.qm | Bin 82629 -> 82657 bytes
lib/resources/pt_br.ts | 16 +-
lib/resources/ru.qm | Bin 77301 -> 77313 bytes
lib/resources/ru.ts | 4 +-
lib/resources/sk.ts | 20 +-
lib/resources/sl.ts | 20 +-
lib/resources/sv.qm | Bin 63325 -> 63248 bytes
lib/resources/sv.ts | 20 +-
lib/resources/tr.ts | 20 +-
lib/resources/uk.qm | Bin 81737 -> 81308 bytes
lib/resources/uk.ts | 22 +-
lib/resources/zh_cn.ts | 20 +-
lib/resources/zh_tw.qm | Bin 56587 -> 56196 bytes
lib/resources/zh_tw.ts | 22 +-
lib/src/Configuration/Object.cpp | 2 +-
lib/src/ItalcVncConnection.cpp | 16 +-
lib/src/VncView.cpp | 3 +-
534 files changed, 3625 insertions(+), 90735 deletions(-)
diff --cc debian/changelog
index 47bcf1d,348f9bd..2337fe3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,49 +1,61 @@@
++italc (1:2.0.2+dfsg1-1~bpo70+1) UNRELEASED; urgency=low
++
++ * Upload to wheezy-backports.
++
++ -- Mike Gabriel <sunweaver at debian.org> Thu, 14 Aug 2014 14:23:53 +0200
++
+ italc (1:2.0.2+dfsg1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/watch:
+ + Mangle Debian version (due to new +dfsg1 upstream version suffix).
+ * debian/rules:
+ + Provide get-orig-source rule, repack upstream sources: Remove non-DFSG
+ licensed files sha1.c and sha1.h (which upstream directly took from
+ RFC 3174.
+ + Drop win32 related files when repacking upstream sources via
+ get-orig-source.
+ * debian/control:
+ + Bump Standards: to 3.9.5. No changes needed.
+ * DebConf:
+ + When setting up iTALC roles, ensure that the default group ('root')
+ gets used if an empty string is provided as group name.
+ + Capture non-existing group names and default to group 'root' instead.
+ Also, detect existence of groups correctly, now.
+ * debian/copyright:
+ + Update file to match changes in upstream release.
+ + Drop copyright information for removed files ica/x11/common/sha1.{c,h}.
+ + Drop copyright information for removed files in ica/win32/.
+ * debian/patches:
+ + Drop 002_use-v4l-videodev2.patch, 004_x2go-nx-noxdamage.patch,
+ 021_man-page-patch-in.patch. Applied upstream.
+ + Refresh 031_fix-spelling-errors.patch.
+ + Update 001_set-static-libdir-and-rpath-for-cmake.patch. Adapt
+ block that hard-sets LIB_DIR to /usr/lib/italc.
+ + Add 007_use-openssl-sha.patch. Build against openssl/sha.h, don't use
+ dropped, non-DFSG licensed files sha1.c and sha1.h.
+ + Add 030_fix-man-pages.patch. Fix a hyphen-used-as-minus-sign issue and a
+ spelling error.
+ * lintian:
+ + Drop unused override (spelling-error-in-binary).
+
+ -- Mike Gabriel <sunweaver at debian.org> Thu, 14 Aug 2014 14:23:53 +0200
+
+ italc (1:2.0.1-4) unstable; urgency=low
+
+ * Debconf translation files updated/added:
+ + Spanish translation added (thanks to Camaleón). (Closes: #728116).
+ * debian/control:
+ + Add libpng-dev as build dependency. (Closes: #729675).
+
+ -- Mike Gabriel <sunweaver at debian.org> Sun, 17 Nov 2013 09:19:39 +0100
+
+italc (1:2.0.1-3~bpo7+1) wheezy-backports; urgency=low
+
+ * Upload to wheezy-backports.
+
+ -- Mike Gabriel <sunweaver at debian.org> Fri, 25 Oct 2013 11:22:11 +0200
+
italc (1:2.0.1-3) unstable; urgency=low
* /debian/control:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/italc.git
More information about the debian-edu-commits
mailing list