[ooo-build-commit] .: patches/dev300

Fridrich Strba fridrich at kemper.freedesktop.org
Tue Sep 14 07:32:31 PDT 2010


 patches/dev300/apply                          |    1 
 patches/dev300/scp2_extensions_templates.diff |  120 --------------------------
 2 files changed, 121 deletions(-)

New commits:
commit 0b65e31479789c2736f04d6500fac1159b644126
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 14 16:31:48 2010 +0200

    scp2_extensions_templates.diff: migrate to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b52d51e..f859c4d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2421,7 +2421,6 @@ emf+-cppcanvas-input-validation.diff, thorsten
 # hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version
 scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
 
-scp2_extensions_templates.diff
 extensions_configure.diff
 extensions_packinfo.diff
 # Originally, it was for OxygenOffice but the language depended Sun Templates Pack also require this changes
diff --git a/patches/dev300/scp2_extensions_templates.diff b/patches/dev300/scp2_extensions_templates.diff
deleted file mode 100644
index da62ac6..0000000
--- a/patches/dev300/scp2_extensions_templates.diff
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur scp2.old/source/templates/module_langpack_extensions_templates.sct scp2/source/templates/module_langpack_extensions_templates.sct
---- scp2.old/source/templates/module_langpack_extensions_templates.sct	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/templates/module_langpack_extensions_templates.sct	2008-12-19 15:06:20.000000000 +0100
-@@ -0,0 +1,56 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_langpack_extensions_templates.sctp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library 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 for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+Module gid_Module_Optional_Extensions_Sun_T_Pack_Root_<LANGUAGE_>
-+    ParentID = gid_Module_Optional_Extensions_Sun_Template_Pack;
-+    Sortkey = "<SORTKEY>";
-+    Language = "<LANGUAGE>";
-+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-+End
-+
-+Module gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>
-+    ParentID = gid_Module_Optional_Extensions_Sun_T_Pack_Root_<LANGUAGE_>;
-+    Sortkey = "50";
-+    Language = "<LANGUAGE>";
-+    Assigns = gid_Module_Optional_Extensions_Sun_T_Pack_Template;
-+    Name = "gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>";
-+    Description = "gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>";
-+    PackageInfo = "packinfo_office_lang.txt";
-+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-+End
-+
---- scp2.old/source/templates/module_langpack_extensions_lightprrof.sct	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/templates/module_langpack_extensions_lightproof.sct	2008-12-19 15:06:20.000000000 +0100
-@@ -0,0 +1,56 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_langpack_extensions_templates.sctp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library 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 for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+Module gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>
-+    ParentID = gid_Module_Optional_Extensions_LightProof;
-+    Sortkey = "<SORTKEY>";
-+    Language = "<LANGUAGE>";
-+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-+End
-+
-+Module gid_Module_Optional_Extensions_LightProof_M_<LANGUAGE_>
-+    ParentID = gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>;
-+    Sortkey = "50";
-+    Language = "<LANGUAGE>";
-+    Assigns = gid_Module_Optional_Extensions_LightProof_Template;
-+    Name = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
-+    Description = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
-+    PackageInfo = "packinfo_office_lang.txt";
-+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-+End
-+
-


More information about the ooo-build-commit mailing list