xdm: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/rules | 7 +++----
2 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit cea3420cfe2e5d83027bd29230d6fc9181ff0b0f
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 22 15:31:12 2008 +0200
fix unreported ftbfs
debian/rules: make sure the install stamp is created, and
don't try to create the build dir if it already exists.
diff --git a/debian/changelog b/debian/changelog
index 846a8b6..00d164a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xdm (1:1.1.8-3) unstable; urgency=medium
+
+ * debian/rules: make sure the install stamp is created, and don't try to
+ create the build dir if it already exists. Fixes unreported FTBFS.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 22 Jul 2008 15:30:36 +0200
+
xdm (1:1.1.8-2) unstable; urgency=low
* Disable xdm-auth to work around an Xlib bug (closes: #486606). Add a NEWS
diff --git a/debian/rules b/debian/rules
index 36b28bc..0981e93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,16 +53,14 @@ stampdir_targets+=build
build: $(STAMP_DIR)/build
$(STAMP_DIR)/build: $(STAMP_DIR)/prepare $(STAMP_DIR)/patch
dh_testdir
- mkdir $(BUILD_DIR)
+ [ -d $(BUILD_DIR) ] || mkdir $(BUILD_DIR)
cd $(BUILD_DIR) && \
../configure --prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
$(confflags) \
CFLAGS="$(CFLAGS)" APP_MAN_SUFFIX=1
-
cd $(BUILD_DIR) && $(MAKE)
-
>$@
stampdir_targets+=install
@@ -91,6 +89,7 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build $(STAMP_DIR)/genscripts
$(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
install -m 644 debian/local/debianbw.xpm \
$(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
+ >$@
clean: xsfclean
dh_testdir
@@ -126,4 +125,4 @@ binary-indep: $(STAMP_DIR)/install
binary: binary-indep binary-arch
-,PHONY: build install clean binary binary-indep binary-arch
+.PHONY: build install clean binary binary-indep binary-arch
Reply to: