libxtrap: Changes to 'debian-unstable'
debian/changelog | 5 +++++
debian/rules | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 9d5be62d6a6a5290887cddf1000f4cb43e18d9ce
Author: Julien Cristau <julien@radis.liafa.jussieu.fr>
Date: Sat Jan 16 16:48:55 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 da6e859..2b6ca81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
libxtrap (2:1.0.0-6) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add a link to www.X.org and a reference to the upstream module
in the long description.
* Add upstream URL to debian/copyright.
* Install the upstream ChangeLog.
+ [ Julien Cristau ]
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
-- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 11:57:50 +0200
libxtrap (2:1.0.0-5) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 8cb579c..1b6cacf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,12 @@ build: build-stamp
build-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 $(confflags) \
CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
touch build-stamp
@@ -54,7 +54,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
dh_clean
@@ -64,7 +64,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: