Fixed packages generation

diff --git a/debian/control b/debian/control
index 76f85ae..e5baf38 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,23 @@ Source: mdictionary
 Section: user/education
 Priority: optional
 Maintainer: Jakub Jaszczyński <jakub.jaszczynski@comarch.pl>, Piotr Pilarczyk <piotr.pilarczyk@comarch.pl>, Mateusz Półrola <mateusz.polrola@comarch.pl>, Bartosz Szatkowski <bartosz.szatkowski@comarch.pl>
-Build-Depends: debhelper (>= 5), libqt4-core, libqt4-gui, libqt4-xml
+Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.6), doxygen
 Standards-Version: 3.8.0
 
 Package: mdictionary
+Section: user/education
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Multilanguage dictionary
- Long desc
+
+Package: mdictionary-google-plugin
+Section: user/education
+Architecture: any
+Depends: mdictionary
+Description: Google plugin for mdictionary
+
+Package: mdictionary-homescreen-widget
+Section: user/education
+Architecture: any
+Depends: mdictionary
+Description: home sreen widget for mdictionary

diff --git a/debian/mdictionary-google-plugin.install b/debian/mdictionary-google-plugin.install
new file mode 100644 (file)
index 0000000..488d41c
--- /dev/null
+++ b/debian/mdictionary-google-plugin.install
@@ -0,0 +1 @@
+usr/lib/mdictionary/plugins/libgoogle.so

diff --git a/debian/mdictionary-homescreen-widget.install b/debian/mdictionary-homescreen-widget.install
new file mode 100644 (file)
index 0000000..98a0883
--- /dev/null
+++ b/debian/mdictionary-homescreen-widget.install
@@ -0,0 +1,2 @@
+usr/lib/hildon-desktop
+usr/share/applications/hildon-home

diff --git a/debian/mdictionary.install b/debian/mdictionary.install
new file mode 100644 (file)
index 0000000..4e92616
--- /dev/null
+++ b/debian/mdictionary.install
@@ -0,0 +1,8 @@
+usr/share/dbus-1/
+usr/share/icons/
+usr/share/mdictionary/staron.png
+usr/bin/mdictionary
+usr/lib/mdictionary/plugins/libxdxf.so
+usr/lib/mdictionary/plugins/eng-us.xdxf
+usr/lib/mdictionary/plugins/eng-thai.xdxf
+usr/share/applications/hildon/mdictionary.desktop

diff --git a/debian/mdictionary.png b/debian/mdictionary.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/debian/rules b/debian/rules
index adc54e0..0aaa671 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-       if test -f $(CURDIR)/Makefile; then \
+       if test -f $(CURDIR)/Makefile ; then \
                $(MAKE) distclean; \
        fi
        dh_clean
@@ -28,14 +28,19 @@ install:
        dh_testroot
        dh_clean -k
        dh_installdirs
-       cd $(CURDIR)/src && $(MAKE) -j 4 INSTALL_ROOT=$(CURDIR)/debian/mdictionary install
+       INSTALL_ROOT=$(CURDIR)/debian/tmp $(MAKE) install
 
 binary-indep: build install
 
 binary-arch: install
-       dh_maemo_package_icons
        dh_testdir
        dh_testroot
+       if [ -e $(CURDIR)/debian/tmp/usr/share/applications/mdictionary.desktop ] ; then \
+               sed -i -e 's/.*mdictionary.desktop/usr\/share\/applications\/mdictionary.desktop/g' $(CURDIR)/debian/mdictionary.install ;\
+       else \
+               sed -i -e 's/.*mdictionary.desktop/usr\/share\/applications\/hildon\/mdictionary.desktop/g' $(CURDIR)/debian/mdictionary.install ;\
+       fi
+       dh_install --sourcedir=$(CURDIR)/debian/tmp
        dh_strip
        dh_compress
        dh_fixperms
@@ -44,7 +49,7 @@ binary-arch: install
        dh_gencontrol
        dh_md5sums
        dh_builddeb
-       dh_maemo_package_icons -r
+#      dh_maemo_package_icons -r
        
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

diff --git a/mdictionary.pro b/mdictionary.pro
index 4018128..0a912f5 100644 (file)
--- a/mdictionary.pro
+++ b/mdictionary.pro
@@ -1,11 +1,11 @@
 TEMPLATE = subdirs
-SUBDIRS = src tests
+SUBDIRS = src
 CONFIG += ordered
 include (mdictionary.pri)
 
 
 check.CONFIG += recursive
-check.recurse = src tests
+check.recurse = src 
 QMAKE_EXTRA_TARGETS += check
 
 

diff --git a/tests/GooglePluginTests/GooglePluginTests.pro b/tests/GooglePluginTests/GooglePluginTests.pro
new file mode 100644 (file)
index 0000000..33c891a
--- /dev/null
+++ b/tests/GooglePluginTests/GooglePluginTests.pro
@@ -0,0 +1,35 @@
+######################################################################
+# Automatically generated by qmake (1.07a) Wed Aug 4 11:35:12 2010
+######################################################################
+
+CONFIG += qtestlib
+QT += core gui network
+TARGET = GooglePluginTests
+TEMPLATE = app
+INCLUDEPATH += .
+
+# Input
+HEADERS += test.h \
+    ../../src/plugins/google/GooglePlugin.h \
+    ../../src/include/translation.h \
+    ../../src/include/settings.h \
+    ../../src/include/DictDialog.h \
+    ../../src/include/CommonDictInterface.h \
+    ../../src/plugins/google/TranslationGoogle.h \
+    ../../src/plugins/google/GoogleDictDialog.h \
+    ../../src/plugins/google/GoogleSettingsDialog.h
+
+SOURCES += test.cpp \
+    ../../src/plugins/google/GooglePlugin.cpp \
+    ../../src/plugins/google/TranslationGoogle.cpp \
+    ../../src/plugins/google/GoogleDictDialog.cpp \
+    ../../src/plugins/google/GoogleSettingsDialog.cpp
+
+target.path = .
+target.commands = ./GooglePluginTests
+INSTALLS += target
+
+
+check.depends = $$TARGET
+check.commands = ./$${TARGET}
+QMAKE_EXTRA_TARGETS += check

diff --git a/tests/XdxfPluginTests/XdxfPluginTests.pro b/tests/XdxfPluginTests/XdxfPluginTests.pro
new file mode 100644 (file)
index 0000000..8375447
--- /dev/null
+++ b/tests/XdxfPluginTests/XdxfPluginTests.pro
@@ -0,0 +1,39 @@
+######################################################################
+# Automatically generated by qmake (1.07a) Wed Aug 4 11:35:12 2010
+######################################################################
+
+CONFIG += qtestlib
+QT += sql
+TARGET = xdxfPluginTests
+TEMPLATE = app
+INCLUDEPATH += .
+
+# Input
+HEADERS += test.h \
+    ../../src/plugins/xdxf/xdxfplugin.h \
+    ../../src/plugins/xdxf/TranslationXdxf.h \
+    ../../src/include/translation.h \
+    ../../src/include/settings.h \
+    ../../src/include/DictDialog.h \
+    ../../src/include/CommonDictInterface.h \
+    ../../src/plugins/xdxf/XdxfDictDialog.h \
+    ../../src/plugins/xdxf/XdxfLoadDialog.h \
+    ../../src/plugins/xdxf/XdxfSettingsDialog.h \
+    ../../src/plugins/xdxf/XdxfCachingDialog.h
+
+
+SOURCES += test.cpp \
+    ../../src/plugins/xdxf/xdxfplugin.cpp \
+    ../../src/plugins/xdxf/TranslationXdxf.cpp \
+    ../../src/plugins/xdxf/XdxfLoadDialog.cpp \
+    ../../src/plugins/xdxf/XdxfDictDialog.cpp \
+    ../../src/plugins/xdxf/XdxfCachingDialog.cpp \
+    ../../src/plugins/xdxf/XdxfSettingsDialog.cpp
+
+target.path = .
+target.commands = ./xdxfPluginTests
+INSTALLS += target
+
+check.depends = $$TARGET
+check.commands = ./$${TARGET}
+QMAKE_EXTRA_TARGETS += check