Package: clips
Version: 6.21-6
Severity: normal
Tags: patch
Thanks for letting me issue an NMU for #365284. When you have the
time, please incorporate the corresponding patch (which differs from
the one on that bug only in the addition of a changelog entry).
Thanks!
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16.9
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Versions of packages clips depends on:
ii clips-common 6.21-6.1 CLIPS common files and examples
ii libc6 2.3.6-7 GNU C Library: Shared libraries
ii libclips 6.21-6.1 CLIPS shared libraries
ii libncurses5 5.5-2 Shared libraries for terminal hand
clips recommends no packages.
-- no debconf information
diff -u clips-6.21/clipssrc/configure.in clips-6.21/clipssrc/configure.in
--- clips-6.21/clipssrc/configure.in
+++ clips-6.21/clipssrc/configure.in
@@ -77,20 +77,20 @@
AC_CHECK_LIB(socket,socket)
AC_PATH_X
AC_SUBST(x_libraries)
- LDFLAGS="$LDFLAGS -L$x_libraries"
+ LDFLAGS="$LDFLAGS ${x_libraries:+-L$x_libraries}"
dnl WARNING: library search ORDER is very important !!!!
- AC_CHECK_LIB(X11,main,,,-L${x_libraries})
- AC_CHECK_LIB(Xext,main,,,-L${x_libraries})
- AC_CHECK_LIB(ICE,main,,,-L${x_libraries})
- AC_CHECK_LIB(SM,main,,,-L${x_libraries})
- AC_CHECK_LIB(Xt,main,,,-L${x_libraries})
- AC_CHECK_LIB(Xmu,main,,,-L${x_libraries})
+ AC_CHECK_LIB(X11,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(Xext,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(ICE,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(SM,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(Xt,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(Xmu,main,,,${x_libraries:+-L$x_libraries})
AC_CHECK_LIB(Xaw3d, main,,
AC_CHECK_LIB(Xaw, main,,,
- -L${x_libraries}),
- -L${x_libraries})
+ ${x_libraries:+-L$x_libraries}),
+ ${x_libraries:+-L$x_libraries})
fi
dnl ----------------------------
diff -u clips-6.21/clipssrc/configure clips-6.21/clipssrc/configure
--- clips-6.21/clipssrc/configure
+++ clips-6.21/clipssrc/configure
@@ -1533,7 +1533,7 @@
fi
- LDFLAGS="$LDFLAGS -L$x_libraries"
+ LDFLAGS="$LDFLAGS ${x_libraries:+-L$x_libraries}"
echo $ac_n "checking for main in -lX11""... $ac_c" 1>&6
@@ -1543,7 +1543,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lX11 -L${x_libraries} $LIBS"
+LIBS="-lX11 ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1549 "configure"
#include "confdefs.h"
@@ -1586,7 +1586,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXext -L${x_libraries} $LIBS"
+LIBS="-lXext ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1592 "configure"
#include "confdefs.h"
@@ -1629,7 +1629,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lICE -L${x_libraries} $LIBS"
+LIBS="-lICE ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1635 "configure"
#include "confdefs.h"
@@ -1672,7 +1672,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lSM -L${x_libraries} $LIBS"
+LIBS="-lSM ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1678 "configure"
#include "confdefs.h"
@@ -1715,7 +1715,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXt -L${x_libraries} $LIBS"
+LIBS="-lXt ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1721 "configure"
#include "confdefs.h"
@@ -1758,7 +1758,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXmu -L${x_libraries} $LIBS"
+LIBS="-lXmu ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1764 "configure"
#include "confdefs.h"
@@ -1801,7 +1801,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXaw3d -L${x_libraries} $LIBS"
+LIBS="-lXaw3d ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1807 "configure"
#include "confdefs.h"
@@ -1842,7 +1842,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXaw -L${x_libraries} $LIBS"
+LIBS="-lXaw ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1848 "configure"
#include "confdefs.h"
diff -u clips-6.21/x-prjct/xinterface/configure.in clips-6.21/x-prjct/xinterface/configure.in
--- clips-6.21/x-prjct/xinterface/configure.in
+++ clips-6.21/x-prjct/xinterface/configure.in
@@ -71,20 +71,20 @@
AC_CHECK_LIB(socket,socket)
AC_PATH_X
AC_SUBST(x_libraries)
- LDFLAGS="$LDFLAGS -L$x_libraries"
+ LDFLAGS="$LDFLAGS ${x_libraries:+-L$x_libraries}"
dnl WARNING: library search ORDER is very important !!!!
- AC_CHECK_LIB(X11,main,,,-L${x_libraries})
- AC_CHECK_LIB(Xext,main,,,-L${x_libraries})
- AC_CHECK_LIB(ICE,main,,,-L${x_libraries})
- AC_CHECK_LIB(SM,main,,,-L${x_libraries})
- AC_CHECK_LIB(Xt,main,,,-L${x_libraries})
- AC_CHECK_LIB(Xmu,main,,,-L${x_libraries})
+ AC_CHECK_LIB(X11,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(Xext,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(ICE,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(SM,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(Xt,main,,,${x_libraries:+-L$x_libraries})
+ AC_CHECK_LIB(Xmu,main,,,${x_libraries:+-L$x_libraries})
AC_CHECK_LIB(Xaw3d, main,,
AC_CHECK_LIB(Xaw, main,,,
- -L${x_libraries}),
- -L${x_libraries})
+ ${x_libraries:+-L$x_libraries}),
+ ${x_libraries:+-L$x_libraries})
fi
dnl ----------------------------
diff -u clips-6.21/x-prjct/xinterface/configure clips-6.21/x-prjct/xinterface/configure
--- clips-6.21/x-prjct/xinterface/configure
+++ clips-6.21/x-prjct/xinterface/configure
@@ -1496,7 +1496,7 @@
fi
- LDFLAGS="$LDFLAGS -L$x_libraries"
+ LDFLAGS="$LDFLAGS ${x_libraries:+-L$x_libraries}"
echo $ac_n "checking for main in -lX11""... $ac_c" 1>&6
@@ -1506,7 +1506,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lX11 -L${x_libraries} $LIBS"
+LIBS="-lX11 ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1512 "configure"
#include "confdefs.h"
@@ -1549,7 +1549,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXext -L${x_libraries} $LIBS"
+LIBS="-lXext ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1555 "configure"
#include "confdefs.h"
@@ -1592,7 +1592,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lICE -L${x_libraries} $LIBS"
+LIBS="-lICE ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1598 "configure"
#include "confdefs.h"
@@ -1635,7 +1635,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lSM -L${x_libraries} $LIBS"
+LIBS="-lSM ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1641 "configure"
#include "confdefs.h"
@@ -1678,7 +1678,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXt -L${x_libraries} $LIBS"
+LIBS="-lXt ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1684 "configure"
#include "confdefs.h"
@@ -1721,7 +1721,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXmu -L${x_libraries} $LIBS"
+LIBS="-lXmu ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1727 "configure"
#include "confdefs.h"
@@ -1764,7 +1764,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXaw3d -L${x_libraries} $LIBS"
+LIBS="-lXaw3d ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1770 "configure"
#include "confdefs.h"
@@ -1805,7 +1805,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXaw -L${x_libraries} $LIBS"
+LIBS="-lXaw ${x_libraries:+-L$x_libraries} $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1811 "configure"
#include "confdefs.h"
diff -u clips-6.21/debian/rules clips-6.21/debian/rules
--- clips-6.21/debian/rules
+++ clips-6.21/debian/rules
@@ -36,8 +36,7 @@
dh_testdir
cd x-prjct/xinterface && sh ./configure \
--prefix=$(CURDIR)/debian/clips/usr/ \
- --enable-xclips --bindir=\$${exec_prefix}/X11R6/bin \
- --with-clipssrc=../../clipssrc/
+ --enable-xclips --with-clipssrc=../../clipssrc/
cd clipssrc && sh ./configure --prefix=$(CURDIR)/debian/xclips/usr
touch configure-x
diff -u clips-6.21/debian/changelog clips-6.21/debian/changelog
--- clips-6.21/debian/changelog
+++ clips-6.21/debian/changelog
@@ -1,3 +1,11 @@
+clips (6.21-6.1) unstable; urgency=low
+
+ * NMU with maintainer's permission.
+ * Update for X11R7 transition, facing the possibility that configure's
+ x_includes and x_libraries variables may now be empty. (Closes: #365284)
+
+ -- Aaron M. Ucko <[EMAIL PROTECTED]> Sat, 13 May 2006 10:20:28 -0400
+
clips (6.21-6) unstable; urgency=low
* Removed xlibs-dev from Build-Depends and add new build-depends (Closes: #346638)
@@ -215,3 +223 @@
-Local variables:
-mode: debian-changelog
-End:
+
diff -u clips-6.21/debian/xclips.dirs clips-6.21/debian/xclips.dirs
--- clips-6.21/debian/xclips.dirs
+++ clips-6.21/debian/xclips.dirs
@@ -1,4 +1,4 @@
-usr/X11R6/bin/
+usr/bin
usr/share/doc/xclips
usr/share/clips
etc/X11/app-defaults
