debian/changelog | 1 +
debian/rules | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 3ac55f796d6aa34f494abd0b41db0c05094b5210
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Feb 10 03:44:51 2010 +0000
Fix clean target.
diff --git a/debian/rules b/debian/rules
index 9312eda..0efc4f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,7 @@ clean: xsfclean
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf build build-udeb
+ rm -rf debian/tmp-udeb
rm -f $$(find -name Makefile.in)
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
commit b87bf1556707eba69a6c991cbf3dd293c0314920
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Feb 7 18:48:15 2010 +0000
Use a bzip2-less flavour for the udeb.
diff --git a/debian/changelog b/debian/changelog
index 68e9c7c..7dbed35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libxfont (1:1.4.1-2) UNRELEASED; urgency=low
* Add udeb needed for the graphical installer: libxfont1-udeb.
* Version the B-D on libfontenc-dev to ensure libxfont1-udeb gets a
dependency on libfontenc1-udeb.
+ * Use a bzip2-less flavour for the udeb.
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:42 +0000
diff --git a/debian/rules b/debian/rules
index d581c11..9312eda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,6 @@ doc_files = \
build/doc/fontlib.html
confflags += \
- --with-bzip2 \
--enable-fc \
--enable-builtins \
--enable-pcfformat \
@@ -52,13 +51,23 @@ build/config.status: configure
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --with-bzip2 \
+ CFLAGS="$(CFLAGS)" LDFLAGS=""
+
+build-udeb/config.status: configure
+ mkdir -p build-udeb
+ cd build-udeb && \
+ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ --without-bzip2 \
CFLAGS="$(CFLAGS)" LDFLAGS=""
build: build-stamp
-build-stamp: build/config.status
+build-stamp: build/config.status build-udeb/config.status
dh_testdir
cd build && $(MAKE)
+ cd build-udeb && $(MAKE)
>$@
clean: xsfclean
@@ -70,7 +79,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf build
+ rm -rf build build-udeb
rm -f $$(find -name Makefile.in)
rm -f aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
@@ -84,6 +93,7 @@ install: build
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ cd build-udeb && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp-udeb install
# Build architecture-dependent files here.
binary-arch: build install
@@ -92,6 +102,7 @@ binary-arch: build install
dh_installdocs
dh_install --sourcedir=debian/tmp --list-missing -XlibXfont.la
+ dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb
install -d debian/libxfont-dev/usr/share/doc/libxfont-dev
install -m 644 $(doc_files)
debian/libxfont-dev/usr/share/doc/libxfont-dev
dh_installchangelogs ChangeLog
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
