Adapt packages to upstream changes
* libwinpr2 and librdtk2
This commit is contained in:
Bernhard Miklautz
parent
80e7d39434
commit
aa03920e1a
10
debian/.gitignore
vendored
10
debian/.gitignore
vendored
@ -5,8 +5,8 @@ libfreerdp-client2/
|
||||
libfreerdp-server2/
|
||||
libfreerdp2-dev/
|
||||
libfreerdp2/
|
||||
libwinpr1-dev/
|
||||
libwinpr1/
|
||||
libwinpr2-dev/
|
||||
libwinpr2/
|
||||
tmp/
|
||||
*.substvars
|
||||
.debhelper/
|
||||
@ -17,9 +17,9 @@ freerdp2-dev/
|
||||
libfreerdp-client2-dbg/
|
||||
libfreerdp-server2-dbg/
|
||||
libfreerdp2-dbg/
|
||||
librdtk0-dbg/
|
||||
librdtk0/
|
||||
libwinpr1-dbg/
|
||||
librdtk2-dbg/
|
||||
librdtk2/
|
||||
libwinpr2-dbg/
|
||||
winpr-utils-dbg/
|
||||
winpr-utils/
|
||||
freerdp2-wayland-dbg/
|
||||
|
||||
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -3,8 +3,12 @@ freerdp2 (2.0.0~git20160317.1.75ae3f5+dfsg1-1) UNRELEASED; urgency=medium
|
||||
* Import git snapshot from upstream:
|
||||
- Obtained from master branch of http://github.com/FreeRDP/FreeRDP.
|
||||
Commit hash: 75ae3f58df5a14b4a67439aca96061a9c2ea5040
|
||||
* Reflect upstream changes
|
||||
- increase version numbers to 2 for rdtk and winpr
|
||||
* debian/rules
|
||||
- get-orig-source: don't add git refs in the generated ChangeLog
|
||||
|
||||
-- Bernhard Miklautz <bernhard.miklautz@shacknet.at> Mon, 17 Mar 2016 11:42:03 +0000
|
||||
-- Bernhard Miklautz <bernhard.miklautz@shacknet.at> Thu, 17 Mar 2016 11:42:03 +0000
|
||||
|
||||
freerdp2 (2.0.0~git20160229.1.b4b8239+dfsg1-1) UNRELEASED; urgency=medium
|
||||
|
||||
|
||||
20
debian/control
vendored
20
debian/control
vendored
@ -109,7 +109,7 @@ Description: Free Remote Desktop Protocol library (server library)
|
||||
.
|
||||
This package contains the shared library with common server functionality.
|
||||
|
||||
Package: libwinpr1
|
||||
Package: libwinpr2
|
||||
Architecture: any
|
||||
Section: libs
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
@ -128,13 +128,13 @@ Description: Windows Portable Runtime library
|
||||
.
|
||||
This package contains the WinPR shared library.
|
||||
|
||||
Package: libwinpr1-dev
|
||||
Package: libwinpr2-dev
|
||||
Section: libdevel
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Depends:
|
||||
${misc:Depends},
|
||||
libwinpr1 (= ${binary:Version}),
|
||||
libwinpr2 (= ${binary:Version}),
|
||||
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,
|
||||
@ -153,25 +153,25 @@ Architecture: any
|
||||
Multi-Arch: same
|
||||
Depends:
|
||||
${misc:Depends},
|
||||
libwinpr1-dev (= ${binary:Version}),
|
||||
libwinpr2-dev (= ${binary:Version}),
|
||||
libfreerdp2 (= ${binary:Version}),
|
||||
libfreerdp-server2 (= ${binary:Version}),
|
||||
libfreerdp-client2 (= ${binary:Version}),
|
||||
librdtk0 (= ${binary:Version}),
|
||||
librdtk2 (= ${binary:Version}),
|
||||
Description: Free Remote Desktop Protocol library (development files)
|
||||
FreeRDP is a libre client/server implementation of the Remote
|
||||
Desktop Protocol (RDP).
|
||||
.
|
||||
This package contains the FreeRDP development files.
|
||||
|
||||
Package: libwinpr1-dbg
|
||||
Package: libwinpr2-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Depends:
|
||||
${misc:Depends},
|
||||
libwinpr1 (= ${binary:Version}),
|
||||
libwinpr2 (= ${binary:Version}),
|
||||
Description: Windows Portable Runtime library (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,
|
||||
@ -257,7 +257,7 @@ Description: Windows Portable Runtime library command line utilities
|
||||
.
|
||||
This package contains WinPR command line utils (winpr-hash, winpr-makecert).
|
||||
|
||||
Package: librdtk0
|
||||
Package: librdtk2
|
||||
Architecture: any
|
||||
Section: libs
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
@ -269,14 +269,14 @@ Description: Remote Desktop Protocol toolkit
|
||||
.
|
||||
This package contains the remote desktop toolkit shared library.
|
||||
|
||||
Package: librdtk0-dbg
|
||||
Package: librdtk2-dbg
|
||||
Architecture: any
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
Depends:
|
||||
${misc:Depends},
|
||||
librdtk0 (= ${binary:Version})
|
||||
librdtk2 (= ${binary:Version})
|
||||
Multi-Arch: same
|
||||
Description: Remote Desktop Protocol toolkit (debug symbols)
|
||||
FreeRDP is a libre client/server implementation of the Remote
|
||||
|
||||
54
debian/copyright
vendored
54
debian/copyright
vendored
@ -885,18 +885,6 @@ Copyright: 2011, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
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 <marcandre.moreau@gmail.com>
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
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
|
||||
@ -932,7 +920,6 @@ Copyright: 2010, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2015, Hewlett-Packard Development Company, L.P
|
||||
License: Apache-2.0
|
||||
|
||||
|
||||
Files: winpr/libwinpr/utils/trio/strio.h
|
||||
winpr/libwinpr/utils/trio/trio.c
|
||||
winpr/libwinpr/utils/trio/trio.h
|
||||
@ -958,6 +945,17 @@ Copyright: 2009-2011, Jay Sorg
|
||||
2015, Thincast Technologies GmbH
|
||||
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
|
||||
include/freerdp/channels/rdpdr.h
|
||||
Copyright: 2010-2011, Vic Lee
|
||||
2010-2012, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
2015, Thincast Technologies GmbH
|
||||
License: Apache-2.0
|
||||
|
||||
Files: libfreerdp/core/gateway/ntlm.c
|
||||
libfreerdp/core/gateway/ntlm.h
|
||||
libfreerdp/core/gateway/rpc.c
|
||||
@ -1175,6 +1173,18 @@ Copyright: 2014, David FORT <contact@hardening-consulting.com>
|
||||
2015, Thincast Technologies GmbH
|
||||
License: Apache-2.0
|
||||
|
||||
|
||||
Files: channels/drive/client/drive_file.c
|
||||
channels/drive/client/drive_file.h
|
||||
Copyright: 2010-2011, Vic Lee
|
||||
2010-2012, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2012, Gerald Richter
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
2015, Thincast Technologies GmbH
|
||||
2016, David PHAM-VAN <d.phamvan@inuvika.com>
|
||||
2016, Inuvika Inc
|
||||
License: Apache-2.0
|
||||
|
||||
Files: channels/parallel/client/parallel_main.c
|
||||
channels/smartcard/client/smartcard_main.h
|
||||
Copyright: 2010, Eduardo Fiss Beloni <beloni@ossystems.com.br>
|
||||
@ -1185,14 +1195,6 @@ Copyright: 2010, Eduardo Fiss Beloni <beloni@ossystems.com.br>
|
||||
2015, Thincast Technologies GmbH
|
||||
License: Apache-2.0
|
||||
|
||||
Files: channels/drive/client/drive_file.c
|
||||
channels/drive/client/drive_file.h
|
||||
Copyright: 2010-2011, Vic Lee
|
||||
2010-2012, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2012, Gerald Richter
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
2015, Thincast Technologies GmbH
|
||||
License: Apache-2.0
|
||||
|
||||
Files: include/freerdp/freerdp.h
|
||||
include/freerdp/svc.h
|
||||
@ -1405,6 +1407,16 @@ Copyright: 2012, Laxmikant Rashinkar <LK.Rashinkar@gmail.com>
|
||||
2016, Inuvika Inc
|
||||
License: Apache-2.0
|
||||
|
||||
|
||||
Files: channels/rdpdr/client/rdpdr_main.h
|
||||
Copyright: 2010-2011, Vic Lee
|
||||
2010-2012, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
2015, Thincast Technologies GmbH
|
||||
2016, David PHAM-VAN <d.phamvan@inuvika.com>
|
||||
2016, Inuvika Inc
|
||||
License: Apache-2.0
|
||||
|
||||
Files: channels/rdpsnd/client/ios/rdpsnd_ios.c
|
||||
Copyright: 2013, Dell Software <Mike.McDonald@software.dell.com>
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
|
||||
58
debian/copyright.in
vendored
58
debian/copyright.in
vendored
@ -567,6 +567,7 @@ Files: client/X11/generate_argument_docbook.c
|
||||
libfreerdp/gdi/test/TestGdiRop3.c
|
||||
libfreerdp/primitives/prim_YUV_opt.c
|
||||
libfreerdp/primitives/test/TestPrimitivesYCbCr.c
|
||||
libfreerdp/primitives/test/TestPrimitivesYUV.c
|
||||
packaging/deb/freerdp-nightly/changelog
|
||||
packaging/deb/freerdp-nightly/compat
|
||||
packaging/deb/freerdp-nightly/control
|
||||
@ -1116,19 +1117,6 @@ Copyright: 2011, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
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 <marcandre.moreau@gmail.com>
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
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
|
||||
@ -1194,6 +1182,18 @@ Copyright: 2009-2011, Jay Sorg
|
||||
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
|
||||
include/freerdp/channels/rdpdr.h
|
||||
Copyright: 2010-2011, Vic Lee
|
||||
2010-2012, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
2015, Thincast Technologies GmbH
|
||||
License: Apache-2.0
|
||||
FIXME
|
||||
|
||||
Files: libfreerdp/core/gateway/ntlm.c
|
||||
libfreerdp/core/gateway/ntlm.h
|
||||
libfreerdp/core/gateway/rpc.c
|
||||
@ -1438,6 +1438,18 @@ Copyright: 2014, David FORT <contact@hardening-consulting.com>
|
||||
License: Apache-2.0
|
||||
FIXME
|
||||
|
||||
Files: channels/drive/client/drive_file.c
|
||||
channels/drive/client/drive_file.h
|
||||
Copyright: 2010-2011, Vic Lee
|
||||
2010-2012, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2012, Gerald Richter
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
2015, Thincast Technologies GmbH
|
||||
2016, David PHAM-VAN <d.phamvan@inuvika.com>
|
||||
2016, Inuvika Inc
|
||||
License: Apache-2.0
|
||||
FIXME
|
||||
|
||||
Files: channels/parallel/client/parallel_main.c
|
||||
channels/smartcard/client/smartcard_main.h
|
||||
Copyright: 2010, Eduardo Fiss Beloni <beloni@ossystems.com.br>
|
||||
@ -1449,16 +1461,6 @@ Copyright: 2010, Eduardo Fiss Beloni <beloni@ossystems.com.br>
|
||||
License: Apache-2.0
|
||||
FIXME
|
||||
|
||||
Files: channels/drive/client/drive_file.c
|
||||
channels/drive/client/drive_file.h
|
||||
Copyright: 2010-2011, Vic Lee
|
||||
2010-2012, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2012, Gerald Richter
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
2015, Thincast Technologies GmbH
|
||||
License: Apache-2.0
|
||||
FIXME
|
||||
|
||||
Files: include/freerdp/freerdp.h
|
||||
include/freerdp/svc.h
|
||||
Copyright: 2009-2011, Jay Sorg
|
||||
@ -1705,6 +1707,16 @@ Copyright: 2012, Laxmikant Rashinkar <LK.Rashinkar@gmail.com>
|
||||
License: Apache-2.0
|
||||
FIXME
|
||||
|
||||
Files: channels/rdpdr/client/rdpdr_main.h
|
||||
Copyright: 2010-2011, Vic Lee
|
||||
2010-2012, Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
2015, Thincast Technologies GmbH
|
||||
2016, David PHAM-VAN <d.phamvan@inuvika.com>
|
||||
2016, Inuvika Inc
|
||||
License: Apache-2.0
|
||||
FIXME
|
||||
|
||||
Files: channels/rdpsnd/client/ios/rdpsnd_ios.c
|
||||
Copyright: 2013, Dell Software <Mike.McDonald@software.dell.com>
|
||||
2015, DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
|
||||
|
||||
5
debian/libwinpr1-dev.install
vendored
5
debian/libwinpr1-dev.install
vendored
@ -1,5 +0,0 @@
|
||||
usr/lib/*/libwinpr.so
|
||||
usr/include/winpr*
|
||||
obj-*/winpr/include/winpr/wtypes.h usr/include/winpr1/winpr
|
||||
usr/lib/*/pkgconfig/winpr1.pc
|
||||
usr/lib/*/cmake/WinPR*
|
||||
5
debian/libwinpr2-dev.install
vendored
Normal file
5
debian/libwinpr2-dev.install
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
usr/lib/*/libwinpr.so
|
||||
usr/include/winpr*
|
||||
obj-*/winpr/include/winpr/wtypes.h usr/include/winpr2/winpr
|
||||
usr/lib/*/pkgconfig/winpr2.pc
|
||||
usr/lib/*/cmake/WinPR*
|
||||
6
debian/rules
vendored
6
debian/rules
vendored
@ -51,8 +51,8 @@ override_dh_strip:
|
||||
dh_strip -plibfreerdp2 --dbg-package=libfreerdp2-dbg
|
||||
dh_strip -plibfreerdp-server2 --dbg-package=libfreerdp-server2-dbg
|
||||
dh_strip -plibfreerdp-client2 --dbg-package=libfreerdp-client2-dbg
|
||||
dh_strip -plibrdtk0 --dbg-package=librdtk0-dbg
|
||||
dh_strip -plibwinpr1 --dbg-package=libwinpr1-dbg
|
||||
dh_strip -plibrdtk2 --dbg-package=librdtk2-dbg
|
||||
dh_strip -plibwinpr2 --dbg-package=libwinpr2-dbg
|
||||
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
|
||||
@ -83,7 +83,7 @@ $(PKG)_$(VER)$(DTYPE).orig.tar.xz: $(info I: GIT Revision=$(UREV))
|
||||
cd $(PKG)-$(VER) \
|
||||
&& git checkout "$(UREV)" \
|
||||
&& ( echo "# Generating ChangeLog..." \
|
||||
; git --no-pager log --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog \
|
||||
; git --no-pager log --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%n" > ChangeLog \
|
||||
; touch -d "$$(git log -1 --format='%ci')" ChangeLog) \
|
||||
&& echo "# Setting times..." \
|
||||
&& for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user