Merging debian version 3.5.1+dfsg1-3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 44 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index d492056..f368e02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+freerdp3 (3.5.1+dfsg1-3) unstable; urgency=high
+
+  [ Bernhard Miklautz ]
+  * Performance improvements
+    - Set -DNDEBUG (automatically set for Release but not for RelWithDebInfo)
+    - Set -DWITH_VERBOSE_WINPR_ASSERT=OFF
+
+  [ Nathan Pratta Teodosio ]
+  * Add autopkgtest
+
+  [ Jeremy Bícha ]
+  * debian/*.symbols: Add new symbols
+  * Release to unstable
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Wed, 01 May 2024 16:32:21 -0400
+
 freerdp3 (3.5.1+dfsg1-2~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/rules b/debian/rules
index f443767..01d7e5e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 DPKG_EXPORT_BUILDFLAGS = 1
 
-CFLAGS   += $(CPPFLAGS)
-CXXFLAGS += $(CPPFLAGS)
+CFLAGS   += $(CPPFLAGS) -DNDEBUG
+CXXFLAGS += $(CPPFLAGS) -DNDEBUG
 
 empty :=
 
@@ -48,6 +48,7 @@ DEB_CMAKE_EXTRA_FLAGS = \
     -DRDTK_FORCE_STATIC_BUILD=ON \
     -DUWAC_FORCE_STATIC_BUILD=ON \
     -DWITH_BINARY_VERSIONING=ON \
+    -DWITH_VERBOSE_WINPR_ASSERT=OFF \
     $(empty)
 
 ifneq (,$(filter armel,$(DEB_HOST_ARCH)))
diff --git a/debian/tests/connect b/debian/tests/connect
new file mode 100644
index 0000000..2a232b3
--- /dev/null
+++ b/debian/tests/connect
@@ -0,0 +1,22 @@
+#!/bin/sh -x
+isNaturalNumber(){
+    case "$1" in
+        ''|*[!0-9]*) return 0;;
+        *) return 1;;
+    esac
+}
+
+sudo systemctl start xrdp
+# XXX: Is there a better way to get the port number other than by parsing the
+# configuration file?
+port=$(sed -n '/^port=[0123456789]/{s/port=//p;q;}' /etc/xrdp/xrdp.ini)
+if test ! isNaturalNumber "$port"; then
+    exit 1
+fi
+
+timeout 2s xvfb-run -l xfreerdp3 /v:localhost:"$port" /p: /u: /d:
+if test $? != 124; then
+    2>&1 printf "%s\n" "Xfreerdp exited before the timeout, it has likely " \
+                       "failed to connect. The test has therefore failed."
+    exit 2
+fi
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..8062dd0
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: connect
+Depends: @, xauth, xrdp, xvfb
+Restrictions: allow-stderr, needs-sudo