aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-22 08:38:21 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-22 08:38:21 +0200
commitb964406ba6e7e2d65b88010856ce881ee928898a (patch)
tree2c37d81d17f33bf288c3a44adc11bc328ee8e697 /debian
parenta77ca871c6c1b0d6d866f95e4eb6e013f92e9627 (diff)
parent70b77a0fc329e2e205a596a738c7307d354e7b1c (diff)
downloadnx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.tar.gz
nx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.tar.bz2
nx-libs-b964406ba6e7e2d65b88010856ce881ee928898a.zip
Merge branch 'sunweaver-pr/libxfont-cleanup' into arctica-3.6.x
Attributes GH PR #14: https://github.com/ArcticaProject/nx-libs/pull/14
Diffstat (limited to 'debian')
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules1
2 files changed, 1 insertions, 4 deletions
diff --git a/debian/control b/debian/control
index 65a8f9433..9572f7ce7 100644
--- a/debian/control
+++ b/debian/control
@@ -12,12 +12,10 @@ Build-Depends:
libjpeg-dev,
zlib1g-dev,
quilt (>= 0.46-7~),
- libfontconfig1-dev,
- libfontenc-dev,
- libfreetype6-dev,
libxmltok1-dev,
libxml2-dev,
libxpm-dev,
+ libxfont-dev,
autoconf,
pkg-config,
x11proto-core-dev,
diff --git a/debian/rules b/debian/rules
index e58b79121..6d076a1c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,6 @@ override_dh_install:
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfont.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XI.h
- rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/fonts/
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/Xtrans/
dh_install --fail-missing