[X2Go-Commits] [x2gokdrive] 01/01: debian/control: try to pull libxfont1-dev (for old Ubuntu versions such as 16.04/xenial that don't support building X.Org against libXfont2) and fallback to libxfont-dev to retain the old, default behavior.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit a2279d92bd2b26d52ccbbfc347df47524a1edb4f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jan 20 11:00:47 2020 +0100

    debian/control: try to pull libxfont1-dev (for old Ubuntu versions such as 16.04/xenial that don't support building X.Org against libXfont2) and fallback to libxfont-dev to retain the old, default behavior.
---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1bdcd4c..51468f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,9 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       currently, but that looks like a moving target.
     + Add B-D upon x11proto-gl-dev (or nil/hello).
     + Recommend x2goserver >= 4.1.0.4, we'll better stay on the 4.1.x line.
+    + Try to pull libxfont1-dev (for old Ubuntu versions such as 16.04/xenial
+      that don't support building X.Org against libXfont2) and fallback to
+      libxfont-dev to retain the old, default behavior.
   * x2gokdrive.spec:
     + Drop Debian-style formatting in description.
     + Typo fixes.
diff --git a/debian/control b/debian/control
index e9d9825..1c3abaa 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Build-Depends:
  xtrans-dev (>= 1.3.2),
  libxau-dev (>= 1:1.0.5-2),
  libxdmcp-dev (>= 1:0.99.1),
- libxfont-dev (>= 1.4.2),
+ libxfont1-dev (>= 1.4.2) | libxfont-dev (>= 1.4.2),
  libxkbfile-dev (>= 1:0.99.1),
  libpixman-1-dev (>= 0.27.2),
  libpciaccess-dev (>= 0.12.901),

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git