Debian release 2.0.0~git20170725.1.1648deb+dfsg1-7

-----BEGIN PGP SIGNATURE-----
 Comment: Debian powered!
 
 iQKTBAABCgB9FiEE890J+NqH0d9QRsmbBhL0lE7NzVoFAlqqmc1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYz
 REQwOUY4REE4N0QxREY1MDQ2Qzk5QjA2MTJGNDk0NEVDRENENUEACgkQBhL0lE7N
 zVrL+Q//RjDx1NA6AxcpFFkXmYjPNPard5sOl0M+knjYtkfAl370q/jRG9FP71Os
 sX2yETVv+QyIi8VZdyk2c+R/pYEorrW4HYVZnJGZqs6ha++6Swb7KO6UsJ1PTRZ9
 KshR7PXcDvZ85XYFsOvuUV5IPJRNBwk+QXgZgoQofmJlPjR66IC+nanjW9qbgbuS
 lXdeThBd/U3OrAU47LtVAGay2EcoTY4gP9oFcgHOIv6Cma8M3fmvErQgUKUfq10N
 XfS0W9ry3y0lI8zPR5qX9AG20lBZMpJIg9uLH+uBJ4+wqCk8k4IpLt5gdCTeTpQQ
 A2jQb/CMShklwZ0UTQ2GOVrN6HkBITy+eeXYE7OPERLpVowPqTrV39WpBF5gyf3Q
 8hyzwwF0naihZ271FuocG+8RtXiB4GjGjJdx75rtFVJvuLLiyFGnW94JW7Srzkot
 nL9ejds9Y6oTTbNH5IaD42uyuJCp1xYoboEyn0278s2O4z2xOPAK1a4lU56lUyKT
 gvk1Zq76Rbw+18Tj6k4PocB4+JoiHhNdRHG1oBsV9bAIn9T1xXD9Z7784RGgCaVm
 fbjySzDLIsZhdyUtu0z1Le6oSkyW8cle/7/hTfYKGBtN3+ORVjA7RWOThcbPpEF9
 wybcxgAEbyHsMu0V1nNEXZRc/z+Npl1yGuyy/+o9Zen2OeQCDZ4=
 =gJhi
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 Comment: Debian powered!
 
 iQKTBAABCgB9FiEE890J+NqH0d9QRsmbBhL0lE7NzVoFAlqyK1tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYz
 REQwOUY4REE4N0QxREY1MDQ2Qzk5QjA2MTJGNDk0NEVDRENENUEACgkQBhL0lE7N
 zVq0HxAAn5AoUNXYRRSxomGhxdR4o/S2K2p+Skm9ffcP1ugipr7ZoPIk0gK1FzVI
 RyHBTKwZrzCxUjbpehGs1prNDjQBC8L9EJeTIWK+ckl4e6Pu4pUweLtfCGeL+IbY
 imhH/ff3UYPeCcfRtLA+yGuFBonGvUQvA9d7+fSfXKPG8O1K7ROQNaU/NJiwUEu8
 2obBKQJYZ8fyo5l9En2Qgep88c8eUd7vxISsgrnAKO+EBb3ltszADzqIsiofl7U3
 GUVNNYJ4GdXzv9I/d3WsGe/r/GFF3oqdZ+WGMagdnel/3RSgNLPggIRKqqPEkMe9
 7gg/AIwGyGiyo0TmiQoqRUbNQTq8MT2/mUPkwqjP3y0yjucaCo8eonW67cfaAyt4
 PbSQo8bdskm1Y/wMkpHAYElyXGq/9xJbD64SRngXWncBvKIM2YdxDBfrGQ28nLNX
 joFnadgYSS8MxekzLw11XmRvBF7iRHflV56flXO1nFTYSCCg8Gvw/QK9U4j+vpRP
 f6eC+O+oZVPtNyXhhB9XTdS6IPST4RaKhdYYrGJqOjq6ez2cjGjQgdRzTX2jbUrg
 rIYviwe9m941Pz+3fMtqf2SmCEFmZuAiEnQOAeUF8MlggfvoKEmDvb5LOQyYOyta
 OQBppKKpT1ypt30bga4ELD9QPJIyHICq3d129IJwqLrFYYUePGI=
 =29XZ
 -----END PGP SIGNATURE-----

Merge tag 'debian/2.0.0_git20170725.1.1648deb+dfsg1-7' into stretch-backports

Debian release 2.0.0~git20170725.1.1648deb+dfsg1-7
This commit is contained in:
Matteo F. Vescovi 2018-03-21 10:52:14 +01:00
commit e476c4ec36
21 changed files with 4906 additions and 121 deletions

77
debian/changelog vendored
View File

@ -1,15 +1,74 @@
freerdp2 (2.0.0~git20170725.1.1648deb+dfsg1-7) unstable; urgency=medium
* Team upload.
[ Bernhard Miklautz ]
* debian/patches
+ add 0002-fix-nla-don-t-use-server-version.patch to fix
NLA connection problems with latest Windows update.
* debian/libwinpr2-2.docs
+ add to fix lintian error "missing-notice-file-for-apache-license"
[ Matteo F. Vescovi ]
* debian/control: S-V bump 4.1.1 -> 4.1.3 (no changes needed)
* debian/control: Vcs-* fields updated to point to salsa
* debian/: debhelper bump 9 -> 11
* debian/rules: "--parallel" parameter dropped
* debian/control: autotools-dev b-dep dropped
* debian/rules: fix dpkg-architecture variables
-- Matteo F. Vescovi <mfv@debian.org> Thu, 15 Mar 2018 14:35:27 +0100
freerdp2 (2.0.0~git20170725.1.1648deb+dfsg1-6) unstable; urgency=medium
[ Mike Gabriel ]
* debian/changelog:
+ Post-upload fix of 2.0.0~git20170725.1.1648deb+dfsg1-5 stanza. We forgot
to mention inclusion of pkg-info.pkg into debian/rules.
[ Jeremy Bicha ]
* debian/rules:
+ Disable FFmpeg and GSM on Ubuntu (Closes: #880157)
* debian/gbp.conf:
+ Add this file.
-- Mike Gabriel <sunweaver@debian.org> Thu, 02 Nov 2017 12:10:06 +0100
freerdp2 (2.0.0~git20170725.1.1648deb+dfsg1-5) unstable; urgency=medium
* debian/{control,rules}:
+ Don't build the wayland part of FreeRDP on non-Linux systems.
+ Explicitly have libsystemd-dev as B-D. Disable building against
libsystemd-dev for non-Linux host.
* debian/control:
+ Bump Standards-Version: to 4.1.1. No changes needed.
+ Remove Multi-Arch: same field (for bin:pkg freerdp2-dev). (Closes:
#874222).
* debian/rules:
+ FreeRDP2 does not build against oss4's alsa layer. Thus, deactivating
alsa support on non-linux hosts.
+ Avoid using dpkg-parsechangelog.
+ Include pkg-info.pkg from dpkg to have DEB_SOURCE and DEB_VERSION
available.
* debian/{control,*.install}:
+ Process with wrap-and-sort -t -s -a.
* debian/copyright{,.in}:
+ White-space fix.
* debian/libwinpr2-2.symbols{.kfreebsd-*,hurd-*}:
+ The libwinpr/comm/comm_serial_sys.c API is Linux-only.
* debian/patches:
+ Add 1003_fix-FTBFS-on-kFreeBSD.patch,
1004_FreeBSD-is-not-kFreeBSD.patch.
Fix upstream passages for building against GNU/kFreeBSD.
-- Mike Gabriel <sunweaver@debian.org> Sun, 22 Oct 2017 00:30:08 +0200
freerdp2 (2.0.0~git20170725.1.1648deb+dfsg1-4~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- Matteo F. Vescovi <mfv@debian.org> Sun, 15 Oct 2017 14:23:48 +0200
freerdp2 (2.0.0~git20170725.1.1648deb+dfsg1-2~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- Matteo F. Vescovi <mfv@debian.org> Thu, 12 Oct 2017 21:04:11 +0200
freerdp2 (2.0.0~git20170725.1.1648deb+dfsg1-4) unstable; urgency=medium
* debian/control:
@ -28,6 +87,12 @@ freerdp2 (2.0.0~git20170725.1.1648deb+dfsg1-3) unstable; urgency=medium
-- Mike Gabriel <sunweaver@debian.org> Mon, 09 Oct 2017 11:15:16 +0200
freerdp2 (2.0.0~git20170725.1.1648deb+dfsg1-2~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- Matteo F. Vescovi <mfv@debian.org> Thu, 12 Oct 2017 21:04:11 +0200
freerdp2 (2.0.0~git20170725.1.1648deb+dfsg1-2) unstable; urgency=medium
* debian/changelog:

2
debian/compat vendored
View File

@ -1 +1 @@
9
11

227
debian/control vendored
View File

@ -6,54 +6,59 @@ Uploaders:
Mike Gabriel <sunweaver@debian.org>,
Bernhard Miklautz <bernhard.miklautz@shacknet.at>,
Build-Depends:
debhelper (>= 9),
autotools-dev,
dpkg-dev (>= 1.16.1.1),
cmake,
pkg-config,
xmlto,
libssl-dev,
debhelper (>= 11~),
docbook-xsl,
xsltproc,
libx11-dev,
libxkbfile-dev,
libxrandr-dev,
libxi-dev,
libxrender-dev,
libxext-dev,
libxinerama-dev,
libxfixes-dev,
libxcursor-dev,
libxv-dev,
libxdamage-dev,
libxtst-dev,
libcups2-dev,
libpcsclite-dev,
dpkg-dev (>= 1.16.1.1),
libasound2-dev,
libpulse-dev,
libavcodec-dev,
libavutil-dev,
libjpeg-dev,
libgsm1-dev,
libusb-1.0-0-dev [linux-any],
libudev-dev [linux-any],
libcups2-dev,
libdbus-glib-1-dev,
uuid-dev,
libgstreamer1.0-dev,
libgsm1-dev,
libgstreamer-plugins-base1.0-dev,
libwayland-dev,
libxkbcommon-dev
Standards-Version: 4.0.0
libgstreamer1.0-dev,
libjpeg-dev,
libpcsclite-dev,
libpulse-dev,
libssl-dev,
libsystemd-dev [linux-any],
libudev-dev [linux-any],
libusb-1.0-0-dev [linux-any],
libwayland-dev [linux-any],
libx11-dev,
libxcursor-dev,
libxdamage-dev,
libxext-dev,
libxfixes-dev,
libxi-dev,
libxinerama-dev,
libxkbcommon-dev,
libxkbfile-dev,
libxrandr-dev,
libxrender-dev,
libxtst-dev,
libxv-dev,
pkg-config,
uuid-dev,
xmlto,
xsltproc,
Standards-Version: 4.1.3
Homepage: http://www.freerdp.com/
Vcs-Browser: https://anonscm.debian.org/git/pkg-remote/freerdp2.git
Vcs-Git: https://anonscm.debian.org/git/pkg-remote/freerdp2.git
Vcs-Browser: https://salsa.debian.org/debian-remote-team/freerdp2
Vcs-Git: https://salsa.debian.org/debian-remote-team/freerdp2.git
Package: freerdp2-x11
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Provides: freerdp
Replaces: freerdp-x11
Conflicts: freerdp-x11
Depends:
${misc:Depends},
${shlibs:Depends},
Provides:
freerdp,
Replaces:
freerdp-x11,
Conflicts:
freerdp-x11,
Description: RDP client for Windows Terminal Services (X11 client)
FreeRDP is a libre client/server implementation of the Remote
Desktop Protocol (RDP).
@ -76,12 +81,18 @@ Description: RDP client for Windows Terminal Services (X11 client)
Package: libfreerdp2-2
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libfreerdp2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces: libfreerdp2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Pre-Depends:
${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
Breaks:
libfreerdp2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces:
libfreerdp2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Multi-Arch: same
Suggests: freerdp2-x11
Suggests:
freerdp2-x11,
Description: Free Remote Desktop Protocol library (core library)
FreeRDP is a libre client/server implementation of the Remote
Desktop Protocol (RDP).
@ -91,10 +102,15 @@ Description: Free Remote Desktop Protocol library (core library)
Package: libfreerdp-client2-2
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libfreerdp-client2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces: libfreerdp-client2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Pre-Depends:
${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
Breaks:
libfreerdp-client2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces:
libfreerdp-client2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Multi-Arch: same
Description: Free Remote Desktop Protocol library (client library)
FreeRDP is a libre client/server implementation of the Remote
@ -105,10 +121,15 @@ Description: Free Remote Desktop Protocol library (client library)
Package: libfreerdp-server2-2
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libfreerdp-server2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces: libfreerdp-server2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Pre-Depends:
${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
Breaks:
libfreerdp-server2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces:
libfreerdp-server2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Multi-Arch: same
Description: Free Remote Desktop Protocol library (server library)
FreeRDP is a libre client/server implementation of the Remote
@ -119,12 +140,18 @@ Description: Free Remote Desktop Protocol library (server library)
Package: libwinpr2-2
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libwinpr2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces: libwinpr2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Pre-Depends:
${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
Breaks:
libwinpr2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces:
libwinpr2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Multi-Arch: same
Suggests: freerdp2-x11
Suggests:
freerdp2-x11,
Description: Windows Portable Runtime library
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,
@ -140,10 +167,15 @@ Description: Windows Portable Runtime library
Package: libwinpr-tools2-2
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libwinpr-tools2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces: libwinpr-tools2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Pre-Depends:
${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
Breaks:
libwinpr-tools2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces:
libwinpr-tools2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Multi-Arch: same
Description: Windows Portable Runtime Tools library
FreeRDP is a libre client/server implementation of the Remote
@ -157,10 +189,10 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
libssl-dev,
libwinpr2-2 (= ${binary:Version}),
libwinpr-tools2-2 (= ${binary:Version}),
libwinpr2-2 (= ${binary:Version}),
${misc:Depends},
Description: Windows Portable Runtime library (development files)
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,
@ -176,16 +208,15 @@ Description: Windows Portable Runtime library (development files)
Package: freerdp2-dev
Section: devel
Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
libwinpr2-dev (= ${binary:Version}),
libfreerdp2-2 (= ${binary:Version}),
libfreerdp-server2-2 (= ${binary:Version}),
libfreerdp-client2-2 (= ${binary:Version}),
libfreerdp-shadow2-2 (= ${binary:Version}),
libfreerdp-server2-2 (= ${binary:Version}),
libfreerdp-shadow-subsystem2-2 (= ${binary:Version}),
libfreerdp-shadow2-2 (= ${binary:Version}),
libfreerdp2-2 (= ${binary:Version}),
libwinpr2-dev (= ${binary:Version}),
winpr-utils (= ${binary:Version}),
${misc:Depends},
Description: Free Remote Desktop Protocol library (development files)
FreeRDP is a libre client/server implementation of the Remote
Desktop Protocol (RDP).
@ -196,7 +227,9 @@ Package: winpr-utils
Multi-Arch: foreign
Section: utils
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Depends:
${misc:Depends},
${shlibs:Depends},
Description: Windows Portable Runtime library command line utilities
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,
@ -212,10 +245,15 @@ Description: Windows Portable Runtime library command line utilities
Package: libfreerdp-shadow2-2
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
Breaks: libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces: libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Pre-Depends:
${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
Breaks:
libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces:
libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Multi-Arch: same
Description: FreeRDP Remote Desktop Protocol shadow libraries
FreeRDP is a libre client/server implementation of the Remote
@ -226,10 +264,15 @@ Description: FreeRDP Remote Desktop Protocol shadow libraries
Package: libfreerdp-shadow-subsystem2-2
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces: libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Pre-Depends:
${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
Breaks:
libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces:
libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Multi-Arch: same
Description: FreeRDP Remote Desktop Protocol shadow subsystem libraries
FreeRDP is a libre client/server implementation of the Remote
@ -239,8 +282,11 @@ Description: FreeRDP Remote Desktop Protocol shadow subsystem libraries
Package: freerdp2-shadow-x11
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Provides: freerdp
Depends:
${misc:Depends},
${shlibs:Depends},
Provides:
freerdp,
Description: FreeRDP x11 shadowing server
FreeRDP is a libre client/server implementation of the Remote
Desktop Protocol (RDP).
@ -249,12 +295,17 @@ Description: FreeRDP x11 shadowing server
share an already started X11 DISPLAY.
Package: libuwac0-0
Architecture: any
Architecture: linux-any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libuwac0 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces: libuwac0 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Pre-Depends:
${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
Breaks:
libuwac0 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Replaces:
libuwac0 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
Multi-Arch: same
Description: Using wayland as a client library
Using wayland as a client (uwac) is a library to provide common
@ -264,11 +315,11 @@ Description: Using wayland as a client library
Package: libuwac0-dev
Section: libdevel
Architecture: any
Architecture: linux-any
Multi-Arch: same
Depends:
${misc:Depends},
libuwac0-0 (= ${binary:Version}),
${misc:Depends},
Description: Using wayland as a client (development files)
Using wayland as a client (uwac) is a library to provide common
functionality for wayland clients.
@ -276,8 +327,10 @@ Description: Using wayland as a client (development files)
This package contains the libuwac development files
Package: freerdp2-wayland
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Architecture: linux-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).

2
debian/copyright vendored
View File

@ -1838,7 +1838,7 @@ License: Apache-2.0
Files: cmake/AndroidToolchain.cmake
Copyright: 2010-2011, Ethan Rublee
2011-2014, Andrey Kamaev
2011-2014, Andrey Kamaev
License: BSD-3-clause
Files: cmake/AutoVersioning.cmake

1
debian/copyright.in vendored
View File

@ -2205,4 +2205,3 @@ Files: winpr/libwinpr/thread/test/TestThreadExitThread.c
Copyright: 2015, Hewlett-Packard Development Company, L.P.
License: UNKNOWN
FIXME

View File

@ -1,10 +1,10 @@
usr/lib/*/libfreerdp2.so
usr/lib/*/libfreerdp-server2.so
usr/lib/*/libfreerdp-client2.so
usr/lib/*/libfreerdp-shadow2.so
usr/lib/*/libfreerdp-shadow-subsystem2.so
usr/include/freerdp*
usr/lib/*/pkgconfig/freerdp*.pc
usr/lib/*/cmake/FreeRDP*
obj-*/include/freerdp/version.h usr/include/freerdp2/freerdp/
obj-*/include/freerdp/build-config.h usr/include/freerdp2/freerdp/
obj-*/include/freerdp/version.h usr/include/freerdp2/freerdp/
usr/include/freerdp*
usr/lib/*/cmake/FreeRDP*
usr/lib/*/libfreerdp-client2.so
usr/lib/*/libfreerdp-server2.so
usr/lib/*/libfreerdp-shadow-subsystem2.so
usr/lib/*/libfreerdp-shadow2.so
usr/lib/*/libfreerdp2.so
usr/lib/*/pkgconfig/freerdp*.pc

View File

@ -1,2 +1,2 @@
usr/bin/freerdp-shadow-cli
/usr/share/man/man1/freerdp-shadow-cli.1
usr/bin/freerdp-shadow-cli

View File

@ -1,2 +1,2 @@
usr/bin/wlfreerdp
/usr/share/man/man1/wlfreerdp.1
usr/bin/wlfreerdp

2
debian/gbp.conf vendored Normal file
View File

@ -0,0 +1,2 @@
[DEFAULT]
pristine-tar = True

View File

@ -1,4 +1,4 @@
usr/lib/*/libuwac*.so
usr/include/uwac*
usr/lib/*/pkgconfig/uwac*.pc
usr/lib/*/cmake/uwac*
usr/lib/*/libuwac*.so
usr/lib/*/pkgconfig/uwac*.pc

1
debian/libwinpr2-2.docs vendored Normal file
View File

@ -0,0 +1 @@
winpr/libwinpr/sysinfo/cpufeatures/NOTICE

1497
debian/libwinpr2-2.symbols.hurd-i386 vendored Normal file

File diff suppressed because it is too large Load Diff

1497
debian/libwinpr2-2.symbols.kfreebsd-amd64 vendored Normal file

File diff suppressed because it is too large Load Diff

1497
debian/libwinpr2-2.symbols.kfreebsd-i386 vendored Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
obj-*/winpr/include/winpr/wtypes.h usr/include/winpr2/winpr
usr/include/winpr*
usr/lib/*/cmake/WinPR*
usr/lib/*/libwinpr*.so
usr/lib/*/libwinpr-tools*.so
usr/include/winpr*
obj-*/winpr/include/winpr/wtypes.h usr/include/winpr2/winpr
usr/lib/*/pkgconfig/winpr2.pc
usr/lib/*/pkgconfig/winpr-tools2.pc
usr/lib/*/cmake/WinPR*
usr/lib/*/pkgconfig/winpr2.pc

View File

@ -0,0 +1,38 @@
From dd415320b78e6f703680aee64f9297909bd34f5e Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
Date: Wed, 14 Mar 2018 16:58:50 +0100
Subject: [PATCH] fix nla: don't use server version
based on upstream commit e7ae3f6babc881d893411a5ada9156abe8525b2f
---
libfreerdp/core/nla.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
index 63966f5..ab9bfb3 100644
--- a/libfreerdp/core/nla.c
+++ b/libfreerdp/core/nla.c
@@ -1541,15 +1541,19 @@ BOOL nla_send(rdpNla* nla)
int nla_decode_ts_request(rdpNla* nla, wStream* s)
{
int length;
+ UINT32 version;
/* TSRequest */
if (!ber_read_sequence_tag(s, &length) ||
!ber_read_contextual_tag(s, 0, &length, TRUE) ||
- !ber_read_integer(s, &nla->version))
+ !ber_read_integer(s, &version))
{
return -1;
}
+ if (version < nla->version)
+ nla->version = version;
+
/* [1] negoTokens (NegoData) */
if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)
{
--
2.11.0

View File

@ -0,0 +1,81 @@
Description: Handle GNU/kFreeBSD the same way as other BSD variants
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Index: freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/winpr/libwinpr/file/file.c
===================================================================
--- freerdp2-2.0.0~git20170725.1.1648deb+dfsg1.orig/winpr/libwinpr/file/file.c
+++ freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/winpr/libwinpr/file/file.c
@@ -23,6 +23,10 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
+#if defined(__FreeBSD_kernel__) && defined(__GLIBC__)
+#define _GNU_SOURCE
+#endif
+
#include <winpr/crt.h>
#include <winpr/file.h>
@@ -384,7 +388,7 @@ static BOOL FileSetFileTime(HANDLE hFile
const FILETIME* lpLastAccessTime, const FILETIME* lpLastWriteTime)
{
int rc;
-#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
struct stat buf;
/* OpenBSD, NetBSD and DragonflyBSD support POSIX futimens */
struct timeval timevals[2];
@@ -396,7 +400,7 @@ static BOOL FileSetFileTime(HANDLE hFile
if (!hFile)
return FALSE;
-#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(ANDROID) || defined(__FreeBSD__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
rc = fstat(fileno(pFile->fp), &buf);
if (rc < 0)
@@ -406,7 +410,7 @@ static BOOL FileSetFileTime(HANDLE hFile
if (!lpLastAccessTime)
{
-#if defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
timevals[0].tv_sec = buf.st_atime;
#ifdef _POSIX_SOURCE
TIMESPEC_TO_TIMEVAL(&timevals[0], &buf.st_atim);
@@ -424,7 +428,7 @@ static BOOL FileSetFileTime(HANDLE hFile
else
{
UINT64 tmp = FileTimeToUS(lpLastAccessTime);
-#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
timevals[0].tv_sec = tmp / 1000000ULL;
timevals[0].tv_usec = tmp % 1000000ULL;
#else
@@ -435,7 +439,7 @@ static BOOL FileSetFileTime(HANDLE hFile
if (!lpLastWriteTime)
{
-#if defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
timevals[1].tv_sec = buf.st_mtime;
#ifdef _POSIX_SOURCE
TIMESPEC_TO_TIMEVAL(&timevals[1], &buf.st_mtim);
@@ -453,7 +457,7 @@ static BOOL FileSetFileTime(HANDLE hFile
else
{
UINT64 tmp = FileTimeToUS(lpLastWriteTime);
-#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
timevals[1].tv_sec = tmp / 1000000ULL;
timevals[1].tv_usec = tmp % 1000000ULL;
#else
@@ -463,7 +467,7 @@ static BOOL FileSetFileTime(HANDLE hFile
}
// TODO: Creation time can not be handled!
-#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(ANDROID) || defined(__FreeBSD__) || defined(__APPLE__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
rc = utimes(pFile->lpFileName, timevals);
#else
rc = futimens(fileno(pFile->fp), times);

View File

@ -0,0 +1,30 @@
Description: GNU/kFreeBSD != FreeBSD
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Index: freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/CMakeLists.txt
===================================================================
--- freerdp2-2.0.0~git20170725.1.1648deb+dfsg1.orig/CMakeLists.txt
+++ freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/CMakeLists.txt
@@ -158,6 +158,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
set(FREEBSD TRUE)
endif()
+ if(${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
+ set(KFREEBSD TRUE)
+ endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
set(OPENBSD TRUE)
endif()
Index: freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/winpr/libwinpr/utils/CMakeLists.txt
===================================================================
--- freerdp2-2.0.0~git20170725.1.1648deb+dfsg1.orig/winpr/libwinpr/utils/CMakeLists.txt
+++ freerdp2-2.0.0~git20170725.1.1648deb+dfsg1/winpr/libwinpr/utils/CMakeLists.txt
@@ -141,7 +141,7 @@ if(UNIX)
winpr_library_add(m)
endif()
-if(FREEBSD)
+if((FREEBSD) AND (NOT KFREEBSD))
winpr_library_add(execinfo)
endif()

View File

@ -1,3 +1,6 @@
0001-Fix-gstreamer-1.0-detection.patch
0002-fix-nla-don-t-use-server-version.patch
1001_Typo-Fixes.patch
1002_macro-fix-in-man-pages.patch
1003_fix-FTBFS-on-kFreeBSD.patch
1004_FreeBSD-is-not-kFreeBSD.patch

36
debian/rules vendored
View File

@ -6,16 +6,27 @@ include /usr/share/dpkg/buildflags.mk
CFLAGS+=$(CPPFLAGS)
CXXFLAGS+=$(CPPFLAGS)
DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
ifneq (,$(filter armel,$(DEB_HOST_ARCH)))
WITH_NEON = -DWITH_NEON=OFF
else
WITH_NEON =
endif
DEB_HOST_ARCH_OS?=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
ifeq (,$(filter linux, $(DEB_HOST_ARCH_OS)))
WITH_WAYLAND = -DWITH_WAYLAND=OFF
WITH_LIBSYSTEMD = -DWITH_LIBSYSTEMD=OFF
WITH_ALSA = -DWITH_ALSA=OFF
else
WITH_WAYLAND =
WITH_LIBSYSTEMD =
WITH_ALSA =
endif
NULL =
DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_OS?=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
LINUX_URBDRC_CLIENT = -DCHANNEL_URBDRC=ON \
-DCHANNEL_URBDRC_CLIENT=ON \
@ -30,6 +41,7 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-archit
-DCMAKE_SKIP_RPATH=FALSE \
-DCMAKE_SKIP_INSTALL_RPATH=TRUE \
-DWITH_PULSE=ON \
${WITH_ALSA} \
-DWITH_CHANNELS=ON \
-DBUILTIN_CHANNELS=ON \
-DWITH_CUPS=ON \
@ -37,17 +49,25 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-archit
-DWITH_JPEG=ON \
-DWITH_GSTREAMER_0_10=OFF \
-DWITH_GSTREAMER_1_0=ON \
-DWITH_GSM=ON \
$(LINUX_URBDRC_CLIENT) \
-DWITH_SERVER=ON \
-DBUILD_TESTING=OFF \
-DCMAKE_BUILD_TYPE=RELWITHDEBINFO \
-DWITH_WAYLAND=ON \
$(WITH_WAYLAND) \
$(WITH_LIBSYSTEMD) \
-DWITH_CLIENT_INTERFACE=OFF \
$(WITH_NEON) \
$(NULL)
# Ubuntu can't have ffmpeg in main
ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
DEB_CMAKE_EXTRA_FLAGS += -DWITH_FFMPEG=OFF -DWITH_GSM=OFF
else
DEB_CMAKE_EXTRA_FLAGS += -DWITH_GSM=ON
endif
%:
dh $@ --parallel
dh $@
.PHONY: override_dh_auto_configure override_dh_install override_dh_strip
override_dh_auto_configure:
@ -72,9 +92,11 @@ override_dh_strip:
dh_strip -pfreerdp2-wayland --dbgsym-migration='freerdp2-wayland-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
dh_strip -plibuwac0-0 --dbgsym-migration='libuwac0-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
include /usr/share/dpkg/pkg-info.mk
PKD = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
UVER = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
PKG = $(DEB_SOURCE)
UVER = $(shell echo $(DEB_VERSION) | cut -d "-" -f1)
DTYPE = +dfsg1
VER ?= $(subst $(DTYPE),,$(UVER))

View File

@ -1,4 +1,4 @@
usr/bin/winpr-hash
usr/bin/winpr-makecert
usr/share/man/man1/winpr-makecert.1
usr/share/man/man1/winpr-hash.1
usr/share/man/man1/winpr-makecert.1