From 05ab62583c5db162f0b43fdb907c6e94124f0112 Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Tue, 1 Mar 2016 16:25:38 +0000 Subject: [PATCH] Update version to 2.0.0~git20160229.1.b4b8239+dfsg1-1 * enable wayland (adds wlfreerdp and libuwac) * ship shadowing subsystem libraries in libfreerdp-shadow2 --- debian/.gitignore | 8 + debian/changelog | 15 ++ debian/control | 137 ++++++++++++-- debian/copyright | 254 +++++++++++++++++-------- debian/copyright.in | 261 ++++++++++++++++++-------- debian/freerdp2-dev.install | 2 + debian/freerdp2-shadow-x11.install | 1 - debian/freerdp2-wayland.install | 1 + debian/freerdp2-x11.lintian-overrides | 1 + debian/libfreerdp-shadow2.install | 1 + debian/libuwac0-dev.install | 4 + debian/libuwac0.install | 1 + debian/rules | 7 +- 13 files changed, 516 insertions(+), 177 deletions(-) create mode 100644 debian/freerdp2-wayland.install create mode 100644 debian/freerdp2-x11.lintian-overrides create mode 100644 debian/libfreerdp-shadow2.install create mode 100644 debian/libuwac0-dev.install create mode 100644 debian/libuwac0.install diff --git a/debian/.gitignore b/debian/.gitignore index 12f3e29..5c4e1ca 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -22,3 +22,11 @@ librdtk0/ libwinpr1-dbg/ winpr-utils-dbg/ winpr-utils/ +freerdp2-wayland-dbg/ +freerdp2-wayland/ +libfreerdp-shadow2-dbg/ +libfreerdp-shadow2/ +libuwac0-dbg/ +libuwac0-dev/ +libuwac0/ +debhelper-build-stamp diff --git a/debian/changelog b/debian/changelog index 69033dd..ae4cfb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +freerdp2 (2.0.0~git20160229.1.b4b8239+dfsg1-1) UNRELEASED; urgency=medium + + * Import git snapshot from upstream: + - Obtained from master branch of http://github.com/FreeRDP/FreeRDP. + Commit hash: b4b8239bf642a6cc41b2558e55be1b44577aa5dd + * Enable wayland support + + Add package for libuwac (using wayland as a client) + + add package freerdp2-wayland + * Ship the shadowing libraries in an extra package + - libfreerdp-shadow2 + * debian/control: + - Fix some typos and trailing white spaces + + -- Bernhard Miklautz Mon, 29 Feb 2016 16:50:52 +0000 + freerdp2 (2.0.0~git20160115.1.e2dbe5e+dfsg1-2) unstable; urgency=medium [ Bernhard Miklautz] * rename freerdp-x11 to freerdp2-x11 and diff --git a/debian/control b/debian/control index 13733a8..62ba0ef 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,9 @@ Build-Depends: libdbus-glib-1-dev, uuid-dev, libgstreamer1.0-dev, - libgstreamer-plugins-base1.0-dev + libgstreamer-plugins-base1.0-dev, + libwayland-dev, + libxkbcommon-dev Standards-Version: 3.9.6 Homepage: http://www.freerdp.com/ Vcs-Browser: https://anonscm.debian.org/git/collab-maint/freerdp2.git @@ -47,7 +49,6 @@ Vcs-Git: https://anonscm.debian.org/git/collab-maint/freerdp2.git Package: freerdp2-x11 Architecture: any -Section: x11 Depends: ${misc:Depends}, ${shlibs:Depends} Provides: freerdp Replaces: freerdp-x11 @@ -67,7 +68,7 @@ Description: RDP client for Windows Terminal Services (X11 client) * Windows 7 * Windows 2012 Server * Windows 8 - * Windows 10 + * Windows 10 . This package contains the X11 based client. @@ -165,7 +166,7 @@ Description: Free Remote Desktop Protocol library (development files) Package: libwinpr1-dbg Section: debug -Priority: extra +Priority: extra Architecture: any Multi-Arch: same Depends: @@ -205,7 +206,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libfreerdp-client2 (= ${binary:Version}), -Description: Free Remote Desktop Protocol library (debug symbols) +Description: Free Remote Desktop Protocol client library (debug symbols) FreeRDP is a libre client/server implementation of the Remote Desktop Protocol (RDP). . @@ -219,7 +220,7 @@ Multi-Arch: same Depends: ${misc:Depends}, libfreerdp-server2 (= ${binary:Version}), -Description: Free Remote Desktop Protocol library (debug symbols) +Description: Free Remote Desktop Protocol server (debug symbols) FreeRDP is a libre client/server implementation of the Remote Desktop Protocol (RDP). . @@ -271,23 +272,51 @@ Description: Remote Desktop Protocol toolkit Package: librdtk0-dbg Architecture: any Section: debug -Priority: extra +Priority: extra Pre-Depends: ${misc:Pre-Depends} Depends: - ${misc:Depends}, librdtk0 + ${misc:Depends}, + librdtk0 (= ${binary:Version}) Multi-Arch: same -Description: Remote Desktop Protocol toolkit +Description: Remote Desktop Protocol toolkit (debug symbols) FreeRDP is a libre client/server implementation of the Remote Desktop Protocol (RDP). . This package contains the debug symbols of the remote desktop toolkit library. +Package: libfreerdp-shadow2 +Architecture: any +Section: libs +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same +Description: FreeRDP Remote Desktop Protocol shadow libraries + FreeRDP is a libre client/server implementation of the Remote + Desktop Protocol (RDP). + . + This package contains the shadow libraries. + +Package: libfreerdp-shadow2-dbg +Architecture: any +Section: debug +Priority: extra +Pre-Depends: ${misc:Pre-Depends} +Depends: + ${misc:Depends}, + libfreerdp-shadow2 (= ${binary:Version}) +Multi-Arch: same +Description: FreeRDP Remote Desktop Protocol shadow (debug symbols) + FreeRDP is a libre client/server implementation of the Remote + Desktop Protocol (RDP). + . + This package contains the debug symbols of the shadow library + Package: freerdp2-shadow-x11 Architecture: any Section: debug Depends: ${misc:Depends}, ${shlibs:Depends} Provides: freerdp -Description: RDP shadowing server (x11) +Description: FreeRDP x11 shadowing server FreeRDP is a libre client/server implementation of the Remote Desktop Protocol (RDP). . @@ -297,12 +326,11 @@ Description: RDP shadowing server (x11) Package: freerdp2-shadow-x11-dbg Architecture: any Section: debug -Priority: extra +Priority: extra Depends: ${misc:Depends}, - ${shlibs:Depends}, - freerdp2-shadow-x11 + freerdp2-shadow-x11 (= ${binary:Version}) Provides: freerdp -Description: RDP shadowing server (x11) +Description: FreeRDP x11 shadowing server (debug symbols) FreeRDP is a libre client/server implementation of the Remote Desktop Protocol (RDP). . @@ -311,12 +339,11 @@ Description: RDP shadowing server (x11) Package: winpr-utils-dbg Section: debug -Priority: extra +Priority: extra Architecture: any Depends: ${misc:Depends}, - ${shlibs:Depends}, - winpr-utils -Description: Windows Portable Runtime library command line utilities + winpr-utils (= ${binary:Version}) +Description: Windows Portable Runtime command line utilities (debug symbols) WinPR is a spin-off project of FreeRDP which aims at providing a portable implementation of important portions of the Windows API. Just like FreeRDP, WinPR is released under the Apache license. Unlike Wine, WinPR does not provide @@ -327,3 +354,77 @@ Description: Windows Portable Runtime library command line utilities the code using it. . This package contains debug symbols of the WinPR command line utilities. + +Package: libuwac0 +Architecture: any +Section: libs +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same +Description: Using wayland as a client library + Using wayland as a client (uwac) is a library to provide common + functionality for wayland clients. + . + This package contains the using wayland as a client library. + +Package: libuwac0-dbg +Architecture: any +Section: debug +Priority: extra +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, + libuwac0 (= ${binary:Version}) +Multi-Arch: same +Description: Using wayland as a client (debug symbols) + Using wayland as a client (uwac) is a library to provide common + functionality for wayland clients. + . + This package contains the debug symbols of libuwac. + +Package: libuwac0-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: + ${misc:Depends}, + libuwac0 (= ${binary:Version}), +Description: Using wayland as a client (development files) + Using wayland as a client (uwac) is a library to provide common + functionality for wayland clients. + . + This package contains the libuwac development files + +Package: freerdp2-wayland +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: RDP client for Windows Terminal Services (wayland client) + FreeRDP is a libre client/server implementation of the Remote + Desktop Protocol (RDP). + . + Currently, the FreeRDP clients supports the following Windows Versions: + . + * Windows NT Server + * Windows 2000 Terminal Server + * Windows XP + * Windows 2003 Server + * Windows Vista + * Windows 2008/2008r2/2011SBS Server + * Windows 7 + * Windows 2012 Server + * Windows 8 + * Windows 10 + . + This package contains the wayland based client. + +Package: freerdp2-wayland-dbg +Section: debug +Priority: extra +Architecture: any +Depends: + ${misc:Depends}, + freerdp2-wayland (= ${binary:Version}), +Description: RDP client for Windows Terminal Services (wayland client, debug symbols) + FreeRDP is a libre client/server implementation of the Remote + Desktop Protocol (RDP). + . + This package contains the debug symbols of the wlfreerdp executable. diff --git a/debian/copyright b/debian/copyright index 275f248..cc3d386 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,8 +4,8 @@ Upstream-Contact: FreeRDP project Source: http://github.com/FreeRDP/FreeRDP Files: * -License: Apache-2.0 Copyright: *No copyright* +License: Apache-2.0 Files: channels/client/addin.h channels/client/tables.h @@ -106,7 +106,6 @@ Files: channels/client/addin.h include/freerdp/input.h include/freerdp/locale/keyboard.h include/freerdp/locale/locale.h - include/freerdp/locale/timezone.h include/freerdp/message.h include/freerdp/metrics.h include/freerdp/pointer.h @@ -137,7 +136,6 @@ Files: channels/client/addin.h libfreerdp/codec/zgfx.c libfreerdp/common/addin.c libfreerdp/common/assistance.c - libfreerdp/common/settings.c libfreerdp/core/activation.c libfreerdp/core/activation.h libfreerdp/core/bulk.c @@ -223,7 +221,6 @@ Files: channels/client/addin.h libfreerdp/locale/keyboard_xkbfile.h libfreerdp/locale/liblocale.h libfreerdp/locale/locale.c - libfreerdp/locale/timezone.c libfreerdp/locale/xkb_layout_ids.c libfreerdp/locale/xkb_layout_ids.h libfreerdp/primitives/prim_YUV.c @@ -390,7 +387,6 @@ Files: channels/client/addin.h winpr/libwinpr/locale/locale.c winpr/libwinpr/memory/memory.c winpr/libwinpr/memory/memory.h - winpr/libwinpr/nt/nt.h winpr/libwinpr/path/path.c winpr/libwinpr/path/shell.c winpr/libwinpr/pipe/pipe.c @@ -493,7 +489,6 @@ Files: channels/client/addin.h winpr/libwinpr/utils/collections/Reference.c winpr/libwinpr/utils/collections/Stack.c winpr/libwinpr/utils/collections/StreamPool.c - winpr/libwinpr/utils/image.c winpr/libwinpr/utils/ini.c winpr/libwinpr/utils/ntlm.c winpr/libwinpr/utils/print.c @@ -725,9 +720,6 @@ Files: channels/audin/client/alsa/audin_alsa.c channels/drdynvc/client/drdynvc_main.c channels/drdynvc/client/drdynvc_main.h channels/echo/server/echo_main.c - channels/printer/client/printer_cups.c - channels/printer/client/printer_main.c - channels/printer/client/printer_main.h channels/rdpsnd/client/pulse/rdpsnd_pulse.c channels/rdpsnd/server/rdpsnd_main.c channels/tsmf/client/tsmf_ifman.h @@ -843,20 +835,19 @@ Copyright: 2010-2011, Vic Lee 2013, Marc-Andre Moreau License: Apache-2.0 -Files: channels/drive/client/drive_main.c - channels/rdpdr/client/devman.c - channels/rdpdr/client/devman.h - channels/rdpdr/client/irp.c - channels/rdpdr/client/rdpdr_capabilities.c - channels/rdpdr/client/rdpdr_capabilities.h - channels/rdpdr/client/rdpdr_main.c - channels/rdpdr/client/rdpdr_main.h - include/freerdp/channels/rdpdr.h -Copyright: 2010-2011, Vic Lee - 2010-2012, Marc-Andre Moreau - 2015, DI (FH) Martin Haimberger - 2015, Thincast Technologies GmbH -License: Apache-2.0 +Files: uwac/include/uwac/uwac-tools.h + uwac/include/uwac/uwac.h + uwac/libuwac/uwac-display.c + uwac/libuwac/uwac-input.c + uwac/libuwac/uwac-output.c + uwac/libuwac/uwac-priv.h + uwac/libuwac/uwac-tools.c + uwac/libuwac/uwac-utils.h + uwac/libuwac/uwac-window.c +Copyright: 2014, David FORT + 2014-2015, David FORT + 2015, David FORT +License: X11 Files: libfreerdp/core/autodetect.c libfreerdp/core/autodetect.h @@ -870,15 +861,15 @@ Copyright: 2014, Dell Software 2015, Dell Software License: Apache-2.0 -Files: client/Wayland/wlf_display.c - client/Wayland/wlf_display.h - client/Wayland/wlf_input.c - client/Wayland/wlf_input.h - client/Wayland/wlf_window.c - client/Wayland/wlf_window.h - client/Wayland/wlfreerdp.c - client/Wayland/wlfreerdp.h -Copyright: 2014, Manuel Bachmann +Files: server/shadow/shadow_audin.c + server/shadow/shadow_audin.h + server/shadow/shadow_mcevent.c + server/shadow/shadow_mcevent.h + server/shadow/shadow_rdpsnd.c + server/shadow/shadow_rdpsnd.h + server/shadow/shadow_subsystem_builtin.c +Copyright: 2015, Jiang Zihao + 2016, Jiang Zihao License: Apache-2.0 Files: libfreerdp/core/rdp.c @@ -894,6 +885,18 @@ Copyright: 2011, Marc-Andre Moreau 2015, DI (FH) Martin Haimberger License: Apache-2.0 +Files: channels/drive/client/drive_main.c + channels/rdpdr/client/devman.h + channels/rdpdr/client/irp.c + channels/rdpdr/client/rdpdr_capabilities.h + channels/rdpdr/client/rdpdr_main.h + include/freerdp/channels/rdpdr.h +Copyright: 2010-2011, Vic Lee + 2010-2012, Marc-Andre Moreau + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH +License: Apache-2.0 + Files: winpr/include/winpr/comm.h winpr/libwinpr/comm/comm.c winpr/libwinpr/comm/comm_ioctl.c @@ -929,14 +932,6 @@ Copyright: 2010, Marc-Andre Moreau 2015, Hewlett-Packard Development Company, L.P License: Apache-2.0 -Files: server/shadow/shadow_audin.c - server/shadow/shadow_audin.h - server/shadow/shadow_mcevent.c - server/shadow/shadow_mcevent.h - server/shadow/shadow_rdpsnd.c - server/shadow/shadow_rdpsnd.h -Copyright: 2015, Jiang Zihao -License: Apache-2.0 Files: winpr/libwinpr/utils/trio/strio.h winpr/libwinpr/utils/trio/trio.c @@ -1024,17 +1019,6 @@ Copyright: 2011, Marc-Andre Moreau 2015, Thincast Technologies GmbH License: Apache-2.0 -Files: client/common/cmdline.c - libfreerdp/core/license.c - libfreerdp/core/security.c - winpr/libwinpr/synch/critical.c -Copyright: 2011, Marc-Andre Moreau - 2011-2013, Marc-Andre Moreau - 2012, Marc-Andre Moreau - 2013, Norbert Federa - 2014, Norbert Federa -License: Apache-2.0 - Files: include/freerdp/utils/passphrase.h include/freerdp/utils/signal.h libfreerdp/utils/passphrase.c @@ -1055,6 +1039,15 @@ Files: include/freerdp/channels/log.h Copyright: 2014, Armin Novak License: Apache-2.0 +Files: channels/printer/client/printer_cups.c + channels/printer/client/printer_main.c + channels/printer/client/printer_main.h +Copyright: 2010-2011, Vic Lee + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH + 2016, Armin Novak +License: Apache-2.0 + Files: winpr/include/winpr/intrin.h winpr/libwinpr/file/file.c winpr/libwinpr/file/test/TestFileGetStdHandle.c @@ -1087,12 +1080,6 @@ Copyright: 2015, David FORT 2015, Thincast Technologies GmbH License: Apache-2.0 -Files: channels/drive/client/statvfs.c - channels/drive/client/statvfs.h - channels/printer/client/printer_win.h -Copyright: 2012, Gerald Richter -License: Apache-2.0 - Files: channels/tsmf/client/tsmf_codec.c channels/tsmf/client/tsmf_constants.h channels/tsmf/client/tsmf_decoder.h @@ -1100,6 +1087,16 @@ Copyright: 2010-2011, Vic Lee 2012, Hewlett-Packard Development Company, L.P License: Apache-2.0 +Files: libfreerdp/core/license.c + libfreerdp/core/security.c + winpr/libwinpr/synch/critical.c +Copyright: 2011, Marc-Andre Moreau + 2011-2013, Marc-Andre Moreau + 2012, Marc-Andre Moreau + 2013, Norbert Federa + 2014, Norbert Federa +License: Apache-2.0 + Files: include/freerdp/rail.h libfreerdp/core/window.c libfreerdp/core/window.h @@ -1142,7 +1139,7 @@ Files: winpr/libwinpr/utils/wlog/JournaldAppender.h winpr/libwinpr/utils/wlog/UdpAppender.h Copyright: 2015, David FORT 2015, Thincast Technologies GmbH -License: Apache-2.0 +License: X11 Files: channels/audin/client/opensles/audin_opensl_es.c channels/rdpsnd/client/opensles/rdpsnd_opensles.c @@ -1156,6 +1153,15 @@ Files: winpr/libwinpr/utils/wlog/CallbackAppender.c Copyright: 2014, Armin Novak License: Apache-2.0 +Files: channels/rdpdr/client/rdpdr_capabilities.c + channels/rdpdr/client/rdpdr_main.c +Copyright: 2010-2011, Vic Lee + 2010-2012, Marc-Andre Moreau + 2015, DI (FH) Martin Haimberger + 2015-2016, Thincast Technologies GmbH + 2016, Armin Novak +License: Apache-2.0 + Files: winpr/libwinpr/handle/nonehandle.c winpr/libwinpr/handle/nonehandle.h Copyright: 2014, DI (FH) Martin Haimberger @@ -1210,6 +1216,12 @@ Copyright: 2015, DI (FH) Martin Haimberger 2015, Thincast Technologies GmbH License: Apache-2.0 +Files: client/Wayland/wlf_input.c + client/Wayland/wlf_input.h +Copyright: 2014, Manuel Bachmann + 2015, David Fort +License: Apache-2.0 + Files: channels/rdpei/rdpei_common.c channels/rdpei/rdpei_common.h Copyright: 2013, Marc-Andre Moreau @@ -1228,6 +1240,11 @@ Copyright: 2011, Eduardo Fiss Beloni 2014, Hewlett-Packard Development Company, L.P License: Apache-2.0 +Files: channels/drive/client/statvfs.h + channels/printer/client/printer_win.h +Copyright: 2012, Gerald Richter +License: Apache-2.0 + Files: client/X11/cli/xfreerdp.c client/X11/xf_window.c Copyright: 2011, Marc-Andre Moreau @@ -1247,11 +1264,9 @@ Files: include/freerdp/api.h Copyright: 2009-2011, Jay Sorg License: Apache-2.0 -Files: include/freerdp/settings.h - include/freerdp/types.h -Copyright: 2009-2011, Jay Sorg - 2010-2012, Marc-Andre Moreau - 2011, Marc-Andre Moreau +Files: client/Wayland/wlfreerdp.c + client/Wayland/wlfreerdp.h +Copyright: 2014, Manuel Bachmann License: Apache-2.0 Files: libfreerdp/codec/rfx_neon.c @@ -1303,6 +1318,38 @@ Copyright: 2011, Anthony Tong 2015, Thincast Technologies GmbH License: Apache-2.0 +Files: channels/printer/client/printer_win.c +Copyright: 2012, Gerald Richter + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH + 2016, Armin Novak +License: Apache-2.0 + +Files: channels/rdpdr/client/devman.c +Copyright: 2010-2011, Vic Lee + 2010-2012, Marc-Andre Moreau + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH + 2016, Armin Novak +License: Apache-2.0 + +Files: include/freerdp/settings.h +Copyright: 2009-2011, Jay Sorg + 2010-2012, Marc-Andre Moreau + 2016, Armin Novak +License: Apache-2.0 + +Files: libfreerdp/common/settings.c +Copyright: 2012, Marc-Andre Moreau + 2016, Armin Novak +License: Apache-2.0 + +Files: client/common/cmdline.c +Copyright: 2012, Marc-Andre Moreau + 2014, Norbert Federa + 2016, Armin Novak +License: Apache-2.0 + Files: channels/audin/client/audin_main.c Copyright: 2010-2011, Vic Lee 2015, Armin Novak @@ -1350,6 +1397,14 @@ Copyright: 2014, David Fort 2015, Thincast Technologies GmbH License: Apache-2.0 +Files: channels/rdpsnd/client/mac/rdpsnd_mac.c +Copyright: 2012, Laxmikant Rashinkar + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH + 2016, David PHAM-VAN + 2016, Inuvika Inc +License: Apache-2.0 + Files: channels/rdpsnd/client/ios/rdpsnd_ios.c Copyright: 2013, Dell Software 2015, DI (FH) Martin Haimberger @@ -1363,12 +1418,6 @@ Copyright: 2012, Dmitrij Jasnov 2015, Thincast Technologies GmbH License: Apache-2.0 -Files: channels/printer/client/printer_win.c -Copyright: 2012, Gerald Richter - 2015, DI (FH) Martin Haimberger - 2015, Thincast Technologies GmbH -License: Apache-2.0 - Files: channels/rdpsnd/client/rdpsnd_main.c Copyright: 2009-2011, Jay Sorg 2010-2011, Vic Lee @@ -1390,12 +1439,6 @@ Copyright: 2011, Jiten Pathy 2015, Thincast Technologies GmbH License: Apache-2.0 -Files: channels/rdpsnd/client/mac/rdpsnd_mac.c -Copyright: 2012, Laxmikant Rashinkar - 2015, DI (FH) Martin Haimberger - 2015, Thincast Technologies GmbH -License: Apache-2.0 - Files: libfreerdp/core/gcc.c Copyright: 2011, Marc-Andre Moreau 2014, DI (FH) Martin Haimberger @@ -1420,12 +1463,32 @@ Copyright: 2011, Vic Lee 2014, DI (FH) Martin Haimberger License: Apache-2.0 +Files: include/freerdp/session.h +Copyright: 2016, David FORT +License: Apache-2.0 + Files: include/freerdp/channels/rdpei.h Copyright: 2013, Marc-Andre Moreau 2014, David FORT 2014, Thincast Technologies Gmbh License: Apache-2.0 +Files: channels/printer/printer.h +Copyright: 2016, David Fort +License: Apache-2.0 + +Files: channels/drive/client/statvfs.c +Copyright: 2012, Gerald Richter + 2016, David PHAM-VAN + 2016, Inuvika Inc +License: Apache-2.0 + +Files: winpr/libwinpr/utils/image.c +Copyright: 2014, Marc-Andre Moreau + 2016, David PHAM-VAN + 2016, Inuvika Inc +License: Apache-2.0 + Files: include/freerdp/autodetect.h Copyright: 2014, Dell Software 2014, Vic Lee @@ -1448,6 +1511,11 @@ Copyright: 2011, Martin Fleisz 2012, Hewlett-Packard Development Company, L.P License: Apache-2.0 +Files: include/freerdp/types.h +Copyright: 2009-2011, Jay Sorg + 2011, Marc-Andre Moreau +License: Apache-2.0 + Files: include/freerdp/channels/channels.h Copyright: 2009-2011, Jay Sorg 2010-2011, Vic Lee @@ -1497,10 +1565,25 @@ Files: channels/drive/client/dirent.h Copyright: 2006, Toni Ronkko License: Expat +Files: uwac/libuwac/uwac-os.c +Copyright: 2012, Collabora, Ltd +License: X11 + +Files: uwac/libuwac/uwac-os.h +Copyright: 2012, Collabora, Ltd + 2014, David FORT +License: X11 + +Files: uwac/libuwac/uwac-utils.c +Copyright: 2008, Kristian Høgsber + 2012, Collabora, Ltd + 2014, David FORT +License: X11 + Files: include/freerdp/codec/region.h Copyright: 2014, Hardening 2014, Thincast Technologies GmbH -License: Apache-2.0 +License: X11 Files: winpr/libwinpr/thread/test/TestThreadExitThread.c Copyright: 2015, Hewlett-Packard Development Company, L.P @@ -1614,3 +1697,22 @@ License: Zlib . 3. This notice may not be removed or altered from any source distribution. + +License: X11 + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting documentation, and + that the name of the copyright holders not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no representations + about the suitability of this software for any purpose. It is provided "as + is" without express or implied warranty. + . + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + OF THIS SOFTWARE. diff --git a/debian/copyright.in b/debian/copyright.in index 2d17598..a3ff511 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -103,7 +103,6 @@ Files: channels/client/addin.h include/freerdp/input.h include/freerdp/locale/keyboard.h include/freerdp/locale/locale.h - include/freerdp/locale/timezone.h include/freerdp/message.h include/freerdp/metrics.h include/freerdp/pointer.h @@ -134,7 +133,6 @@ Files: channels/client/addin.h libfreerdp/codec/zgfx.c libfreerdp/common/addin.c libfreerdp/common/assistance.c - libfreerdp/common/settings.c libfreerdp/core/activation.c libfreerdp/core/activation.h libfreerdp/core/bulk.c @@ -220,7 +218,6 @@ Files: channels/client/addin.h libfreerdp/locale/keyboard_xkbfile.h libfreerdp/locale/liblocale.h libfreerdp/locale/locale.c - libfreerdp/locale/timezone.c libfreerdp/locale/xkb_layout_ids.c libfreerdp/locale/xkb_layout_ids.h libfreerdp/primitives/prim_YUV.c @@ -387,7 +384,6 @@ Files: channels/client/addin.h winpr/libwinpr/locale/locale.c winpr/libwinpr/memory/memory.c winpr/libwinpr/memory/memory.h - winpr/libwinpr/nt/nt.h winpr/libwinpr/path/path.c winpr/libwinpr/path/shell.c winpr/libwinpr/pipe/pipe.c @@ -490,7 +486,6 @@ Files: channels/client/addin.h winpr/libwinpr/utils/collections/Reference.c winpr/libwinpr/utils/collections/Stack.c winpr/libwinpr/utils/collections/StreamPool.c - winpr/libwinpr/utils/image.c winpr/libwinpr/utils/ini.c winpr/libwinpr/utils/ntlm.c winpr/libwinpr/utils/print.c @@ -585,7 +580,11 @@ Files: client/X11/generate_argument_docbook.c resources/FreeRDP_Icon_256px.h scripts/LECHash.c scripts/LOMHash.c - scripts/android_setup_build_env.sh + scripts/android-build-common.sh + scripts/android-build-freerdp.sh + scripts/android-build-jpeg.sh + scripts/android-build-openh264.sh + scripts/android-build-openssl.sh scripts/autoformat.sh scripts/format_code.sh scripts/xcode.sh @@ -942,9 +941,6 @@ Files: channels/audin/client/alsa/audin_alsa.c channels/drdynvc/client/drdynvc_main.c channels/drdynvc/client/drdynvc_main.h channels/echo/server/echo_main.c - channels/printer/client/printer_cups.c - channels/printer/client/printer_main.c - channels/printer/client/printer_main.h channels/rdpsnd/client/pulse/rdpsnd_pulse.c channels/rdpsnd/server/rdpsnd_main.c channels/tsmf/client/tsmf_ifman.h @@ -1066,20 +1062,19 @@ Copyright: 2010-2011, Vic Lee License: Apache-2.0 FIXME -Files: channels/drive/client/drive_main.c - channels/rdpdr/client/devman.c - channels/rdpdr/client/devman.h - channels/rdpdr/client/irp.c - channels/rdpdr/client/rdpdr_capabilities.c - channels/rdpdr/client/rdpdr_capabilities.h - channels/rdpdr/client/rdpdr_main.c - channels/rdpdr/client/rdpdr_main.h - include/freerdp/channels/rdpdr.h -Copyright: 2010-2011, Vic Lee - 2010-2012, Marc-Andre Moreau - 2015, DI (FH) Martin Haimberger - 2015, Thincast Technologies GmbH -License: Apache-2.0 +Files: uwac/include/uwac/uwac-tools.h + uwac/include/uwac/uwac.h + uwac/libuwac/uwac-display.c + uwac/libuwac/uwac-input.c + uwac/libuwac/uwac-output.c + uwac/libuwac/uwac-priv.h + uwac/libuwac/uwac-tools.c + uwac/libuwac/uwac-utils.h + uwac/libuwac/uwac-window.c +Copyright: 2014, David FORT + 2014-2015, David FORT + 2015, David FORT +License: UNKNOWN FIXME Files: libfreerdp/core/autodetect.c @@ -1095,15 +1090,15 @@ Copyright: 2014, Dell Software License: Apache-2.0 FIXME -Files: client/Wayland/wlf_display.c - client/Wayland/wlf_display.h - client/Wayland/wlf_input.c - client/Wayland/wlf_input.h - client/Wayland/wlf_window.c - client/Wayland/wlf_window.h - client/Wayland/wlfreerdp.c - client/Wayland/wlfreerdp.h -Copyright: 2014, Manuel Bachmann +Files: server/shadow/shadow_audin.c + server/shadow/shadow_audin.h + server/shadow/shadow_mcevent.c + server/shadow/shadow_mcevent.h + server/shadow/shadow_rdpsnd.c + server/shadow/shadow_rdpsnd.h + server/shadow/shadow_subsystem_builtin.c +Copyright: 2015, Jiang Zihao + 2016, Jiang Zihao License: Apache-2.0 FIXME @@ -1121,6 +1116,19 @@ Copyright: 2011, Marc-Andre Moreau License: Apache-2.0 FIXME +Files: channels/drive/client/drive_main.c + channels/rdpdr/client/devman.h + channels/rdpdr/client/irp.c + channels/rdpdr/client/rdpdr_capabilities.h + channels/rdpdr/client/rdpdr_main.h + include/freerdp/channels/rdpdr.h +Copyright: 2010-2011, Vic Lee + 2010-2012, Marc-Andre Moreau + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH +License: Apache-2.0 + FIXME + Files: winpr/include/winpr/comm.h winpr/libwinpr/comm/comm.c winpr/libwinpr/comm/comm_ioctl.c @@ -1159,16 +1167,6 @@ Copyright: 2010, Marc-Andre Moreau License: Apache-2.0 FIXME -Files: server/shadow/shadow_audin.c - server/shadow/shadow_audin.h - server/shadow/shadow_mcevent.c - server/shadow/shadow_mcevent.h - server/shadow/shadow_rdpsnd.c - server/shadow/shadow_rdpsnd.h -Copyright: 2015, Jiang Zihao -License: Apache-2.0 - FIXME - Files: winpr/libwinpr/utils/trio/strio.h winpr/libwinpr/utils/trio/trio.c winpr/libwinpr/utils/trio/trio.h @@ -1263,18 +1261,6 @@ Copyright: 2011, Marc-Andre Moreau License: Apache-2.0 FIXME -Files: client/common/cmdline.c - libfreerdp/core/license.c - libfreerdp/core/security.c - winpr/libwinpr/synch/critical.c -Copyright: 2011, Marc-Andre Moreau - 2011-2013, Marc-Andre Moreau - 2012, Marc-Andre Moreau - 2013, Norbert Federa - 2014, Norbert Federa -License: Apache-2.0 - FIXME - Files: include/freerdp/utils/passphrase.h include/freerdp/utils/signal.h libfreerdp/utils/passphrase.c @@ -1298,6 +1284,16 @@ Copyright: 2014, Armin Novak License: Apache-2.0 FIXME +Files: channels/printer/client/printer_cups.c + channels/printer/client/printer_main.c + channels/printer/client/printer_main.h +Copyright: 2010-2011, Vic Lee + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH + 2016, Armin Novak +License: Apache-2.0 + FIXME + Files: winpr/include/winpr/intrin.h winpr/libwinpr/file/file.c winpr/libwinpr/file/test/TestFileGetStdHandle.c @@ -1334,13 +1330,6 @@ Copyright: 2015, David FORT License: Apache-2.0 FIXME -Files: channels/drive/client/statvfs.c - channels/drive/client/statvfs.h - channels/printer/client/printer_win.h -Copyright: 2012, Gerald Richter -License: Apache-2.0 - FIXME - Files: channels/tsmf/client/tsmf_codec.c channels/tsmf/client/tsmf_constants.h channels/tsmf/client/tsmf_decoder.h @@ -1349,6 +1338,17 @@ Copyright: 2010-2011, Vic Lee License: Apache-2.0 FIXME +Files: libfreerdp/core/license.c + libfreerdp/core/security.c + winpr/libwinpr/synch/critical.c +Copyright: 2011, Marc-Andre Moreau + 2011-2013, Marc-Andre Moreau + 2012, Marc-Andre Moreau + 2013, Norbert Federa + 2014, Norbert Federa +License: Apache-2.0 + FIXME + Files: include/freerdp/rail.h libfreerdp/core/window.c libfreerdp/core/window.h @@ -1413,6 +1413,16 @@ Copyright: 2014, Armin Novak License: Apache-2.0 FIXME +Files: channels/rdpdr/client/rdpdr_capabilities.c + channels/rdpdr/client/rdpdr_main.c +Copyright: 2010-2011, Vic Lee + 2010-2012, Marc-Andre Moreau + 2015, DI (FH) Martin Haimberger + 2015-2016, Thincast Technologies GmbH + 2016, Armin Novak +License: Apache-2.0 + FIXME + Files: winpr/libwinpr/handle/nonehandle.c winpr/libwinpr/handle/nonehandle.h Copyright: 2014, DI (FH) Martin Haimberger @@ -1474,6 +1484,13 @@ Copyright: 2015, DI (FH) Martin Haimberger License: Apache-2.0 FIXME +Files: client/Wayland/wlf_input.c + client/Wayland/wlf_input.h +Copyright: 2014, Manuel Bachmann + 2015, David Fort +License: Apache-2.0 + FIXME + Files: channels/rdpei/rdpei_common.c channels/rdpei/rdpei_common.h Copyright: 2013, Marc-Andre Moreau @@ -1495,6 +1512,12 @@ Copyright: 2011, Eduardo Fiss Beloni License: Apache-2.0 FIXME +Files: channels/drive/client/statvfs.h + channels/printer/client/printer_win.h +Copyright: 2012, Gerald Richter +License: Apache-2.0 + FIXME + Files: client/X11/cli/xfreerdp.c client/X11/xf_window.c Copyright: 2011, Marc-Andre Moreau @@ -1517,11 +1540,9 @@ Copyright: 2009-2011, Jay Sorg License: Apache-2.0 FIXME -Files: include/freerdp/settings.h - include/freerdp/types.h -Copyright: 2009-2011, Jay Sorg - 2010-2012, Marc-Andre Moreau - 2011, Marc-Andre Moreau +Files: client/Wayland/wlfreerdp.c + client/Wayland/wlfreerdp.h +Copyright: 2014, Manuel Bachmann License: Apache-2.0 FIXME @@ -1583,6 +1604,43 @@ Copyright: 2011, Anthony Tong License: Apache-2.0 FIXME +Files: channels/printer/client/printer_win.c +Copyright: 2012, Gerald Richter + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH + 2016, Armin Novak +License: Apache-2.0 + FIXME + +Files: channels/rdpdr/client/devman.c +Copyright: 2010-2011, Vic Lee + 2010-2012, Marc-Andre Moreau + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH + 2016, Armin Novak +License: Apache-2.0 + FIXME + +Files: include/freerdp/settings.h +Copyright: 2009-2011, Jay Sorg + 2010-2012, Marc-Andre Moreau + 2016, Armin Novak +License: Apache-2.0 + FIXME + +Files: libfreerdp/common/settings.c +Copyright: 2012, Marc-Andre Moreau + 2016, Armin Novak +License: Apache-2.0 + FIXME + +Files: client/common/cmdline.c +Copyright: 2012, Marc-Andre Moreau + 2014, Norbert Federa + 2016, Armin Novak +License: Apache-2.0 + FIXME + Files: channels/audin/client/audin_main.c Copyright: 2010-2011, Vic Lee 2015, Armin Novak @@ -1638,6 +1696,15 @@ Copyright: 2014, David Fort License: Apache-2.0 FIXME +Files: channels/rdpsnd/client/mac/rdpsnd_mac.c +Copyright: 2012, Laxmikant Rashinkar + 2015, DI (FH) Martin Haimberger + 2015, Thincast Technologies GmbH + 2016, David PHAM-VAN + 2016, Inuvika Inc +License: Apache-2.0 + FIXME + Files: channels/rdpsnd/client/ios/rdpsnd_ios.c Copyright: 2013, Dell Software 2015, DI (FH) Martin Haimberger @@ -1653,13 +1720,6 @@ Copyright: 2012, Dmitrij Jasnov License: Apache-2.0 FIXME -Files: channels/printer/client/printer_win.c -Copyright: 2012, Gerald Richter - 2015, DI (FH) Martin Haimberger - 2015, Thincast Technologies GmbH -License: Apache-2.0 - FIXME - Files: channels/rdpsnd/client/rdpsnd_main.c Copyright: 2009-2011, Jay Sorg 2010-2011, Vic Lee @@ -1684,13 +1744,6 @@ Copyright: 2011, Jiten Pathy License: Apache-2.0 FIXME -Files: channels/rdpsnd/client/mac/rdpsnd_mac.c -Copyright: 2012, Laxmikant Rashinkar - 2015, DI (FH) Martin Haimberger - 2015, Thincast Technologies GmbH -License: Apache-2.0 - FIXME - Files: libfreerdp/core/gcc.c Copyright: 2011, Marc-Andre Moreau 2014, DI (FH) Martin Haimberger @@ -1719,6 +1772,11 @@ Copyright: 2011, Vic Lee License: Apache-2.0 FIXME +Files: include/freerdp/session.h +Copyright: 2016, David FORT +License: Apache-2.0 + FIXME + Files: include/freerdp/channels/rdpei.h Copyright: 2013, Marc-Andre Moreau 2014, David FORT @@ -1726,6 +1784,25 @@ Copyright: 2013, Marc-Andre Moreau License: Apache-2.0 FIXME +Files: channels/printer/printer.h +Copyright: 2016, David Fort +License: Apache-2.0 + FIXME + +Files: channels/drive/client/statvfs.c +Copyright: 2012, Gerald Richter + 2016, David PHAM-VAN + 2016, Inuvika Inc +License: Apache-2.0 + FIXME + +Files: winpr/libwinpr/utils/image.c +Copyright: 2014, Marc-Andre Moreau + 2016, David PHAM-VAN + 2016, Inuvika Inc +License: Apache-2.0 + FIXME + Files: include/freerdp/autodetect.h Copyright: 2014, Dell Software 2014, Vic Lee @@ -1752,6 +1829,12 @@ Copyright: 2011, Martin Fleisz License: Apache-2.0 FIXME +Files: include/freerdp/types.h +Copyright: 2009-2011, Jay Sorg + 2011, Marc-Andre Moreau +License: Apache-2.0 + FIXME + Files: include/freerdp/channels/channels.h Copyright: 2009-2011, Jay Sorg 2010-2011, Vic Lee @@ -1811,6 +1894,24 @@ Copyright: 2006, Toni Ronkko License: Expat FIXME +Files: uwac/libuwac/uwac-os.c +Copyright: 2012, Collabora, Ltd +License: UNKNOWN + FIXME + +Files: uwac/libuwac/uwac-os.h +Copyright: 2012, Collabora, Ltd + 2014, David FORT +License: UNKNOWN + FIXME + +Files: uwac/libuwac/uwac-utils.c +Copyright: 2008, Kristian Høgsberg + 2012, Collabora, Ltd + 2014, David FORT +License: UNKNOWN + FIXME + Files: include/freerdp/codec/region.h Copyright: 2014, Hardening 2014, Thincast Technologies GmbH diff --git a/debian/freerdp2-dev.install b/debian/freerdp2-dev.install index cb51edf..56a1842 100644 --- a/debian/freerdp2-dev.install +++ b/debian/freerdp2-dev.install @@ -2,6 +2,8 @@ usr/lib/*/libfreerdp.so usr/lib/*/libfreerdp-server.so usr/lib/*/libfreerdp-client.so usr/lib/*/librdtk.so +usr/lib/*/libfreerdp-shadow.so +usr/lib/*/libfreerdp-shadow-subsystem.so usr/lib/*/libwinpr-makecert-tool.a usr/include/freerdp* usr/include/rdtk* diff --git a/debian/freerdp2-shadow-x11.install b/debian/freerdp2-shadow-x11.install index 93f6dea..4a6d4c2 100644 --- a/debian/freerdp2-shadow-x11.install +++ b/debian/freerdp2-shadow-x11.install @@ -1,2 +1 @@ usr/bin/freerdp-shadow-cli -usr/lib/*/libfreerdp-shadow.so.* diff --git a/debian/freerdp2-wayland.install b/debian/freerdp2-wayland.install new file mode 100644 index 0000000..d74855d --- /dev/null +++ b/debian/freerdp2-wayland.install @@ -0,0 +1 @@ +usr/bin/wlfreerdp diff --git a/debian/freerdp2-x11.lintian-overrides b/debian/freerdp2-x11.lintian-overrides new file mode 100644 index 0000000..98e5ce3 --- /dev/null +++ b/debian/freerdp2-x11.lintian-overrides @@ -0,0 +1 @@ +freerdp2-x11 binary: package-name-doesnt-match-sonames libxfreerdp-client2 diff --git a/debian/libfreerdp-shadow2.install b/debian/libfreerdp-shadow2.install new file mode 100644 index 0000000..dfb16ad --- /dev/null +++ b/debian/libfreerdp-shadow2.install @@ -0,0 +1 @@ +usr/lib/*/libfreerdp-shadow*.so.* diff --git a/debian/libuwac0-dev.install b/debian/libuwac0-dev.install new file mode 100644 index 0000000..d4c4c45 --- /dev/null +++ b/debian/libuwac0-dev.install @@ -0,0 +1,4 @@ +usr/lib/*/libuwac.so +usr/include/uwac* +usr/lib/*/pkgconfig/uwac*.pc +usr/lib/*/cmake/uwac* diff --git a/debian/libuwac0.install b/debian/libuwac0.install new file mode 100644 index 0000000..54580f3 --- /dev/null +++ b/debian/libuwac0.install @@ -0,0 +1 @@ +usr/lib/*/libuwac.so.* diff --git a/debian/rules b/debian/rules index 7118d4d..22b5e85 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-archit -DWITH_SERVER=ON \ -DBUILD_TESTING=OFF \ -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \ - -DWITH_WAYLAND=OFF \ + -DWITH_WAYLAND=ON \ $(ARM_FLOAT_ABI) \ $(NULL) %: @@ -43,7 +43,6 @@ override_dh_auto_configure: dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) override_dh_install: - rm -rf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libfreerdp-shadow.so rm -rf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libxfreerdp-client.so mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/freerdp/ dh_install --fail-missing @@ -57,6 +56,10 @@ override_dh_strip: dh_strip -pfreerdp2-x11 --dbg-package=freerdp2-x11-dbg dh_strip -pfreerdp2-shadow-x11 --dbg-package=freerdp2-shadow-x11-dbg dh_strip -pwinpr-utils --dbg-package=winpr-utils-dbg + dh_strip -pfreerdp2-wayland --dbg-package=freerdp2-wayland-dbg + dh_strip -plibuwac0 --dbg-package=libuwac0-dbg + dh_strip -plibfreerdp-shadow2 --dbg-package=libfreerdp-shadow2-dbg + PKD = $(word 1,$(abspath $(dir $(MAKEFILE_LIST)))) PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))