Bug#793430: jessie-pu: package kic/2.4a-2~deb8u1

[Andreas Beckmann <anbe@debian.org>]

Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

kic [non-free] FTBFS in jessie and sid due to

  gcc ... -L -lX11 ...

which worked in wheezy but gobbles the -lX11 from jessie onwards leading
to undefined references due to missing -lX11.


Andreas

diff -u kic-2.4a/configure.in kic-2.4a/configure.in
--- kic-2.4a/configure.in
+++ kic-2.4a/configure.in
@@ -93,7 +93,10 @@
     LIBS="-lgdi32 -lwinspool -lcomdlg32 -lole32 -loleaut32 -luuid \
  -lodbc32 -lversion -lcomctl32 -lwsock32 -lws2_32 $LIBS"
 else
-    LIBS="-L$ac_x_libraries -lX11 -lXmu -lXext $LIBS"
+    LIBS="-lX11 -lXmu -lXext $LIBS"
+    if test -n "$ac_x_libraries"; then
+        LIBS="-L$ac_x_libraries $LIBS"
+    fi
 fi
 
 CFLAGS="$CFLAGS -DUSE_OLD_MALLOC"
diff -u kic-2.4a/configure kic-2.4a/configure
--- kic-2.4a/configure
+++ kic-2.4a/configure
@@ -2161,7 +2161,10 @@
     LIBS="-lgdi32 -lwinspool -lcomdlg32 -lole32 -loleaut32 -luuid \
  -lodbc32 -lversion -lcomctl32 -lwsock32 -lws2_32 $LIBS"
 else
-    LIBS="-L$ac_x_libraries -lX11 -lXmu -lXext $LIBS"
+    LIBS="-lX11 -lXmu -lXext $LIBS"
+    if test -n "$ac_x_libraries"; then
+        LIBS="-L$ac_x_libraries $LIBS"
+    fi
 fi
 
 CFLAGS="$CFLAGS -DUSE_OLD_MALLOC"
diff -u kic-2.4a/debian/changelog kic-2.4a/debian/changelog
--- kic-2.4a/debian/changelog
+++ kic-2.4a/debian/changelog
@@ -1,3 +1,18 @@
+kic (2.4a-2~deb8u1) jessie; urgency=medium
+
+  * QA upload.
+  * Rebuild for jessie.
+
+ -- Andreas Beckmann <anbe@debian.org>  Fri, 24 Jul 2015 01:35:20 +0200
+
+kic (2.4a-2) unstable; urgency=medium
+
+  * QA upload.
+  * Set Maintainer to Debian QA Group.  (See: #691834)
+  * configure: Do not add -L without argument to $LIBS.  (Closes: #793367)
+
+ -- Andreas Beckmann <anbe@debian.org>  Thu, 23 Jul 2015 21:22:02 +0200
+
 kic (2.4a-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u kic-2.4a/debian/control kic-2.4a/debian/control
--- kic-2.4a/debian/control
+++ kic-2.4a/debian/control
@@ -1,7 +1,7 @@
 Source: kic
 Section: non-free/x11
 Priority: optional
-Maintainer: Gürkan Sengün <gurkan@phys.ethz.ch>
+Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 5), autotools-dev, libxmu-dev, libxmuu-dev, libxext-dev, libxdmcp-dev
 Standards-Version: 3.7.2