[Libreoffice-commits] core.git: psprint_config/Module_psprint_config.mk psprint_config/Package_fontunxppds.mk psprint_config/Package_fontunxpsprint.mk psprint_config/Zip_fontunxppds.mk psprint_config/Zip_fontunxpsprint.mk scp2/source
Julien Nabet
serval2412 at yahoo.fr
Wed Apr 17 21:06:26 PDT 2013
psprint_config/Module_psprint_config.mk | 4 +--
psprint_config/Package_fontunxppds.mk | 37 +++++++++++++++++++++++++++++++
psprint_config/Package_fontunxpsprint.mk | 36 ++++++++++++++++++++++++++++++
psprint_config/Zip_fontunxppds.mk | 35 -----------------------------
psprint_config/Zip_fontunxpsprint.mk | 34 ----------------------------
scp2/source/ooo/file_extra_ooo.scp | 12 +++++-----
6 files changed, 81 insertions(+), 77 deletions(-)
New commits:
commit e725872d49e8b176e2c9be4fde5d5f76256daf45
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Apr 17 22:30:52 2013 +0200
fdo#63197: convert psprint_config files
Change-Id: I99660704931c7341a72fe303fae47f984f968ecb
Reviewed-on: https://gerrit.libreoffice.org/3443
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/psprint_config/Module_psprint_config.mk b/psprint_config/Module_psprint_config.mk
index 5c30c9f..0d35eb0 100644
--- a/psprint_config/Module_psprint_config.mk
+++ b/psprint_config/Module_psprint_config.mk
@@ -28,8 +28,8 @@
$(eval $(call gb_Module_Module,psprint_config))
$(eval $(call gb_Module_add_targets,psprint_config,\
- Zip_fontunxppds \
- Zip_fontunxpsprint \
+ Package_fontunxppds \
+ Package_fontunxpsprint \
))
# vim: set noet sw=4:
diff --git a/psprint_config/Package_fontunxppds.mk b/psprint_config/Package_fontunxppds.mk
new file mode 100644
index 0000000..65df35d
--- /dev/null
+++ b/psprint_config/Package_fontunxppds.mk
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
+
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,psprint_config_fontunxppds,share/psprint/driver,\
+ SGENPRT.PS \
+ SGENT42.PS \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/psprint_config/Package_fontunxpsprint.mk b/psprint_config/Package_fontunxpsprint.mk
new file mode 100644
index 0000000..f4b8e9e
--- /dev/null
+++ b/psprint_config/Package_fontunxpsprint.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
+
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,psprint_config_fontunxpsprint,share/psprint,\
+ psprint.conf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/psprint_config/Zip_fontunxppds.mk b/psprint_config/Zip_fontunxppds.mk
deleted file mode 100644
index 3714f11..0000000
--- a/psprint_config/Zip_fontunxppds.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Zip_Zip,fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
-
-$(eval $(call gb_Zip_add_files,fontunxppds,\
- SGENPRT.PS \
- SGENT42.PS \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/psprint_config/Zip_fontunxpsprint.mk b/psprint_config/Zip_fontunxpsprint.mk
deleted file mode 100644
index ec0a351..0000000
--- a/psprint_config/Zip_fontunxpsprint.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Zip_Zip,fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
-
-$(eval $(call gb_Zip_add_files,fontunxpsprint,\
- psprint.conf \
-))
-
-# 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 c539732..93ebc12 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -221,10 +221,10 @@ End
#ifndef WITHOUT_PPDS
File gid_File_Extra_Fontunxppds
- Dir = gid_Dir_Psprint_Driver;
+ Dir = FILELIST_DIR;
TXT_FILE_BODY;
- Styles = (ARCHIVE);
- Name = "fontunxppds.zip";
+ Styles = (FILELIST);
+ Name = "psprint_config_fontunxppds.filelist";
End
#endif
@@ -233,10 +233,10 @@ End
#ifdef UNX
File gid_File_Extra_Fontunxpsprint
- Dir = gid_Dir_Psprint;
+ Dir = FILELIST_DIR;
TXT_FILE_BODY;
- Styles = (ARCHIVE, DONT_OVERWRITE, CONFIGFILE);
- Name = "fontunxpsprint.zip";
+ Styles = (FILELIST, DONT_OVERWRITE, CONFIGFILE);
+ Name = "psprint_config_fontunxpsprint.filelist";
End
#endif
More information about the Libreoffice-commits
mailing list