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

libxrandr: Changes to 'debian-unstable'



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

New commits:
commit 2ab55591b8e7e9c8bbf25b69f65878059160cccc
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 16 16:48:53 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 294a007..c483f38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 libxrandr (2:1.3.0-3) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * Drop pre-dependency on x11-common from libxrandr-dev. This was needed
     for upgrades from sarge.
   * Move -dbg package to section debug.
   * Bump Standards-Version to 3.8.3.
 
+  [ 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>  Tue, 24 Nov 2009 13:34:24 +0200
 
 libxrandr (2:1.3.0-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 97375e5..f7680d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,19 +35,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)"
 
 
 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
@@ -59,7 +59,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
@@ -72,7 +72,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


Reply to: