[Libreoffice-commits] .: 3 commits - configure.in sal/StaticLibrary_salcpprt.mk scp2/source

[Bjoern Michaelsen]

 configure.in                          |    4 ++--
 sal/StaticLibrary_salcpprt.mk         |    5 ++++-
 scp2/source/ooo/file_ooo.scp          |    9 +++++++++
 scp2/source/ooo/module_hidden_ooo.scp |    3 +++
 4 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 3c1ddd4de187363cf1c3f14c43b4a2c66b1de6d6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jan 17 01:16:32 2012 +0100

    add human theme to packaging

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5263c11..cae313a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1295,6 +1295,15 @@ File gid_File_ImagesTango_Zip
 End
 #endif
 
+#ifdef THEME_HUMAN
+File gid_File_ImagesHuman_Zip
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Config;
+    Name = "images_human.zip";
+    Styles = (PACKED);
+End
+#endif
+
 File gid_File_Share_Registry_Lingucomponent_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 867677d..67499de 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -711,6 +711,9 @@ Module gid_Module_Root_Files_Images
 #ifdef THEME_HICONTRAST
              gid_File_ImagesHicontrast_Zip,
 #endif
+#ifdef THEME_HUMAN
+             gid_File_ImagesHuman_Zip,
+#endif
 #ifdef THEME_TANGO
              gid_File_ImagesTango_Zip
 #endif
commit f8766b4c489e5fb7101ae71fbe41fceaff88f941
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jan 17 01:13:09 2012 +0100

    add human theme to configure

diff --git a/configure.in b/configure.in
index 20411f3..251cfa8 100644
--- a/configure.in
+++ b/configure.in
@@ -882,7 +882,7 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_WITH(theme,
     AS_HELP_STRING([--with-theme="theme1 theme2..."],
         [Choose which themes to include. By default those themes with an '*' are included.
-         Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+         Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial, human.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
@@ -8753,7 +8753,7 @@ fi
 WITH_THEMES=""
 for theme in $with_theme; do
     case $theme in
-        default|crystal|hicontrast|oxygen|tango) : ;;
+        default|crystal|hicontrast|oxygen|tango|human) : ;;
         *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
     esac
     WITH_THEMES="$WITH_THEMES $theme"
commit 605b8a0bc0201ea0bb07190a57213236dd009216
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jan 17 01:09:48 2012 +0100

    salcpprt also uses headers from sal_inc

diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 65bd100..2286e6c 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -27,7 +27,10 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,sal_generated))
+$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\
+        sal_generated \
+        sal_inc \
+))
 
 $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
 	$(LFS_CFLAGS) \