[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-rendition: Changes to 'debian-unstable'



 debian/changelog |    5 +++++
 debian/rules     |   10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 9a1963c8d3f18a029ac692468b66e47b92ba4c1b
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 16 16:48:47 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 47b45cb..016cc0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 xserver-xorg-video-rendition (1:4.2.3-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
   * Remove 03_gen_pci_ids.diff. The X server now uses an internal table to
     choose a driver during autoconfiguration.
 
+  [ 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, 05 Dec 2009 01:49:10 +0200
 
 xserver-xorg-video-rendition (1:4.2.1-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 7d866b2..46ad7a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,12 @@ build-stamp: $(STAMP_DIR)/patch
 	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)" 
-	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 config.guess config.sub config.h.in configure
 	rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
 	rm -f $$(find -name Makefile.in)
@@ -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
 
 # Build architecture-dependent files here.
 binary-arch: build install serverabi


Reply to: