Cleaning and maintaince

diff --git a/buildapp b/buildapp
deleted file mode 100755 (executable)
index ae8e170..0000000
--- a/buildapp
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-#./setqmake
-#qmake mdictionary.pro
-#make clean
-#make
-#make clean
-./rename-plugins "lib/mdictionary"
-

diff --git a/debian/files b/debian/files
deleted file mode 100644 (file)
index 57026b2..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-mdictionary_1.0.0-2_i386.deb user/education optional

diff --git a/debian/mdictionary.substvars b/debian/mdictionary.substvars
deleted file mode 100644 (file)
index abbeeb5..0000000
--- a/debian/mdictionary.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.5.0-1), libgcc1 (>= 1:4.2.1), libqt4-core (>= 4.6.2~git20100401), libqt4-gui (>= 4.6.2~git20100401), libqt4-xml (>= 4.6.2~git20100401), libstdc++6 (>= 4.2.1)

diff --git a/make-package b/make-package
deleted file mode 100755 (executable)
index 03e1f6c..0000000
--- a/make-package
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-APPNAME=mdictionary
-
-./setqmake
-dpkg-buildpackage -D -rfakeroot
-rm -rf builddir 
-rm build-stamp
-rm -rf debian/$APPNAME
-mv ../${APPNAME}_* packages/

diff --git a/mdictionary.pro b/mdictionary.pro
index 0b0cbc8..c54e852 100644 (file)
--- a/mdictionary.pro
+++ b/mdictionary.pro
@@ -8,10 +8,17 @@ error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4"
 TEMPLATE = subdirs
 SUBDIRS  = trunk
 
+BINDIR = $$PREFIX/bin
+LIBDIR = $$PREFIX/lib/$${MDICT_APPNAME}
+DATADIR =$$PREFIX/share
+
 check.target = check
 check.CONFIG = recursive
 check.recurse = trunk
 
+rename_plugins.command = scripts/rename-plugins $$LIBDIR
+rename_plugins.path = $$LIBDIR
+
+
+QMAKE_EXTRA_TARGETS += check
 
-rename_plugins.commands = ./rename-plugins "lib/mdictionary"
-QMAKE_EXTRA_TARGETS += check rename_plugins

diff --git a/rename-plugins b/rename-plugins
deleted file mode 100755 (executable)
index fa15c98..0000000
--- a/rename-plugins
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-path=$1
-
-
-echo $path
-pushd $path
-
-echo *
-
-rm `find . -name "*" -type l`
-
-for pro in  *; do
-    if [ -e "$pro" ] ; then  
-           pro=`echo $pro | cut -d"." -f1`
-
-               echo " "
-               echo " "
-               echo $pro 
-               echo " "
-               echo " "        
-            mv `find . -name "*.so.*" -type f` "$pro.so"
-    fi
-done
-popd
-    

diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index 4bed9a7..bed5acd 100644 (file)
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -227,6 +227,9 @@ void Backbone::loadPlugins() {
         CommonDictInterface *plugin = qobject_cast<CommonDictInterface*>(pl);
         _plugins.append(plugin);
         addDictionary(plugin->getNew(0)); //TODO change 0 to real settings
+        //Settings* set = new Settings();
+        //set->setValue("path", "dict2.xdxf");
+        //addDictionary(plugin->getNew(set));
     }
 }
 

diff --git a/trunk/src/plugins/plugins.pro b/trunk/src/plugins/plugins.pro
index a4ee0dc..512061a 100644 (file)
--- a/trunk/src/plugins/plugins.pro
+++ b/trunk/src/plugins/plugins.pro
@@ -5,3 +5,4 @@ check.target = check
 check.CONFIG = recursive
 check.recurse = xdxf
 QMAKE_EXTRA_TARGETS += check
+