+ckermit (302-1) unstable; urgency=low
+
+ * New upstream version.
+ * Update 01_search-usr-lib-for-libk5crypto.patch to
+ properly find multiarch library paths (Closes: #639747).
+ Patch from Ubuntu, thanks to Daniel T Chen.
+
+ -- Ian Beckwith <ianb@debian.org> Sun, 29 Jan 2012 00:47:58 +0000
+
ckermit (301-2) unstable; urgency=low
* Fix FTBFS:
--- /dev/null
+Index: ckermit/makefile
+===================================================================
+--- ckermit.orig/makefile 2012-01-29 00:15:30.000000000 +0000
++++ ckermit/makefile 2012-01-29 00:32:46.000000000 +0000
+@@ -6100,10 +6100,14 @@
+ test -f /usr/lib/libncurses.a || \
+ test -f /usr/lib/libncurses.so; then \
+ HAVE_LIBCURSES='-lncurses'; \
++ else if test -f /usr/lib/$(MULTIARCH)/libncurses.so || \
++ test -f /usr/lib/$(MULTIARCH)/libncurses.a || \
++ test -f /usr/lib/$(MULTIARCH)/libncurses.so; then \
++ HAVE_LIBCURSES='-lncurses'; \
+ else if test -f /usr/lib64/libcurses.so || \
+ test -f /usr/lib/libcurses.a || \
+ test -f /usr/lib/libcurses.so; then \
+- HAVE_LIBCURSES='-lcurses'; fi; fi; \
++ HAVE_LIBCURSES='-lcurses'; fi; fi; fi; \
+ HAVE_CURSES=''; \
+ if test -n '$$HAVE_LIBCURSES'; then \
+ if test -f /usr/include/ncurses.h; then \
+@@ -6130,16 +6134,19 @@
+ || test -f /usr/lib/libresolv.a || test -f /usr/lib/libresolv.so \
+ || test -f /usr/lib/i386-linux-gnu/libresolv.a \
+ || test -f /usr/lib/i386-linux-gnu/libresolv.so \
++ || ls /lib/$(MULTIARCH)/libresolv.* > /dev/null 2> /dev/null \
+ || ls /lib/x86_64-linux-gnu/libresolv.* > /dev/null 2> /dev/null; \
+ then echo -lresolv; fi` \
+ `if test -f /usr/lib64/libcrypt.a || test -f /usr/lib64/libcrypt.so \
+ || test -f /usr/lib/libcrypt.a || test -f /usr/lib/libcrypt.so \
++ || ls /lib/$(MULTIARCH)/libcrypt.* > /dev/null 2> /dev/null \
+ || ls /lib/x86_64-linux-gnu/libcrypt.* > /dev/null 2> /dev/null; \
+ then echo -lcrypt; fi` \
+ `if test -f /usr/lib64/liblockdev.a || \
+ test -f /usr/lib64/liblockdev.so || \
+ test -f /usr/lib/liblockdev.a || \
+- test -f /usr/lib/liblockdev.so; \
++ test -f /usr/lib/liblockdev.so \
++ ls /usr/lib/$(MULTIARCH)/liblockdev.* > /dev/null 2> /dev/null; \
+ then echo -llockdev; fi`" \
+ linuxa
+
+@@ -6309,7 +6316,9 @@
+ K5CRYPTO='-lk5crypto'; \
+ else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
+ K5CRYPTO='-lk5crypto'; \
+- fi; fi; fi; \
++ else if ls /usr/lib/$(MULTIARCH)/libk5crypto* > /dev/null 2> /dev/null; then \
++ K5CRYPTO='-lk5crypto'; \
++ fi; fi; fi; fi; \
+ COM_ERR=''; \
+ if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
+ COM_ERR='-lcom_err'; \
+@@ -6317,7 +6326,7 @@
+ GSSAPILIB='-lgssapi'; \
+ if ls /lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
+ GSSAPILIB='-lgssapi_krb5'; \
+- else if ls /usr/lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
++ else if ls /usr/lib/$(MULTIARCH)/libgssapi_krb5* > /dev/null 2> /dev/null; then \
+ GSSAPILIB='-lgssapi_krb5'; \
+ else K5DIR=`echo $(K5LIB) | sed 's|-L||'`; \
+ if ls $$K5DIR/libgssapi_krb5* > /dev/null 2> /dev/null; then \
+++ /dev/null
-Index: ckermit/makefile
-===================================================================
---- ckermit.orig/makefile 2011-07-20 01:39:33.000000000 +0100
-+++ ckermit/makefile 2011-07-20 01:39:39.000000000 +0100
-@@ -6277,7 +6277,9 @@
- K5CRYPTO='-lk5crypto'; \
- else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
- K5CRYPTO='-lk5crypto'; \
-- fi; fi; \
-+ else if ls /usr/lib/libk5crypto* > /dev/null 2> /dev/null; then \
-+ K5CRYPTO='-lk5crypto'; \
-+ fi; fi; fi; \
- COM_ERR=''; \
- if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
- COM_ERR='-lcom_err'; \
-01_search-usr-lib-for-libk5crypto.patch
+010_multiarch-makefile.patch
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
BUILDDIR=`pwd`/debian/ckermit
CFLAGS =-g \
CFLAGS += -DSELECT
endif
-MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' LNKFLAGS="-Wl,-z,defs -Wl,--as-needed"
+MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' MULTIARCH=\"$(DEB_HOST_MULTIARCH)\" LNKFLAGS="-Wl,-z,defs -Wl,--as-needed"
MAKETARGET=linux+krb5+openssl
%:
rm "$(BUILDDIR)/usr/share/doc/ckermit/COPYING.TXT"
override_dh_installchangelogs:
- dh_installchangelogs -k ckc301.txt
+ dh_installchangelogs -k ckc302.txt
override_dh_installpam:
dh_installpam --name=kermit
test -f /usr/lib/libncurses.a || \
test -f /usr/lib/libncurses.so; then \
HAVE_LIBCURSES='-lncurses'; \
+ else if test -f /usr/lib/$(MULTIARCH)/libncurses.so || \
+ test -f /usr/lib/$(MULTIARCH)/libncurses.a || \
+ test -f /usr/lib/$(MULTIARCH)/libncurses.so; then \
+ HAVE_LIBCURSES='-lncurses'; \
else if test -f /usr/lib64/libcurses.so || \
test -f /usr/lib/libcurses.a || \
test -f /usr/lib/libcurses.so; then \
- HAVE_LIBCURSES='-lcurses'; fi; fi; \
+ HAVE_LIBCURSES='-lcurses'; fi; fi; fi; \
HAVE_CURSES=''; \
if test -n '$$HAVE_LIBCURSES'; then \
if test -f /usr/include/ncurses.h; then \
|| test -f /usr/lib/libresolv.a || test -f /usr/lib/libresolv.so \
|| test -f /usr/lib/i386-linux-gnu/libresolv.a \
|| test -f /usr/lib/i386-linux-gnu/libresolv.so \
+ || ls /lib/$(MULTIARCH)/libresolv.* > /dev/null 2> /dev/null \
|| ls /lib/x86_64-linux-gnu/libresolv.* > /dev/null 2> /dev/null; \
then echo -lresolv; fi` \
`if test -f /usr/lib64/libcrypt.a || test -f /usr/lib64/libcrypt.so \
|| test -f /usr/lib/libcrypt.a || test -f /usr/lib/libcrypt.so \
+ || ls /lib/$(MULTIARCH)/libcrypt.* > /dev/null 2> /dev/null \
|| ls /lib/x86_64-linux-gnu/libcrypt.* > /dev/null 2> /dev/null; \
then echo -lcrypt; fi` \
`if test -f /usr/lib64/liblockdev.a || \
test -f /usr/lib64/liblockdev.so || \
test -f /usr/lib/liblockdev.a || \
- test -f /usr/lib/liblockdev.so; \
+ test -f /usr/lib/liblockdev.so \
+ ls /usr/lib/$(MULTIARCH)/liblockdev.* > /dev/null 2> /dev/null; \
then echo -llockdev; fi`" \
linuxa
K5CRYPTO='-lk5crypto'; \
else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
K5CRYPTO='-lk5crypto'; \
- fi; fi; fi; \
+ else if ls /usr/lib/$(MULTIARCH)/libk5crypto* > /dev/null 2> /dev/null; then \
+ K5CRYPTO='-lk5crypto'; \
+ fi; fi; fi; fi; \
COM_ERR=''; \
if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
COM_ERR='-lcom_err'; \
GSSAPILIB='-lgssapi'; \
if ls /lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
GSSAPILIB='-lgssapi_krb5'; \
- else if ls /usr/lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
+ else if ls /usr/lib/$(MULTIARCH)/libgssapi_krb5* > /dev/null 2> /dev/null; then \
GSSAPILIB='-lgssapi_krb5'; \
else K5DIR=`echo $(K5LIB) | sed 's|-L||'`; \
if ls $$K5DIR/libgssapi_krb5* > /dev/null 2> /dev/null; then \