[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_databasebiblio.mk extras/Zip_databasebiblio.mk scp2/source

[Julien Nabet]

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

New commits:
commit 283ce0b6192c1a5baf10d603a3d6606fe06d1116
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Apr 10 23:03:04 2013 +0200

    fdo#63197, Convert Zip_databasebiblio
    
    Change-Id: I58d387c4bbfd4af9cc1e800bc8c715e34a61a970
    Reviewed-on: https://gerrit.libreoffice.org/3318
    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 3de16a4..ece5397 100644
--- a/extras/Module_extras.mk
+++ b/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 \
diff --git a/extras/Package_databasebiblio.mk b/extras/Package_databasebiblio.mk
new file mode 100644
index 0000000..a85c193
--- /dev/null
+++ b/extras/Package_databasebiblio.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_databasebiblio,$(SRCDIR)/extras/source/database))
+
+$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_databasebiblio,presets/database/biblio,\
+	biblio.dbf \
+	biblio.dbt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_databasebiblio.mk b/extras/Zip_databasebiblio.mk
deleted file mode 100644
index 2db3653..0000000
--- a/extras/Zip_databasebiblio.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,databasebiblio,$(SRCDIR)/extras/source/database))
-
-$(eval $(call gb_Zip_add_files,databasebiblio,\
-	biblio.dbf \
-	biblio.dbt \
-))
-
-# 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 67f769c..e2ac274 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/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