[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_database.mk extras/Zip_database.mk scp2/source

[Julien Nabet]

 extras/Module_extras.mk            |    2 +-
 extras/Package_database.mk         |   19 +++++++++++++++++++
 extras/Zip_database.mk             |   17 -----------------
 scp2/source/ooo/file_extra_ooo.scp |    6 +++---
 4 files changed, 23 insertions(+), 21 deletions(-)

New commits:
commit 8b7da751fd6ada77980b13745f9b276c311e0963
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Apr 9 22:58:49 2013 +0200

    fdo#63197, Convert Zip_database
    
    Change-Id: I459b27065869b50639330dcbbae8bc7a1651882f
    Reviewed-on: https://gerrit.libreoffice.org/3302
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 977c475..3de16a4 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -20,11 +20,11 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Package_newfiles \
 	Package_palettes \
 	Package_wordbook \
+	Package_database \
 	Zip_autotextuser \
 	Zip_cfgsrvbitmapunx \
 	Zip_cfgsrvnolang \
 	Zip_cfgusr \
-	Zip_database \
 	Zip_databasebiblio \
 	Zip_gallbullets \
 	Zip_gallhtmlexpo \
diff --git a/extras/Package_database.mk b/extras/Package_database.mk
new file mode 100644
index 0000000..03800f5
--- /dev/null
+++ b/extras/Package_database.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,extras_database,$(SRCDIR)/extras/source/database))
+
+$(eval $(call gb_Package_set_outdir,extras_database,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_database,presets/database,\
+	biblio.odb \
+	evolocal.odb \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_database.mk b/extras/Zip_database.mk
deleted file mode 100644
index b35e3aa..0000000
--- a/extras/Zip_database.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Zip_Zip,database,$(SRCDIR)/extras/source/database))
-
-$(eval $(call gb_Zip_add_files,database,\
-	biblio.odb \
-	evolocal.odb \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 2eef8a5..67f769c 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -86,10 +86,10 @@ File gid_File_Extra_Common_Pl
 End
 
 File gid_File_Extra_Database
-    Dir = gid_Dir_Database;
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "database.zip";
+    Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+    Name = "extras_database.filelist";
 End
 
 File gid_File_Extra_Databasebiblio