diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-27 13:11:33 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-27 13:11:33 +0100 |
| commit | 5e68c1283c297fb428a9347517ea02576bd55546 (patch) | |
| tree | f7395115b90efd6c0239d6d72c5bca49168f6380 /debian | |
| parent | 0a5d26d121a8420feb25bd68c8f1623edf50e0a8 (diff) | |
| parent | 3e8d98f3337a21cd9147c1ac4f27258c95bf41b0 (diff) | |
| download | nx-libs-5e68c1283c297fb428a9347517ea02576bd55546.tar.gz nx-libs-5e68c1283c297fb428a9347517ea02576bd55546.tar.bz2 nx-libs-5e68c1283c297fb428a9347517ea02576bd55546.zip | |
Merge branch 'sunweaver-pr/support-builtin-fonts' into 3.6.x
Attributes GH PR #316: https://github.com/ArcticaProject/nx-libs/pull/316
Reviewed by Mihai Moldovan <ionic@ionic.de> -- Fri, 17 Feb 2017 22:00:58 -0800
Ulrich Sibiller <uli42@gmx.de> -- Mon, 27 Feb 2017 03:11:55 -0800
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/nx-x11-common.dirs | 2 | ||||
| -rw-r--r-- | debian/nx-x11-common.links | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/debian/control b/debian/control index a98f7f6f0..c00550dc2 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: libxmltok1-dev, libxml2-dev, libxpm-dev, - libxfont1-dev | libxfont-dev, + libxfont1-dev | libxfont-dev (>= 1.4.2), libxdmcp-dev, libxdamage-dev, libxext-dev, diff --git a/debian/nx-x11-common.dirs b/debian/nx-x11-common.dirs new file mode 100644 index 000000000..07c657e09 --- /dev/null +++ b/debian/nx-x11-common.dirs @@ -0,0 +1,2 @@ +# we symlink to this dir, so make sure it exists +usr/share/fonts/X11
\ No newline at end of file diff --git a/debian/nx-x11-common.links b/debian/nx-x11-common.links new file mode 100644 index 000000000..1c181aa84 --- /dev/null +++ b/debian/nx-x11-common.links @@ -0,0 +1 @@ +usr/share/fonts/X11 usr/share/nx/fonts
\ No newline at end of file |