[PATCH] fdo#63197, Convert Zip_databasebiblio

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3318

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/3318/1

fdo#63197, Convert Zip_databasebiblio

Change-Id: I58d387c4bbfd4af9cc1e800bc8c715e34a61a970
---
M extras/Module_extras.mk
R extras/Package_databasebiblio.mk
M scp2/source/ooo/file_extra_ooo.scp
3 files changed, 8 insertions(+), 6 deletions(-)



diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 3de16a4..ece5397 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -21,11 +21,11 @@
 	Package_palettes \
 	Package_wordbook \
 	Package_database \
+	Package_databasebiblio \
 	Zip_autotextuser \
 	Zip_cfgsrvbitmapunx \
 	Zip_cfgsrvnolang \
 	Zip_cfgusr \
-	Zip_databasebiblio \
 	Zip_gallbullets \
 	Zip_gallhtmlexpo \
 	Zip_gallroot \
diff --git a/extras/Zip_databasebiblio.mk b/extras/Package_databasebiblio.mk
similarity index 61%
rename from extras/Zip_databasebiblio.mk
rename to extras/Package_databasebiblio.mk
index 2db3653..a85c193 100644
--- a/extras/Zip_databasebiblio.mk
+++ b/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 \
 ))
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 67f769c..e2ac274 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -93,10 +93,10 @@
 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

-- 
To view, visit https://gerrit.libreoffice.org/3318
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58d387c4bbfd4af9cc1e800bc8c715e34a61a970
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412 at yahoo.fr>