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

x11proto-randr: Changes to 'debian-unstable'



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

New commits:
commit a861965ce501c65da84a330d3706ce5973ccf906
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 16 16:48:58 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 231e817..cc87165 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-randr (1.3.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:47:46 +0000
+
 x11proto-randr (1.3.1-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index c8615a9..45d039e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,8 @@ configure: configure-stamp
 configure-stamp: autogen-stamp
 	dh_testdir
 
-	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 --disable-shared
 	touch configure-stamp
@@ -34,7 +34,7 @@ build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+	cd build && $(MAKE)
 
 	touch build-stamp
 
@@ -47,7 +47,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
@@ -60,7 +60,7 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp PACKAGE=$(PACKAGE) install
+	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp PACKAGE=$(PACKAGE) install
 
 # Build architecture-independent files here.
 binary-indep: build install


Reply to: