xfonts-scalable: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/rules | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 58552b1814a3f663cff0eed4182c15b43059f4ac
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:49:09 2010 +0000
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index 57072cf..60be6a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-scalable (1:1.0.1-2) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:48:00 +0000
+
xfonts-scalable (1:1.0.1-1) unstable; urgency=low
* Move package to the 'fonts' section.
diff --git a/debian/rules b/debian/rules
index 20a007a..478acb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,12 @@ build: build-stamp
build-stamp: $(STAMP_DIR)/prepare
dh_testdir
autoreconf -vfi
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)" FCCACHE=/bin/true
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean: xsfclean
@@ -54,7 +54,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
rm -f aclocal.m4 configure config.guess config.sub
rm -f install-sh missing mkinstalldirs
find -name Makefile.in -delete
@@ -67,7 +67,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
install -D -m644 debian/fonts.scale \
debian/tmp/etc/X11/fonts/Type1/xfonts-scalable.scale
Reply to: