fdo#63197, Convert Zip_databasebiblio

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

extras/Module_extras.mk

@@ -21,11 +21,11 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Package_palettes \
 	Package_wordbook \
 	Package_database \
+	Package_databasebiblio \
 	Zip_autotextuser \
 	Zip_cfgsrvbitmapunx \
 	Zip_cfgsrvnolang \
 	Zip_cfgusr \
-	Zip_databasebiblio \
 	Zip_gallbullets \
 	Zip_gallhtmlexpo \
 	Zip_gallroot \

extras/Zip_databasebiblio.mk → extras/Package_databasebiblio.mk

@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,databasebiblio,$(SRCDIR)/extras/source/database))
+$(eval $(call gb_Package_Package,extras_databasebiblio,$(SRCDIR)/extras/source/database))
 
-$(eval $(call gb_Zip_add_files,databasebiblio,\
+$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_databasebiblio,presets/database/biblio,\
 	biblio.dbf \
 	biblio.dbt \
 ))

scp2/source/ooo/file_extra_ooo.scp

@@ -93,10 +93,10 @@ File gid_File_Extra_Database
 End
 
 File gid_File_Extra_Databasebiblio
-    Dir = gid_Dir_Database_Biblio;
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "databasebiblio.zip";
+    Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+    Name = "extras_databasebiblio.filelist";
 End
 
 File gid_File_Extra_Edit_Asp