diff -Nru coolkey-1.1.0/debian/changelog coolkey-1.1.0/debian/changelog --- coolkey-1.1.0/debian/changelog 2011-06-11 22:25:32.000000000 +0900 +++ coolkey-1.1.0/debian/changelog 2011-07-06 10:22:19.000000000 +0900 @@ -1,3 +1,10 @@ +coolkey (1.1.0-8.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix build with multiarch. + + -- Nobuhiro Iwamatsu Wed, 06 Jul 2011 10:22:10 +0900 + coolkey (1.1.0-8.1) unstable; urgency=low * Non-maintainer upload. diff -Nru coolkey-1.1.0/debian/rules coolkey-1.1.0/debian/rules --- coolkey-1.1.0/debian/rules 2011-02-24 05:24:13.000000000 +0900 +++ coolkey-1.1.0/debian/rules 2011-07-06 10:22:05.000000000 +0900 @@ -1,4 +1,6 @@ #!/usr/bin/make -f +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + %: dh $@ @@ -9,7 +11,7 @@ cp -f /usr/share/misc/config.sub config.sub -test -r /usr/share/misc/config.guess && \ cp -f /usr/share/misc/config.guess config.guess - ( PCSC_CFLAGS=`/usr/bin/pkg-config --cflags libpcsclite` ; PCSC_LIBS=`/usr/bin/pkg-config --libs libpcsclite` ; NSS_CFLAGS="-I /usr/include/nss -I /usr/include/nspr/" ; NSS_LIBS="-lnss3 -L/usr/lib/nss/" ; export PCSC_CFLAGS ; export PCSC_LIBS ; export NSS_CFLAGS ; export NSS_LIBS ; dh_auto_configure -- --with-debug --disable-dependency-tracking --enable-pk11install ) + ( PCSC_CFLAGS=`/usr/bin/pkg-config --cflags libpcsclite` ; PCSC_LIBS=`/usr/bin/pkg-config --libs libpcsclite` ; NSS_CFLAGS="-I /usr/include/nss -I /usr/include/nspr/" ; NSS_LIBS="-lnss3 -L/usr/lib/$(DEB_HOST_MULTIARCH)/nss/" ; export PCSC_CFLAGS ; export PCSC_LIBS ; export NSS_CFLAGS ; export NSS_LIBS ; dh_auto_configure -- --with-debug --disable-dependency-tracking --enable-pk11install ) # avoid libtool -rpath problems sed < libtool > libtool-2 -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' mv libtool-2 libtool