diff -Nru kontrolpack-3.0.0/debian/changelog kontrolpack-3.0.0/debian/changelog --- kontrolpack-3.0.0/debian/changelog 2011-10-15 17:34:11.000000000 +0000 +++ kontrolpack-3.0.0/debian/changelog 2011-10-20 18:58:06.000000000 +0000 @@ -1,3 +1,9 @@ +kontrolpack (3.0.0-0ubuntu2) precise; urgency=low + + * Fix FTBFS on amd64 (LP: #877643). + + -- Ilya Barygin Thu, 20 Oct 2011 21:08:56 +0400 + kontrolpack (3.0.0-0ubuntu1) precise; urgency=low * New upstream release (LP: #573780). diff -Nru kontrolpack-3.0.0/debian/patches/06_amd64-ftbfs.patch kontrolpack-3.0.0/debian/patches/06_amd64-ftbfs.patch --- kontrolpack-3.0.0/debian/patches/06_amd64-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ kontrolpack-3.0.0/debian/patches/06_amd64-ftbfs.patch 2011-10-20 18:22:58.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Fix FTBFS on amd64. +Author: Ilya Barygin +Bug-Ubuntu: https://launchpad.net/bugs/877643 + +--- kontrolpack-3.0.0.orig/libsecuretcp/libsecuretcp.pro ++++ kontrolpack-3.0.0/libsecuretcp/libsecuretcp.pro +@@ -33,7 +33,7 @@ + INCLUDEPATH += C:\\OpenSSL\\include C:\libxml2\lib\include\libxml2 + LIBS += -LC:\libxml2\lib\lib -lxml2 -LC:\\OpenSSL\\lib\\MinGW -leay32 -LC:\Qt\2010.02.1\mingw\lib -lws2_32 -lwsock32 + } +-linux-g++ { ++linux-g++ | linux-g++-64 { + INCLUDEPATH += /usr/include/openssl /usr/include/libxml2 + LIBS += -L/usr/lib -lssl -lxml2 -lcrypto + } +--- kontrolpack-3.0.0.orig/kontrolpack/kontrolpack.pro ++++ kontrolpack-3.0.0/kontrolpack/kontrolpack.pro +@@ -20,7 +20,7 @@ + INCLUDEPATH += C:\\sqlite3\\include C:\\OpenSSL\\include C:\\libxml2\\lib\\include\\libxml2 ..\\libsecuretcp + LIBS += -LC:\\sqlite3 -lsqlite3.dll -L..\\bin -lsecuretcp0 -LC:\libxml2\lib\lib -lxml2 -LC:\\OpenSSL\\lib\\MinGW -leay32 -LC:\Qt\2010.02.1\mingw\lib -lws2_32 -lwsock32 + } +-linux-g++ { ++linux-g++ | linux-g++-64 { + INCLUDEPATH += /usr/include/openssl ../libsecuretcp /usr/include/libxml2 + LIBS += -L/usr/lib -lssl -L../bin -lsecuretcp -lxml2 -lsqlite3 + } diff -Nru kontrolpack-3.0.0/debian/patches/series kontrolpack-3.0.0/debian/patches/series --- kontrolpack-3.0.0/debian/patches/series 2011-10-15 07:24:12.000000000 +0000 +++ kontrolpack-3.0.0/debian/patches/series 2011-10-20 17:11:43.000000000 +0000 @@ -3,3 +3,4 @@ 03_set-rpath.patch 04_spelling.patch 05_format-safety.patch +06_amd64-ftbfs.patch