summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-02-10 17:16:54 -0800
committerKeith Packard <keithp@keithp.com>2014-02-12 08:05:27 -0800
commit61e55df189edba05daf2cf444118a9e252d74972 (patch)
treeee7df506a70836e5ae4b871260c3fcf4e42990fb
parent11c5f2cbffb85740b4b827ae36e8d5a9ae4adf4d (diff)
Regenerate files as needed for build from upstream git repository
This regenerates the autotools files and documentation so that we can build directly from the upstream repository rather than from an upstream tarball release.
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules3
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index 7bb111f..c9bace4 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,9 @@ Build-Depends: cdbs (>= 0.4.93),
binutils (>= 2.12.90.0.9),
pkg-config,
gperf,
- po-debconf
+ po-debconf,
+ dh-autoreconf,
+ docbook-utils
Standards-Version: 3.9.3
Package: fontconfig
diff --git a/debian/rules b/debian/rules
index a912932..696710f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ binary/fontconfig:: binary/libfontconfig1
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -16,7 +17,7 @@ else
WITHARCH=
endif
-DEB_CONFIGURE_EXTRA_FLAGS := $(WITHARCH) --disable-docs --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts
+DEB_CONFIGURE_EXTRA_FLAGS := $(WITHARCH) --enable-docs --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts
# tight versioning
DEB_DH_MAKESHLIBS_ARGS_libfontconfig1 := -V"libfontconfig1 (>= 2.11)" --add-udeb="fontconfig-udeb"