Repair problem with build app on scratchbox. Add rules to build deb package with...

diff --git a/debian/control b/debian/control
index a3673fc..60a468f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -183,6 +183,93 @@ XB-Maemo-Icon-26:
  R6k5LvEmgNSWReUI6AF2AhuAN4CXgZUhpTL4X+2GJpp8LxfUAAAAAElFTkSu
  QmCC
 
+Package: mdictionary-stardict-plugin
+Section: user/education
+Architecture: any
+Depends: mdictionary
+Description: Stardict plugin for mDictionary
+XB-Maemo-Icon-26:
+ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c
+ 6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0
+ SU1FB9oJCgwJD1W7SEAAAA1mSURBVGje7Zl5kF3VccZ/fc699y0zo1nejEaa
+ 0UgICUkjCS0goQyLLXZkRAzBJsaOXaGITQVT5QIXRbkSwK4iLkJhgnFsYShT
+ QCACKrEdltjYksxqC8sCCYtFQstotC+zz5t57y6n88d7I40WCEKIxJWcqlvv
+ j/vqnv66+3R//R34//U/u+ST2qjqy3e3qXCrqs4WWDXwLzdf/r8KQOWX78oi
+ Mh/kIsAHXY7GKyRx49SYJxE7HxFAHGAA0OQ2k4T39/3rrfs+MQCj/vqeaao6
+ C2hyzo02xkTOJevFRddivPMQiwBasnApSbQQ58aKMYoYQQyIgHM4LyDxsxuT
+ TM19msSPxz/8UteJBfDZb/8iW5VdYK3NqGoAGBFBVUNwAXGsGIMgqLGIOlEx
+ KChxJEZj1FgQoZCbTJyuU1ABHGK6gPnceV77sZjkHRMAp9nB3nytDXzS2RQi
+ oqiKigSCRQNPSGJIQjCGodwU4lQVGCMA3sAegt4dDI6dDcaCqiBGURWgHthy
+ rE41xxYvEURIwph8X57iUCjFTI5idQtDdZPIj55Jvuk0FEO+8VTiTHUpXQBU
+ iSsbGWyaC2KGv1cGIYKIIgK3LL/mxEXgAGwBVaIohnQOslUjopSQHzcPrA+q
+ w0Ye+nt4FqsqUn4hMufEAxj23silWgq+saCHePjQ/6pCEoOLSyBLZ0JGvE99
+ MgCOBki1HCGDhEOoFxya0iIw2Au73sMr9qEN40nqJ5dr1ker6N7H2q2kXEA3
+ vY4p9uFl0xQnnlM61MNOHuqHQp5YBaIyYJWP3JEMH/eKY+jbT+KEYj4snZej
+ AZURRh9HO/34ASAHvS0nnqkY/sTX/zUA+icOwFmHnEgQChrEx1VGX/4lVgTP
+ OVIipIEUUD1tNGfO+/7eKVu7GsAoJ2SUUMuC3MoLnl7GlN92tm664i/fST40
+ gKce5uaTJpALQ2pVyYkwHjgJaADY1Qe12Txbuxr0uMpL4kPkgRceLTV1bHbb
+ 1K0Jf6yt2vj4cz9tefTSv9j2wodKoa4umbHhPW6JY74mwpXAfKChbKqKgFMZ
+ dr1+4PFw9ujnRQ2LWldz+ZzfwVAWnCl9zVmIshDWSk9Yo8YQWBNdU5XZ8ezy
+ Zyoev/eeGyo+1Dzw4yX3xtHgXbaleQ81VQnGjhgJU/CtX1zBS5unkS+my7xH
+ YMKcMplTUENNqocZ+x5j1e6phEkGTj0forDcFhKubnmKb0y5n3xouG7F39Nb
+ OZ2W7Hba6l5jQd3vmVK1ldAdYCYKiKqlf3DsV9Kpnp+dv3hg4P0B3P9QIqiJ
+ w7UE3q+oq36XhroS30qSEoh1e+r597Vn8vO3TgMNYNJMSNeCWnAWL+hm82cu
+ 4bmNLTyx5lP0N7dxcrCZXKaT+tReWqveZkJ2K0bAt+ADnkCoELnSM7IHlumV
+ Oockzt8QRdkHL76i9+4jACz50QOeMSYUESnNFwU02Yjnvk+uNmHsWIiiYSYt
+ bO+r4SerLuDXhb9iVnM7p476I1OrNpALuji9dh2JQph4JHikTAErBzNNj5Z9
+ OnJuAnUl442BTAYyKUilwDOon2JdKmUWj57kOg4A+MEPHvUCPwxFkINpboBR
+ xEM/JhOspLmpn0z64K6VKchaKMZQLHtPywaMJKdHHAU9SIdM+ddaMNZgbYZ0
+ OkM6nSKTrcXz63A6BrWn4WQe2LPArVfpn3PTmCncKwc/qnbJkqWxNUMjiGU5
+ CSWFS/bhol9RXfEy9XV5KivBuRFEuIx52GjnSt4zpmycgOcNPym8oJYgyOEF
+ zbz+xkJefGkBa9eeQnt7jv2daYoFwQ+gokJpbIQJExNmzIw5o63IaXM2kIrP
+ vWPM5MFbDwB4ZAlrm5pnnLp5540CFpHkYIapomUL1fUh7mkCeYFTJpcMdiPy
+ Np2CbBYqsiVjRUC8+eCdD/6nETMaEYtzAU89UccP76ujY6t/TJW4uiZm5vRX
+ Vv/mt+fOO5hCd7HY97hvzJj0+IK7yvbmz1bUK1VQGdm4FKhAk3dJwseZO3Mn
+ zU01+Kkx2FQrmCk4JqEyEZVJqDQixEABtIDg2L3b8vWvjuIPq/zj6nvhIaNc
+ ef3Td7mhcTRf8fzG+Wovoje/UJ3zxEh0cG5VRcUiBHjeDi5c9LdYmwLi8pMA
+ rqSWqDuk1m1tt1x1eQ27d9njbtxHBfDOmovk5ZfWZDzb/UWXJA82NWXoHrpe
+ +/pniTFFSjrQ8CFVPOtz4aIL8DzvYOkrKUNH0I18Hi67qJZNG48cBOtyji98
+ qcBZ5xSZMi2hujpBRLS315eOrQFvrfNZ+arw4grLwIA5EsCTj869tLbW1YmI
+ D+obY13inGvf/M7X0kFxVq5+cnp393UkrlpVPSl5GDzP48JLLiwDkPflsKLK
+ Hd+p5MEl2SPeX/XFAt+5o0ez2Vh0OIKqQKjEq2LjVoUkr4a4TYViwSWPPHbd
+ 5jvu/J4XImcd2PGeO9umVFXXt1VVbKY+5wHiVIWKiqq+7ds2zxoa3H1m4MeX
+ GP9sYhZqX36qGAnV86wcADCiGiGgmHIpNnTu9zjztAqKxUNBXnvtSm6/fSlo
+ L86FfUky0JGEu3ck8YY+F/XmE8eACO825nheLNurx1N43058/5IHrk7iTWLd
+ i2504wA11R5JMuxE0Xy+t75rf8c16ZTOq6xu0709V4v1xnDBRW1Ya0E8IK1K
+ uhQLbUeSzYi+x8MPjea22648xPj63J78c/8x51GELfnB7J7E2ShJbJw4P1Y1
+ KmK1VJZVncpAFMrrl31udc8H0GkTWW+qIrPYset5OrvWa/PYAp5XEs4qKqp2
+ 19aefvvOHe2nb+945esTJ7xSF5uv+qIt4HC49oj4hcjEK2JN3o1RkkTpDEPW
+ PvLwulnAjJG7jRm7feneruZnjXEioiOdqSIHOaOIqmdcOsjqwmXPzdg89eS3
+ 3m5pJT7aPBCCE2FI/fQFGiVzZMu2dVSk12h9LtZMRgjDgm1qnriyrn70m7t3
+ bmtrPeWh6WH3E91J1N8dhnQWY7qKYUNvMZzRP5Cv7B8KKwopvxhs2z7p8cNz
+ f8EZL70BzqlKqbAJgMOYCN8rqu/F+D5YK1hrNAjqIutPaA5dc92mN5etmjTL
+ 5b3D1I4IBC0fIGOrwZ7JUDyTjh2rSflv0tJiiKOCtcYrNI+buLx3SH/TvcXE
+ qiCmJKAPM54gKNp0OqxQVaIoyB0O4Kwzl3fUVPdHqWAQY4bUmkE8bwx+ai42
+ NZtTJn17+QeV0WBkBH62tNnf1xdFzgWH6YCAjMIEn9FiPIV31r/K2Mb9VI9K
+ sFYUJRFxGCOoqiuHHBHFiFNjE2xJxA4ON+DP2rL5VOpcJ/4sjD8H45+OmIyi
+ CWjh2EbKrp7Rc6uy/0asC6LBwsk4ZxBxwxI66BDWG6/Gtsjervfo6l5Drq5D
+ 6+uc+v6QWBOq53kEQRV+UEEQVOIF9WpsA8aMRoSiKumRm7fvecSeOouiagLE
+ CINoMlBOJwEqPjyAnh7/9TDsqhVZ1jp2jO96BhZrvtCMKbeLUlo5QNXzJ6Pa
+ QldfLzXVL+jJU87GpuZjvaZy2fSciC9I6kCggxSdxQLNIzd/+qfaPHPm4Luq
+ 6qQs3YMg8uHljyM6zz9/7wwvjN3EhlyhJpWZJn2D5xDHlcNMvbyBKCjOQSqd
+ 4+JF56u1wxSCEYBLhogIs6fV3t3VaRaO3Gtqa/yjX7/Y85OjzZ8lxR1EjA53
+ 9/ENdW/8t7LKDd/8fXzTLX94b9/+7Nud+9bvzXgPJ5nUyiSd6oxVgwiISoRH
+ YhFidX2xaj4paebEIhKrajz8PxGJgbh5nPvd4Xtt2mg/9+Zaz1clUSUWMTHY
+ WCQdG1sdi8lFioldsit24arkI92R3Xf3XM/3zMmVVZINMnNdd1+bqpMy3S5R
+ iUWXXqzW8z5QDXv26aD2+r+pWkYprw6sXE6feW3twLd8f9DBEOI6icPVJglX
+ i4vXOk16HUKi6qLWmeu3fORLvnv/cX6F9aOWxkbfRPFCHRiahKqH53lcsvhi
+ PFsi/6UaKuVrr6Q0Q2iMEadnzGm8ZddO74grpMrK/hduuvHOv7tk8SP780OF
+ 4oRcV3cU65CYhmTy7H3uYNk8csY7Jn3nC9+c19KQ0ey0xlCrKybiBSdp/+Dp
+ suiyK/C8lIoUIekA1wFJO0KnkvRJMR7UroEelq0Ym7315n/4eRwHE48SqEKq
+ ovcZLzX4n/mupheB/UAeSANNwDxg6XEB+PxN85qAjADjqtDW0Y5TJlbR2jqJ
+ JG6ne2CvdueV3fsd+3pV9/ZaSbKVDAyJqgpORVcs/cZJG1678klV2/hxiHnH
+ dEMjIomqxgq6tQ86BoTOdD+/bF+n+wbSWJMDlF3tg/gWjEXHTQxwTg+0xTMu
+ vXdTHEV/vmXN5x9wSTD7eAEc01g0va0pA1gRcQJqRNygZFyCp4Hn1LeqIk4H
+ +2JnDM4Y0aoaX507oKa4KFQd1fhq7/jpzy7dtfH8/XGYmQ6m6hjt7gIeA64/
+ 1jsyJyLRgVtRUXyrw7eueviV8vuyS4TMqL3xZ2+8/EF0wkPPP/jdTw10N54X
+ R6k5LvEmgNSWReUI6AF2AhuAN4CXgZUhpTL4X+2GJpp8LxfUAAAAAElFTkSu
+ QmCC
+
 Package: mdictionary-homescreen-widget
 Section: user/education
 Architecture: any

diff --git a/debian/mdictionary-stardict-plugin.install b/debian/mdictionary-stardict-plugin.install
new file mode 100644 (file)
index 0000000..d221ae2
--- /dev/null
+++ b/debian/mdictionary-stardict-plugin.install
@@ -0,0 +1,2 @@
+usr/lib/mdictionary/plugins/libstardict.so
+usr/share/mdictionary/stardict.png

diff --git a/src/plugins/stardict/CompressedReader.h b/src/plugins/stardict/CompressedReader.h
index 56aaf0b..fbb45fd 100644 (file)
--- a/src/plugins/stardict/CompressedReader.h
+++ b/src/plugins/stardict/CompressedReader.h
@@ -26,7 +26,7 @@
 
 #include <QObject>
 #include <zconf.h>
-#include <zlibdefs.h>
+//#include <zlibdefs.h>
 #include <zlib.h>
 #include "StarDictReader.h"
 

diff --git a/src/plugins/xdxf/XdxfDictDownloader.cpp b/src/plugins/xdxf/XdxfDictDownloader.cpp
index 6ae05a6..887fdf5 100644 (file)
--- a/src/plugins/xdxf/XdxfDictDownloader.cpp
+++ b/src/plugins/xdxf/XdxfDictDownloader.cpp
@@ -31,7 +31,9 @@
 
 
 #include <bzlib.h>
+#ifndef Q_WS_MAEMO_5
 #include <libtar.h>
+#endif
 #include <stdio.h>
 #include <fcntl.h>
 

diff --git a/src/plugins/xdxf/xdxf.pro b/src/plugins/xdxf/xdxf.pro
index f0e1ecc..79bf8c8 100644 (file)
--- a/src/plugins/xdxf/xdxf.pro
+++ b/src/plugins/xdxf/xdxf.pro
@@ -5,8 +5,15 @@ QT = core \
     xml \
     sql \
     network
-LIBS += -ltar \
-    -lbz2
+maemo5 {
+    LIBS += -lbz2 \
+}
+
+!maemo5 {
+    LIBS += -ltar \
+        -lbz2
+}
+
 maemo5:QT += maemo5
 SOURCES += xdxfplugin.cpp \
     TranslationXdxf.cpp \