[Libreoffice-commits] .: 3 commits - configure.in icon-themes/README

[Matus Kukan]

 configure.in       |    4 ++--
 icon-themes/README |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 2794c1945a5c6921c8ba6a1bdbbe6d67eb8bbd69
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat May 5 14:52:51 2012 +0200

    remove classic theme from configure
    
    If you'd use it, you'd get icons from fallback themes.
    That I consider misleading.
    
    Change-Id: I I Id1d71ef3f2e90f783d03ef8287f53f05ce4aa9a9

diff --git a/configure.in b/configure.in
index ee346e0..209efe6 100644
--- a/configure.in
+++ b/configure.in
@@ -975,7 +975,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: classic, *crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango.]),
+         Possible choices: *crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
@@ -9613,7 +9613,7 @@ fi
 WITH_THEMES=""
 for theme in $with_theme; do
     case $theme in
-        classic|crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango) : ;;
+        crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango) : ;;
         *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
     esac
     WITH_THEMES="$WITH_THEMES $theme"
commit a90d7788a4b9aca4378cd1660293403db3d399ac
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat May 5 14:47:15 2012 +0200

    fix typo
    
    Change-Id: Ie8987092a63e9a3b5d3b94f7ae54fbef98fdfc2c

diff --git a/configure.in b/configure.in
index 7978f2f..ee346e0 100644
--- a/configure.in
+++ b/configure.in
@@ -975,7 +975,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: *classic, crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango.]),
+         Possible choices: classic, *crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
commit cd40f99c8e25c1741e1af34f39705e23fd236708
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat May 5 14:46:37 2012 +0200

    update icon-themes readme
    
    Change-Id: I I54bf0861f3c16d925fa91e8a172d60a5c1ee6a9d

diff --git a/icon-themes/README b/icon-themes/README
index 120c3ab..c252791 100644
--- a/icon-themes/README
+++ b/icon-themes/README
@@ -24,8 +24,7 @@ How to add a new image set:
 
 - Create a directory for it here (let's call it e.g. new_set)
 
-- Add its images_ name to CUSTOM_IMAGE_SETS in
-  postprocess/packimages/pack/makefile.mk
+- Add its name (new_set) to WITH_THEMES variable
 
 - Add its gid to the Files section of gid_Module_Root_Brand in
   scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File entry
@@ -62,5 +61,4 @@ How to add a new image set:
     ULONG StyleSettings::GetCurrentSymbolsStyle() const in
   vcl/source/app/settings.cxx
 
-- The fallback for particular icons is defined in
-    packimages/pack/Makefile
+- The fallback for particular icons is defined in CUSTOM_PREFERRED_FALLBACK_1