Type of bookmarks database in the package, depends on user's choice

git-svn-id: file:///svnroot/mdictionary/trunk@90 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/Makefile b/Makefile
index 80285b2..ccac524 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,8 @@ MNG_SERVICEFILE = org.maemo.WhiteStorkManager.service
 MNG_LIB = ${BINARIES}/ws_bookmark.so
 MNG_DIRS = ${PACKAGES}/${MNG_PACK_NAME}/usr/bin ${PACKAGES}/${MNG_PACK_NAME}/usr/lib/WhiteStork ${PACKAGES}/${MNG_PACK_NAME}/usr/share/dbus-1/services  ${PACKAGES}/${MNG_PACK_NAME}/usr/share/WhiteStork ${PACKAGES}/${MNG_PACK_NAME}/usr/share/doc/${MNG_PACK_NAME}
 MNG_DBUS = ${DATA}/other/${MNG_SERVICEFILE}
-MNG_OTHER = ${DATA}/dictionaries
+MNG_OTHER = ${DATA}/dictionaries 
+MNG_BOOKMARKS = ${DATA}/bookmarks/${BOOKMARKS}/*
 MNG_DOC = ${DATA}/docs/${MNG_PACK_NAME}/
 
 PLUGINS_LIB = ${BINARIES}/engine_*.so
@@ -313,7 +314,9 @@ mng-deb: ${BINARIES}/ws_dbus.o ${BINARIES}/WhiteStorkManager ${BINARIES}/ws_book
                @find  ${MNG_DOC} -type f -not -name copyright -not -path *.svn* -exec cp {} ${PACKAGES}/${MNG_PACK_NAME}/usr/share/doc/${MNG_PACK_NAME} \;
                @gzip -r --best ${PACKAGES}/${MNG_PACK_NAME}/usr/share/doc/${MNG_PACK_NAME}
                @cp ${MNG_DOC}/copyright ${PACKAGES}/${MNG_PACK_NAME}/usr/share/doc/${MNG_PACK_NAME}
-                               @cp -rf ${MNG_OTHER} ${PACKAGES}/${MNG_PACK_NAME}/usr/share/WhiteStork
+               @cp -rf ${MNG_OTHER} ${PACKAGES}/${MNG_PACK_NAME}/usr/share/WhiteStork
+               @install -d ${PACKAGES}/${MNG_PACK_NAME}/usr/share/WhiteStork/dictionaries/bookmarks
+               @cp -rf ${MNG_BOOKMARKS} ${PACKAGES}/${MNG_PACK_NAME}/usr/share/WhiteStork/dictionaries/bookmarks
                @-find ${PACKAGES}/${MNG_PACK_NAME} -name .svn -exec rm -rf {} \;>> ${LOG_DEBS} 2>> ${LOG_DEBS}
                @sed 's/Version:/Version: '${APP_VER}-${PACK_VER}'/ ' ${PACKAGES}/${MNG_PACK_NAME}/DEBIAN/control > ${PACKAGES}/${MNG_PACK_NAME}/DEBIAN/control_backup
                @sed 's/Installed-Size:/Installed-Size: '`du -s ${PACKAGES}/${MNG_PACK_NAME} | awk {'print $$1'}`'/ ' ${PACKAGES}/${MNG_PACK_NAME}/DEBIAN/control_backup > ${PACKAGES}/${MNG_PACK_NAME}/DEBIAN/control

diff --git a/data/bookmarks/bdb/bm_trans.db b/data/bookmarks/bdb/bm_trans.db
new file mode 100644 (file)
index 0000000..7abe57a
Binary files /dev/null and b/data/bookmarks/bdb/bm_trans.db differ

diff --git a/data/bookmarks/bdb/bm_words.db b/data/bookmarks/bdb/bm_words.db
new file mode 100644 (file)
index 0000000..d7d2019
Binary files /dev/null and b/data/bookmarks/bdb/bm_words.db differ

diff --git a/data/bookmarks/sql/ws_bookmarks b/data/bookmarks/sql/ws_bookmarks
new file mode 100644 (file)
index 0000000..183c23b
Binary files /dev/null and b/data/bookmarks/sql/ws_bookmarks differ

diff --git a/data/bookmarks/sql3/ws_bookmarks3 b/data/bookmarks/sql3/ws_bookmarks3
new file mode 100644 (file)
index 0000000..21a9e50
Binary files /dev/null and b/data/bookmarks/sql3/ws_bookmarks3 differ

diff --git a/data/bookmarks/xdxf/ws_bookmarks.cache b/data/bookmarks/xdxf/ws_bookmarks.cache
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/data/bookmarks/xdxf/ws_bookmarks.xdxf b/data/bookmarks/xdxf/ws_bookmarks.xdxf
new file mode 100644 (file)
index 0000000..d34ed91
--- /dev/null
+++ b/data/bookmarks/xdxf/ws_bookmarks.xdxf
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE xdxf SYSTEM "http://xdxf.sourceforge.net/xdxf_lousy.dtd">
+<xdxf lang_from="NN" lang_to="NN" format="visual">
+<full_name>WhiteStork Bookmarks</full_name>
+<description>Version: 1.0</description>
+
+</xdxf>
\ No newline at end of file

diff --git a/data/dictionaries/bookmarks/bm_trans.db b/data/dictionaries/bookmarks/bm_trans.db
deleted file mode 100644 (file)
index 7abe57a..0000000
Binary files a/data/dictionaries/bookmarks/bm_trans.db and /dev/null differ

diff --git a/data/dictionaries/bookmarks/bm_words.db b/data/dictionaries/bookmarks/bm_words.db
deleted file mode 100644 (file)
index d7d2019..0000000
Binary files a/data/dictionaries/bookmarks/bm_words.db and /dev/null differ

diff --git a/data/dictionaries/bookmarks/ws_bookmarks b/data/dictionaries/bookmarks/ws_bookmarks
deleted file mode 100644 (file)
index 183c23b..0000000
Binary files a/data/dictionaries/bookmarks/ws_bookmarks and /dev/null differ

diff --git a/data/dictionaries/bookmarks/ws_bookmarks.cache b/data/dictionaries/bookmarks/ws_bookmarks.cache
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/data/dictionaries/bookmarks/ws_bookmarks.xdxf b/data/dictionaries/bookmarks/ws_bookmarks.xdxf
deleted file mode 100644 (file)
index d34ed91..0000000
--- a/data/dictionaries/bookmarks/ws_bookmarks.xdxf
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xdxf SYSTEM "http://xdxf.sourceforge.net/xdxf_lousy.dtd">
-<xdxf lang_from="NN" lang_to="NN" format="visual">
-<full_name>WhiteStork Bookmarks</full_name>
-<description>Version: 1.0</description>
-
-</xdxf>
\ No newline at end of file

diff --git a/data/dictionaries/bookmarks/ws_bookmarks3 b/data/dictionaries/bookmarks/ws_bookmarks3
deleted file mode 100644 (file)
index 21a9e50..0000000
Binary files a/data/dictionaries/bookmarks/ws_bookmarks3 and /dev/null differ