x11proto-input: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/rules | 14 +++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 05c0f95421881039c0bdbb2f0662bd312375a41f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 16 16:49:02 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 4d105d9..13c49d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-input (2.0-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:50 +0000
+
x11proto-input (2.0-2) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/rules b/debian/rules
index da611f5..fdf1ae1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,18 +35,18 @@ configure:
dh_testdir
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
+build/config.status: configure
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 \
$(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
@@ -58,7 +58,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 config.guess config.sub
rm -f $$(find -name Makefile.in)
rm -f configure install-sh missing aclocal.m4 mkinstalldirs
@@ -71,7 +71,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: