[Pkg-wmaker-commits] [wmrack] 42/97: Imported Debian patch 1.3-2

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmrack.

commit 538854c6ac2954b622e73d2965dcbe143a345800
Author: Chris Waters <xtifr at debian.org>
Date:   Sat Apr 29 12:11:46 2006 -0700

    Imported Debian patch 1.3-2
---
 configure        |  4 ++--
 configure.in     |  4 ++--
 debian/changelog | 13 +++++++++++++
 debian/control   |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 0e350ae..608499c 100755
--- a/configure
+++ b/configure
@@ -1329,8 +1329,8 @@ fi
 if test "x$no_x" = "xyes"; then
   { echo "configure: error: WMRack needs X Windows!!!" 1>&2; exit 1; }
 else
-  CFLAGS="$CFLAGS -I${x_includes}"
-  LIBS="$LIBS -L${x_libraries} -lX11"
+  CFLAGS="$CFLAGS ${x_includes:+-I$x_includes}"
+  LIBS="$LIBS ${x_libraries:+-L$x_libraries} -lX11"
 fi
 
 echo $ac_n "checking for XpmCreatePixmapFromBuffer in -lXpm""... $ac_c" 1>&6
diff --git a/configure.in b/configure.in
index c1e0c29..d15487a 100644
--- a/configure.in
+++ b/configure.in
@@ -54,8 +54,8 @@ AC_PATH_X
 if test "x$no_x" = "xyes"; then
   AC_MSG_ERROR([WMRack needs X Windows!!!])
 else
-  CFLAGS="$CFLAGS -I${x_includes}"
-  LIBS="$LIBS -L${x_libraries} -lX11"
+  CFLAGS="$CFLAGS ${x_includes:+-I$x_includes}"
+  LIBS="$LIBS ${x_libraries:+-L$x_libraries} -lX11"
 fi
 
 dnl check for Xpm
diff --git a/debian/changelog b/debian/changelog
index a686e0a..65b79f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+wmrack (1.3-2) unstable; urgency=low
+
+  * changed build-dependency on xutils to libxt-dev because the configure
+    script looks for a header in libxt-dev if it can't find xmkmf, and
+    xmkmf has been moved to xutils-dev.  I could have changed to
+    build-depend on xutils-dev, of course, but this way allows backports
+    to sarge.  Thanks to Andreas Metzler for the suggestion. (Closes: #365126).
+  * At the advice of Aaron Ucko, I have patched configure (and
+    configure.in) to handle the case where X does not need additional
+    include or library paths.
+
+ -- Chris Waters <xtifr at debian.org>  Sat, 29 Apr 2006 12:11:46 -0700
+
 wmrack (1.3-1) unstable; urgency=low
 
   * New upstream release, includes fix for FTBFS on BSD/Hurd
diff --git a/debian/control b/debian/control
index b54dfdd..82c96ef 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Chris Waters <xtifr at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: libx11-dev, libxext-dev, libxpm-dev, xutils, debhelper (>= 4.0.0)
+Build-Depends: libx11-dev, libxext-dev, libxpm-dev, libxt-dev, debhelper (>= 4.0.0)
 
 Package: wmrack
 Architecture: any

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmrack.git