[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 5 commits - configure.in download ooo.lst.in scp2/source set_soenv.in
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Sat Aug 27 15:20:06 PDT 2011
configure.in | 19 +++++++++++--------
download | 2 +-
ooo.lst.in | 1 +
scp2/source/extensions/directory_extensions.scp | 5 +++--
scp2/source/extensions/file_extensions.scp | 1 +
set_soenv.in | 1 +
6 files changed, 18 insertions(+), 11 deletions(-)
New commits:
commit 6bf0be067e8da2597013296dae3f4e02866a5064
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Aug 7 19:54:04 2011 +0000
Added Russian language Lightproof module
* Added module
* Remove versioned directories in scp2 module for Lightproof
Signed-off-by: Kalman Szalai - KAMI <kami911 at gmail.com>
diff --git a/configure.in b/configure.in
index 6734290..06505c4 100755
--- a/configure.in
+++ b/configure.in
@@ -7151,7 +7151,7 @@ if test "z$enable_ext_lightproof" = "z" -o "z$enable_ext_lightproof" = "zno" ; t
AC_MSG_RESULT([no integration])
else
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
- lightproof_supported_langs="en-US hu"
+ lightproof_supported_langs="en-US hu ru"
if test "z$enable_ext_lightproof" = "zyes" ; then
wanted_lightproof="$lightproof_supported_langs"
else
@@ -7165,6 +7165,7 @@ else
fi
LIGHTPROOF_LANG=
LIGHTPROOF_HU_PACK=
+ LIGHTPROOF_RU_PACK=
LIGHTPROOF_EN_US_PACK=
# check whether the langs are requested at all
for lang in $wanted_lightproof ; do
@@ -7172,6 +7173,7 @@ else
LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
case $lang in
"hu") LIGHTPROOF_HU_PACK="76345f925e34fef2d29bade4f29108e9-lightproof-hu_1.3.oxt";;
+ "ru") LIGHTPROOF_RU_PACK="673860e8649cff2ebdc68bd46f2f7f1a-lightproof-ru_0.1.oxt";;
"en-US") LIGHTPROOF_EN_US_PACK="0ab55ac8e88f04258f1d3e79e984382f-lightproof-en-US_0.1.oxt";;
esac
fi
@@ -7180,6 +7182,7 @@ else
fi
AC_SUBST(LIGHTPROOF_LANG)
AC_SUBST(LIGHTPROOF_HU_PACK)
+AC_SUBST(LIGHTPROOF_RU_PACK)
AC_SUBST(LIGHTPROOF_EN_US_PACK)
dnl ===================================================================
diff --git a/download b/download
index a322936..8dcf940 100755
--- a/download
+++ b/download
@@ -291,7 +291,7 @@ done
# Extensions copy
echo "Copy extensions to their location ..."
-for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
+for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_RU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
check_file $TARFILE_LOCATION/$pack
packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
diff --git a/ooo.lst.in b/ooo.lst.in
index cbf1fb6..3f87bee 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -102,6 +102,7 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@OOOBLOGGER_EXTENSION_PACK@
@LIGHTPROOF_EN_US_PACK@
@LIGHTPROOF_HU_PACK@
+ at LIGHTPROOF_RU_PACK@
@SUNTEMPLATES_DE_PACK@
@SUNTEMPLATES_EN_US_PACK@
@SUNTEMPLATES_ES_PACK@
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index a36885d..755bcc6 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -100,8 +100,9 @@ End
Directory gid_Brand_Dir_Share_Extensions_LightProof
ParentID = gid_Brand_Dir_Share_Extensions;
- DosName (en-US) = "lightproof-en-US-0.1";
- DosName (hu) = "lightproof-hu-1.2";
+ DosName (en-US) = "lightproof-en-US";
+ DosName (hu) = "lightproof-hu";
+ DosName (ru) = "lightproof-ru";
DosName = "lightproof";
End
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index a2b48ec..d8989d7 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -114,6 +114,7 @@ File gid_File_Oxt_LightProof
Dir = gid_Brand_Dir_Share_Extensions_LightProof;
Name (en-US) = "lightproof-en-US.oxt";
Name (hu) = "lightproof-hu.oxt";
+ Name (ru) = "lightproof-ru.oxt";
End
#endif
diff --git a/set_soenv.in b/set_soenv.in
index 124ae91..e1ac522 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1913,6 +1913,7 @@ ToFile( "SUNTEMPLATES_HU_PACK", "@SUNTEMPLATES_HU_PACK@","e" );
ToFile( "SUNTEMPLATES_IT_PACK", "@SUNTEMPLATES_IT_PACK@","e" );
ToFile( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
+ToFile( "LIGHTPROOF_RU_PACK", "@LIGHTPROOF_RU_PACK@","e" );
ToFile( "LIGHTPROOF_LANG", "@LIGHTPROOF_LANG@", "e" );
ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
ToFile( "WITH_AGFA_MONOTYPE_FONTS", "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
commit 5d3c664b148ddb72f64b45717088dc2b25933bc9
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Aug 7 19:39:46 2011 +0000
Update Google Docs extension to version 3.0.0
Signed-off-by: Kalman Szalai - KAMI <kami911 at gmail.com>
diff --git a/configure.in b/configure.in
index 840509f..6734290 100755
--- a/configure.in
+++ b/configure.in
@@ -7305,7 +7305,7 @@ if test "z$enable_ext_google_docs" = "z" -o "z$enable_ext_google_docs" = "zno" ;
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
- GOOGLE_DOCS_EXTENSION_PACK="dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt"
+ GOOGLE_DOCS_EXTENSION_PACK="31d7e111b1135f14717f21255d933f6e-ooo2gd_3.0.0.oxt"
fi
AC_SUBST(GOOGLE_DOCS_EXTENSION_PACK)
commit 74b02d845439b53ac0eb68eb63fe80aa4b19a6b0
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Aug 7 19:35:10 2011 +0000
Update supported Lightproof versions to the latest available
diff --git a/configure.in b/configure.in
index 32ff3f8..840509f 100755
--- a/configure.in
+++ b/configure.in
@@ -7171,8 +7171,8 @@ else
if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
case $lang in
- "hu") LIGHTPROOF_HU_PACK="324ddcb9ef45c3bc055fcc002bc4e556-lightproof-hu_1.2.oxt";;
- "en-US") LIGHTPROOF_EN_US_PACK="942541da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";;
+ "hu") LIGHTPROOF_HU_PACK="76345f925e34fef2d29bade4f29108e9-lightproof-hu_1.3.oxt";;
+ "en-US") LIGHTPROOF_EN_US_PACK="0ab55ac8e88f04258f1d3e79e984382f-lightproof-en-US_0.1.oxt";;
esac
fi
done
commit 35f952ebfa678dd07a5636b9826a0992c59b5dee
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Aug 28 00:06:37 2011 +0200
Update Diagram extension to SmART Gallery
* SmART Gallery is the new version of Diagram extension (aka. Diagram 2)
diff --git a/configure.in b/configure.in
index 958f8f1..32ff3f8 100755
--- a/configure.in
+++ b/configure.in
@@ -7197,16 +7197,16 @@ fi
AC_SUBST(WATCH_WINDOW_EXTENSION_PACK)
dnl ===================================================================
-dnl Test whether to include Diagram extension
+dnl Test whether to include SmART Gallery (Diagram) extension
dnl ===================================================================
-AC_MSG_CHECKING([for Diagram extension integration])
+AC_MSG_CHECKING([for SmART Gallery (Diagram) extension integration])
if test "z$enable_ext_diagram" = "z" -o "z$enable_ext_diagram" = "zno" ; then
AC_MSG_RESULT([no])
DIAGRAM_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
- DIAGRAM_EXTENSION_PACK="41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt"
+ DIAGRAM_EXTENSION_PACK="DIAGRAM_EXTENSION_PACK="4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt"
fi
AC_SUBST(DIAGRAM_EXTENSION_PACK)
commit 1c1c427a53c3e210a396ed45af18d2fff721a25a
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Aug 7 18:04:15 2011 +0000
Update Diagram extension to SmART Gallery
* SmART Gallery is the new version of Diagram extension (aka. Diagram 2)
Signed-off-by: Kalman Szalai - KAMI <kami911 at gmail.com>
diff --git a/configure.in b/configure.in
index 0d3a1cb..958f8f1 100755
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_ARG_ENABLE(ext-barcode,
AC_ARG_ENABLE(ext-diagram,
AS_HELP_STRING([--enable-ext-diagram],
- [Enables the Diagram extension.]),
+ [Enables the SmART Gallery (Diagram) extension.]),
,)
AC_ARG_ENABLE(ext-google-docs,
More information about the Libreoffice-commits
mailing list