xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/rules | 16 ++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 09ea42d31a94cf9773153e6218939dbfc42e2586
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:48:40 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 0bdbb13..4d0ea0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.9.1-3) 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:47:17 +0000
+
xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/rules b/debian/rules
index 414e4bb..f1c550f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,19 +36,19 @@ configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
+build/config.status: configure
dh_testdir
- test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ test -d build || mkdir build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
.PHONY: build
build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean: xsfclean
@@ -60,7 +60,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 $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
@@ -74,9 +74,9 @@ 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 $(CURDIR)/debian/tmp/usr/bin
- install -m 755 obj-$(DEB_BUILD_GNU_TYPE)/src/reg_dumper/intel_reg_dumper $(CURDIR)/debian/tmp/usr/bin/
+ install -m 755 build/src/reg_dumper/intel_reg_dumper $(CURDIR)/debian/tmp/usr/bin/
# Build architecture-dependent files here.
binary-arch: DH_OPTIONS=-s
Reply to: