[X2Go-Commits] [x2gokdrive] 04/05: debian/control: make libxfont1-dev an entirely optional dependency and libxfont-dev a hard one.

[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 a00a136187b0793b19efc4e91709d7343150ac95
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jan 20 14:27:40 2020 +0100

    debian/control: make libxfont1-dev an entirely optional dependency and libxfont-dev a hard one.
    
    This should always install libxfont-dev (which typically is the
    libXfont2-version), but also the libXfont1-version if available.
    
    Ubuntu 16.04/xenial has X.Org Server 1.18.4 which is not compatible with
    libXfont2, but Debian 9/stretch uses X.Org Server 1.19.2, which is
    compatible with libXfont2 (and actually requires it), but also has both
    packages available.
---
 debian/changelog | 7 +++++++
 debian/control   | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8ab176a..f02df79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,13 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     + 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.
+    + Make libxfont1-dev an entirely optional dependency and libxfont-dev a
+      hard one. This should always install libxfont-dev (which typically is
+      the libXfont2-version), but also the libXfont1-version if available.
+      Ubuntu 16.04/xenial has X.Org Server 1.18.4 which is not compatible with
+      libXfont2, but Debian 9/stretch uses X.Org Server 1.19.2, which is
+      compatible with libXfont2 (and actually requires it), but also has both
+      packages available.
   * x2gokdrive.spec:
     + Drop Debian-style formatting in description.
     + Typo fixes.
diff --git a/debian/control b/debian/control
index 1c3abaa..9884bfb 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,8 @@ Build-Depends:
  xtrans-dev (>= 1.3.2),
  libxau-dev (>= 1:1.0.5-2),
  libxdmcp-dev (>= 1:0.99.1),
- libxfont1-dev (>= 1.4.2) | libxfont-dev (>= 1.4.2),
+ libxfont1-dev (>= 1.4.2) | hello,
+ 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