x11proto-dri2: Changes to 'debian-unstable'
debian/changelog | 5 +++++
debian/rules | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 98d7fd20e874d15ca28e76f4e00bd62b9eb5e570
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:48:59 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 cdcdabe..76d2ac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
x11proto-dri2 (2.2-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release. (LP: #377090)
+ [ Julien Cristau ]
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 09 Jan 2010 02:26:40 +0200
x11proto-dri2 (2.1-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 213aa05..768fcd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,8 @@ configure: configure-stamp
configure-stamp: autogen-stamp
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 --disable-shared \
$(confflags) CFLAGS="$(CFLAGS)"
@@ -33,7 +33,7 @@ build: build-stamp
build-stamp: configure-stamp
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
touch build-stamp
@@ -46,7 +46,7 @@ clean:
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 install-sh missing
rm -f config.guess config.sub
rm -f Makefile.in
@@ -59,7 +59,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
# Build architecture-independent files here.
binary-indep: build install
Reply to: