[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - configure.in scp2/source

[Bjoern Michaelsen]

 configure.in                          |    6 +++---
 scp2/source/ooo/file_ooo.scp          |    9 +++++++++
 scp2/source/ooo/module_hidden_ooo.scp |    3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit db741827e630518e40006cbf7486bead92820300
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 a3dd222..8e18e8e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1294,6 +1294,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 024ec68..2588b5b 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -713,6 +713,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 03351d7d10f06dbf9fb52343c9f1a360c17ef702
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jan 17 01:13:09 2012 +0100

    add human theme to configure
    
    Conflicts:
    
    	configure.in

diff --git a/configure.in b/configure.in
index 824de63..c66a6c5 100644
--- a/configure.in
+++ b/configure.in
@@ -855,7 +855,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,
@@ -7992,8 +7992,8 @@ fi
 WITH_THEMES=""
 for theme in $with_theme; do
     case $theme in
-        default|crystal|hicontrast|oxygen|tango) : ;;
-        *) AC_MSG_ERROR([Unknown value for --with-themes: $theme]) ;;
+        default|crystal|hicontrast|oxygen|tango|human) : ;;
+        *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
     esac
     WITH_THEMES="$WITH_THEMES $theme"
     SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'`"