fdo#63197, Convert Zip_database

Change-Id: I459b27065869b50639330dcbbae8bc7a1651882f
Reviewed-on: https://gerrit.libreoffice.org/3302Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

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 \

extras/Zip_database.mk → extras/Package_database.mk

@@ -7,9 +7,11 @@
 # 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_Package_Package,extras_database,$(SRCDIR)/extras/source/database))
 
-$(eval $(call gb_Zip_add_files,database,\
+$(eval $(call gb_Package_set_outdir,extras_database,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_database,presets/database,\
 	biblio.odb \
 	evolocal.odb \
 ))

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