Adding upstream version 0.5.0. upstream/0.5.0
authorDaniel Baumann <daniel@debian.org>
Tue, 17 Apr 2012 08:10:55 +0000 (08:10 +0000)
committerDaniel Baumann <daniel@debian.org>
Tue, 17 Apr 2012 08:10:55 +0000 (08:10 +0000)
35 files changed:
Makefile.in
aclocal.m4
autogen.sh [deleted file]
configure
configure.ac
icon-migrate2.py [deleted file]
install-sh
legacy-icon-mapping.xml [deleted file]
missing
nuoveXT2/128x128/emblems/placeholder [new file with mode: 0644]
nuoveXT2/128x128/emotes/placeholder [new file with mode: 0644]
nuoveXT2/128x128/filesystems/placeholder [new file with mode: 0644]
nuoveXT2/16x16/emblems/placeholder [new file with mode: 0644]
nuoveXT2/16x16/emotes/placeholder [new file with mode: 0644]
nuoveXT2/16x16/filesystems/placeholder [new file with mode: 0644]
nuoveXT2/22x22/emblems/placeholder [new file with mode: 0644]
nuoveXT2/22x22/emotes/placeholder [new file with mode: 0644]
nuoveXT2/22x22/filesystems/placeholder [new file with mode: 0644]
nuoveXT2/24x24/emblems/placeholder [new file with mode: 0644]
nuoveXT2/24x24/emotes/placeholder [new file with mode: 0644]
nuoveXT2/24x24/filesystems/placeholder [new file with mode: 0644]
nuoveXT2/32x32/emblems/placeholder [new file with mode: 0644]
nuoveXT2/32x32/emotes/placeholder [new file with mode: 0644]
nuoveXT2/32x32/filesystems/placeholder [new file with mode: 0644]
nuoveXT2/36x36/emblems/placeholder [new file with mode: 0644]
nuoveXT2/36x36/emotes/placeholder [new file with mode: 0644]
nuoveXT2/36x36/filesystems/placeholder [new file with mode: 0644]
nuoveXT2/48x48/emblems/placeholder [new file with mode: 0644]
nuoveXT2/48x48/emotes/placeholder [new file with mode: 0644]
nuoveXT2/48x48/filesystems/placeholder [new file with mode: 0644]
nuoveXT2/64x64/emblems/placeholder [new file with mode: 0644]
nuoveXT2/64x64/emotes/placeholder [new file with mode: 0644]
nuoveXT2/64x64/filesystems/placeholder [new file with mode: 0644]
nuoveXT2/72x72/filesystems/.gitignore [new file with mode: 0644]
nuoveXT2/96x96/filesystems/.gitignore [new file with mode: 0644]

index e6b1df8..d4a066e 100644 (file)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -50,12 +50,16 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.bz2
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -134,7 +138,7 @@ EXTRA_DIST = AUTHORS COPYING
 all: all-am
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
        @:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
        @for dep in $?; do \
@@ -211,7 +215,8 @@ distdir: $(DISTFILES)
          top_distdir="$(top_distdir)" distdir="$(distdir)" \
          dist-hook
        -test -n "$(am__skip_mode_fix)" \
-       || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+       || find "$(distdir)" -type d ! -perm -755 \
+               -exec chmod u+rwx,go+rx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -220,7 +225,11 @@ dist-gzip: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
        $(am__remove_distdir)
 dist-bzip2: distdir
-       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+       tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+       $(am__remove_distdir)
+
+dist-lzip: distdir
+       tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
        $(am__remove_distdir)
 
 dist-lzma: distdir
@@ -228,7 +237,7 @@ dist-lzma: distdir
        $(am__remove_distdir)
 
 dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+       tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
        $(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -245,7 +254,7 @@ dist-zip: distdir
        $(am__remove_distdir)
 
 dist dist-all: distdir
-       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+       tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
        $(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -254,17 +263,19 @@ dist dist-all: distdir
 distcheck: dist
        case '$(DIST_ARCHIVES)' in \
        *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
-         bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
        *.tar.lzma*) \
-         unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+       *.tar.lz*) \
+         lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
        *.tar.xz*) \
          xz -dc $(distdir).tar.xz | $(am__untar) ;;\
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
        *.zip*) \
          unzip $(distdir).zip ;;\
        esac
@@ -278,6 +289,7 @@ distcheck: dist
          && am__cwd=`pwd` \
          && $(am__cd) $(distdir)/_build \
          && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+           $(AM_DISTCHECK_CONFIGURE_FLAGS) \
            $(DISTCHECK_CONFIGURE_FLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -306,8 +318,16 @@ distcheck: dist
          list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
          sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-       @$(am__cd) '$(distuninstallcheck_dir)' \
-       && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+       @test -n '$(distuninstallcheck_dir)' || { \
+         echo 'ERROR: trying to run $@ with an empty' \
+              '$$(distuninstallcheck_dir)' >&2; \
+         exit 1; \
+       }; \
+       $(am__cd) '$(distuninstallcheck_dir)' || { \
+         echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+         exit 1; \
+       }; \
+       test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
           || { echo "ERROR: files left after uninstall:" ; \
                if test -n "$(DESTDIR)"; then \
                  echo "  (check DESTDIR support)"; \
@@ -337,10 +357,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+       if test -z '$(STRIP)'; then \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+             install; \
+       else \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+       fi
 mostlyclean-generic:
 
 clean-generic:
@@ -426,8 +451,8 @@ uninstall-am:
 .MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: all all-am am--refresh check check-am clean clean-generic dist \
-       dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
-       dist-tarZ dist-xz dist-zip distcheck distclean \
+       dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \
+       dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
        distclean-generic distcleancheck distdir distuninstallcheck \
        dvi dvi-am html html-am info info-am install install-am \
        install-data install-data-am install-data-hook install-dvi \
index 99803da..a7076bb 100644 (file)
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -247,12 +253,15 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -332,12 +341,15 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -360,13 +372,14 @@ esac
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -374,13 +387,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -456,12 +469,14 @@ Check your system clock])
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -484,13 +499,13 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -499,13 +514,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -527,10 +542,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755 (executable)
index 8224641..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-AC_VERSION=
-
-AUTOMAKE=${AUTOMAKE:-automake}
-AM_INSTALLED_VERSION=$($AUTOMAKE --version | sed -e '2,$ d' -e 's/.* \([0-9]*\.[0-9]*\).*/\1/')
-
-if [ "$AM_INSTALLED_VERSION" != "1.10" \
-    -a "$AM_INSTALLED_VERSION" != "1.11" ];then
-       echo
-       echo "You must have automake > 1.10 or 1.11 installed to compile lxde-common."
-       echo "Install the appropriate package for your distribution,"
-       echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
-       exit 1
-fi
-
-set -x
-
-if [ "x${ACLOCAL_DIR}" != "x" ]; then
-  ACLOCAL_ARG=-I ${ACLOCAL_DIR}
-fi
-
-${ACLOCAL:-aclocal$AM_VERSION} ${ACLOCAL_ARG}
-$AUTOMAKE --add-missing --copy --include-deps
-${AUTOCONF:-autoconf$AC_VERSION}
-
-rm -rf autom4te.cache
index 6e5eb75..1aef5d2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,11 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for lxde-icon-theme 0.0.1.
+# Generated by GNU Autoconf 2.68 for lxde-icon-theme 0.5.0.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
 #
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -87,6 +89,7 @@ fi
 IFS=" ""       $as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -211,11 +214,18 @@ IFS=$as_save_IFS
   # We cannot yet assume a decent shell, so we have to provide a
        # neutralization value for shells without unset; and this also
        # works around shells that cannot unset nonexistent variables.
+       # Preserve -v and -x to the replacement shell.
        BASH_ENV=/dev/null
        ENV=/dev/null
        (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
        export CONFIG_SHELL
-       exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+       case $- in # ((((
+         *v*x* | *x*v* ) as_opts=-vx ;;
+         *v* ) as_opts=-v ;;
+         *x* ) as_opts=-x ;;
+         * ) as_opts= ;;
+       esac
+       exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -313,7 +323,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -353,19 +363,19 @@ else
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -523,10 +533,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -545,8 +556,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='lxde-icon-theme'
 PACKAGE_TARNAME='lxde-icon-theme'
-PACKAGE_VERSION='0.0.1'
-PACKAGE_STRING='lxde-icon-theme 0.0.1'
+PACKAGE_VERSION='0.5.0'
+PACKAGE_STRING='lxde-icon-theme 0.5.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -683,8 +694,9 @@ do
   fi
 
   case $ac_option in
-  *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)   ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -729,7 +741,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -755,7 +767,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -959,7 +971,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -975,7 +987,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1005,8 +1017,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1014,7 +1026,7 @@ Try \`$0 --help' for more information."
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1024,7 +1036,7 @@ Try \`$0 --help' for more information."
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1032,13 +1044,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1061,7 +1073,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1075,8 +1087,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1091,9 +1103,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1132,11 +1144,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-       cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+       cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
        pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1162,7 +1174,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures lxde-icon-theme 0.0.1 to adapt to many kinds of systems.
+\`configure' configures lxde-icon-theme 0.5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1176,7 +1188,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1228,7 +1240,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of lxde-icon-theme 0.0.1:";;
+     short | recursive ) echo "Configuration of lxde-icon-theme 0.5.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1295,10 +1307,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-lxde-icon-theme configure 0.0.1
-generated by GNU Autoconf 2.64
+lxde-icon-theme configure 0.5.0
+generated by GNU Autoconf 2.68
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1312,8 +1324,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by lxde-icon-theme $as_me 0.0.1, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+It was created by lxde-icon-theme $as_me 0.5.0, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -1423,11 +1435,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1461,11 +1471,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1478,11 +1486,9 @@ _ASBOX
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1496,11 +1502,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1555,7 +1559,12 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1566,18 +1575,22 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -1646,7 +1659,7 @@ if $ac_cache_corrupted; then
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -1663,16 +1676,22 @@ am__api_version='1.11'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1701,7 +1720,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1788,11 +1807,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \    ]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -1814,7 +1833,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -1824,7 +1843,7 @@ then
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -1878,7 +1897,7 @@ if test "$cross_compiling" != no; then
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -1918,7 +1937,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -1971,7 +1990,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1996,6 +2015,7 @@ IFS=$as_save_IFS
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2003,7 +2023,6 @@ fi
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
@@ -2022,7 +2041,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2062,7 +2081,7 @@ done
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2070,7 +2089,7 @@ SHELL = /bin/sh
 all:
        @echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2104,7 +2123,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2120,7 +2139,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='lxde-icon-theme'
- VERSION='0.0.1'
+ VERSION='0.5.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2150,11 +2169,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -2241,10 +2260,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+       cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+         mv -f confcache "$cache_file"$$ &&
+         mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+         mv -f confcache "$cache_file" ;;
+       esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -2296,6 +2326,7 @@ DEFS=`sed -n "$ac_script" confdefs.h`
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -2312,7 +2343,7 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -2413,6 +2444,7 @@ fi
 IFS=" ""       $as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2458,19 +2490,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -2666,7 +2698,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -2719,8 +2751,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by lxde-icon-theme $as_me 0.0.1, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+This file was extended by lxde-icon-theme $as_me 0.5.0, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2755,6 +2787,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -2769,12 +2802,13 @@ Report bugs to the package provider."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-lxde-icon-theme config.status 0.0.1
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+lxde-icon-theme config.status 0.5.0
+configured by $0, generated by GNU Autoconf 2.68,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -2792,11 +2826,16 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -2810,12 +2849,15 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -2826,7 +2868,7 @@ do
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -2877,7 +2919,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -2898,9 +2940,10 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -2908,12 +2951,13 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -2930,12 +2974,12 @@ if test "x$ac_cr" = x; then
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -2944,18 +2988,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -2963,7 +3007,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -2977,7 +3021,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -2991,7 +3035,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -3011,7 +3055,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = "\a"
 
@@ -3043,21 +3087,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[         ]*VPATH[        ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[    ]*\):*/\1/
+  ac_vpsub='/^[         ]*VPATH[        ]*=[    ]*/{
+h
+s///
+s/^/:/
+s/[     ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[  ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[      ]*$//
 }'
 fi
@@ -3075,7 +3127,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -3094,7 +3146,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
         # (if the path is not absolute).  The absolute path cannot be DOS-style,
         # because $ac_f cannot contain `:'.
@@ -3103,7 +3155,7 @@ do
           [\\/$]*) false;;
           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
           esac ||
-          as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+          as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -3129,8 +3181,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -3266,23 +3318,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
 
 
@@ -3297,7 +3350,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -3318,11 +3371,10 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-
index 15ff442..2c90af0 100644 (file)
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT(lxde-icon-theme,[0.0.1], [],lxde-icon-theme)
+AC_INIT(lxde-icon-theme,[0.5.0], [],lxde-icon-theme)
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 dnl AC_PROG_INTLTOOL(, [no-xml])
 dnl AM_MAINTAINER_MODE
@@ -11,4 +11,3 @@ AC_PROG_LN_S
 AC_OUTPUT([
   Makefile
 ])
-
diff --git a/icon-migrate2.py b/icon-migrate2.py
deleted file mode 100755 (executable)
index 93c4e27..0000000
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/usr/bin/env python
-#
-#       icon-migrate.py
-#       
-#       Copyright 2009 PCMan <pcman.tw@gmail.com>
-#       
-#       This program is free software; you can redistribute it and/or modify
-#       it under the terms of the GNU General Public License as published by
-#       the Free Software Foundation; either version 2 of the License, or
-#       (at your option) any later version.
-#       
-#       This program 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 General Public License for more details.
-#       
-#       You should have received a copy of the GNU General Public License
-#       along with this program; if not, write to the Free Software
-#       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-#       MA 02110-1301, USA.
-
-import xml.dom.minidom, os, sys, os.path, shutil
-from ConfigParser import *
-import filecmp
-import pygtk
-import gtk
-
-icon_theme_dir = ''
-size_dirs = []
-contexts = []
-
-all_mappings=[]
-
-subdirs = None
-
-exts = ['.png', '.svg', '.xpm']
-
-class Mapping:
-    def __init__(self, xml_icon_node):
-        self.new_name = xml_icon_node.getAttribute('name')
-        self.old_names = []
-        links = xml_icon_node.getElementsByTagName('link')
-        for link in links:
-            self.old_names.append(link.childNodes[0].data)
-
-class Context:
-    def __init__(self, xml_context_node):
-        self.name = xml_context_node.getAttribute('dir')
-        self.mappings = []
-        icon_nodes = xml_context_node.getElementsByTagName('icon')
-        for icon_node in icon_nodes:
-            mapping = Mapping(icon_node)
-            self.mappings.append(mapping)
-
-
-def find_icon_file_in_context_dir(context_dir, icon_name):
-    prefix = os.path.join(context_dir, icon_name)
-    for ext in exts:
-        file = prefix + ext
-        if os.path.exists(file):
-            return file
-    return None
-
-def find_icon_file_in_all_contexts(icon_name):
-    for size_dir in size_dirs:
-        sub_dirs = os.listdir(size_dir)
-        for sub_dir in sub_dirs:
-            if sub_dir[0] == '.':
-                continue
-            full_dir_name = os.path.join(size_dir, sub_dir)
-            ret = find_icon_file_in_context_dir(full_dir_name, icon_name)
-            if ret:
-                return ret
-    return None
-
-def replace_link_with_real_file(file):
-    real_path = os.path.realpath(file)
-    os.unlink(file)
-    shutil.copy2(real_path, file)
-    print 'convert link to real file => copy %s to %s' % (real_path, file)
-
-
-def convert_links_to_copies():
-    for size in sizes:
-        dirs = sizes[size]
-        for dir in dirs: # dirs of different contexts
-            dir = os.path.join(icon_theme_dir, dir)
-            files = os.listdir(dir)
-            for file in files:
-                for ext in exts:
-                    if file.endswith(ext): # it's an image file
-                        if os.path.islink(file):
-                            replace_link_with_real_file(file)
-                        break
-
-def is_icon_new_name(icon_name):
-    for context in contexts:
-        for mapping in context.mappings:
-            if mapping.new_name == icon_name:
-                return True
-    return False
-
-def convert_duplicated_files_to_symlinks():
-    # find duplicated files with fdupes
-    os.system( 'fdupes --nohidden -r nuoveXT2 > dups.txt' )
-    files = []
-    links = []
-
-    print '\n\n--- svn commands ---\n'
-
-    f = open( 'dups.txt', 'r' )
-    for line in f:
-        file = line.rstrip()
-        if file != '':
-            files.append(file)
-        else:
-            if len(files) == 0:
-                continue
-
-            files.sort( lambda x, y:len(x)-len(y) )
-
-            primary = ''
-            for file in files:
-                # if the file has a valid new name,
-                # symlink other duplicates to it
-                basename = os.path.basename(file)
-                (icon_name, ext) = os.path.splitext(basename)
-                # print 'is_icon_new_name %s' % icon_name
-                if is_icon_new_name(icon_name):
-                    primary = file
-                    break
-            if primary == '':
-                primary = files[0]
-            print 'svn --force add %s' % primary
-
-            for file in files:
-                if file != primary:
-                    # os.path.unlink(file)
-
-                    print 'svn --force rm %s' % file
-                    dir = os.path.dirname(file)
-                    rel_path = os.path.relpath(primary, dir)
-                    # os.path.symlink(rel_path, file)
-
-                    links.append( (rel_path, file) )
-                    # print 'need to symlink(%s %s)' % (rel_path, file)
-
-            files = []
-
-    print '---------- symlinks ------------'
-    for link in links:
-        print '$(LN_S) -f %s $(DESTDIR)$(datadir)/icons/%s' % (link[0], link[1])
-
-
-def find_icon_file_in_dir(dir, icon_name):
-    for ext in exts: # try .png, .svg, and .xpm
-        base_name = icon_name + ext
-        fpath=os.path.join(dir, base_name)
-        if os.path.exists(fpath):
-            return fpath, ext
-    return None, None
-
-symlinks=[]
-files_to_del=[]
-
-sizes = {}
-
-def choose_icon(new_name, icons):
-    dlg=gtk.Dialog()
-    dlg.vbox.add(gtk.Label('Choose an icon for %s' % new_name))
-    idx = 0
-    for icon in icons:
-        btn = gtk.Button(icon[0])
-        btn.set_image(gtk.image_new_from_file(icon[0]))
-        btn.connect('clicked', lambda btn, dlg, idx: dlg.response(idx), dlg, idx)
-        idx = idx + 1
-        dlg.vbox.add(btn)
-    dlg.show_all()
-    ret = dlg.run()
-    dlg.destroy()
-    return ret if ret >= 0 else -1
-
-def find_icon_file_of_size(size, icon_name):
-    subdirs=sizes[size]
-    for sizedir in subdirs:
-        dir = os.path.join(icon_theme_dir, sizedir)
-        filename, ext = find_icon_file_in_dir(dir, icon_name)
-        if filename:
-            return filename, ext
-    return None, None
-
-def fix_icons_of_specified_size(size, subdir, mappings):
-    print 'fix icons in %s of size %d' % (subdir, size)
-    for mapping in mappings:
-        print 'new_name: %s, %s', (subdir, mapping.new_name)
-        dir = os.path.join(icon_theme_dir, subdir)
-        (fpath, ext) = find_icon_file_in_dir(dir, mapping.new_name)
-        if not fpath: # icon with new_name is not found, choose one icon from old_names
-            choices=[]
-            for old_name in mapping.old_names:
-                for subdir2 in sizes[size]:
-                    dir = os.path.join(icon_theme_dir, subdir2)
-                    (fpath2, ext2) = find_icon_file_in_dir(dir, old_name)
-                    if fpath2:
-                        choices.append((fpath2, ext2))
-            if not choices:
-                print '%s is missing, need a new icon for it' % mapping.new_name
-            elif len(choices) == 1:
-                (fpath2, ext2) = choices[0]
-                fpath = os.path.join(icon_theme_dir, subdir, (mapping.new_name + ext2))
-                # copy old file name to new one
-                shutil.copy2(fpath2, fpath)
-                # print 'ls -s %s to %s' % (fpath, fpath2) # auto-choice
-                # rel = os.path.relpath(fpath, os.path.dirname(fpath2))
-                # symlinks.append((rel, fpath2))
-            else:
-                same = True
-                for i in range(len(choices) - 1):
-                    # different file extensions
-                    if choices[i][1] != choices[i+1][1]:
-                        same = False
-                        break
-                    # different file content
-                    if not filecmp.cmp(choices[i][0], choices[i+1][0], False):
-                        same = False
-                        break
-                if same: # they are actually the same image, can auto-choose
-                    (fpath2, ext2) = choices[0]
-                    fpath = os.path.join(icon_theme_dir, subdir, (mapping.new_name + ext2))
-                    # copy old file name to new one
-                    shutil.copy2(fpath2, fpath)
-                    # print 'same img, symlink %s to %s' % (fpath, fpath2) # auto-choice
-                    # rel = os.path.relpath(fpath, os.path.dirname(fpath2))
-                    # symlinks.append((rel, fpath2))
-                else:
-                    print 'choices:', choices
-                    ret = choose_icon(mapping.new_name, choices)
-                    if ret >=0:
-                        fpath = os.path.join(icon_theme_dir, subdir, (mapping.new_name + choices[ret][1]))
-                        shutil.copy2(choices[ret][0], fpath)
-                    else:
-                        print '%s is missing, need a new icon for it' % mapping.new_name
-        else:
-            print '%s is found: %s' % (mapping.new_name, fpath)
-            # create symlinks for old_names if they don't exist
-            for old_name in mapping.old_names:
-                # print 'find oldname:', old_name
-                (fpath2, ext2) = find_icon_file_of_size(size, old_name)
-                if not fpath2:
-                    fpath2 = os.path.join(os.path.dirname(fpath), old_name + ext)
-                    print 'copy newname to oldname: %s => %s' % (fpath, fpath2)
-                    shutil.copy2(fpath, fpath2)
-
-# ----------------------------------------------------------------
-# start
-
-if len(sys.argv) < 2:
-    sys.exit()
-
-icon_theme_dir = sys.argv[1]
-cfg = SafeConfigParser()
-cfg.read(os.path.join(icon_theme_dir, 'index.theme'))
-subdirs = cfg.get('Icon Theme', 'Directories').split(',')
-
-for subdir in subdirs:
-    size=cfg.getint(subdir, 'Size')
-    if size in sizes:
-        sizes[size].append(subdir)
-    else:
-        l=[]
-        l.append(subdir)
-        sizes[size] = l
-
-sizes.keys().sort()
-
-# load the mappings
-doc = xml.dom.minidom.parse('legacy-icon-mapping.xml')
-context_nodes = doc.getElementsByTagName('context')
-for context_node in context_nodes:
-    context = Context(context_node)
-    contexts.append(context)
-
-# create a flat list of all available mappings
-for ctx in contexts:
-    for mapping in ctx.mappings:
-        all_mappings.append(mapping)
-
-# convert symlinks to real files
-convert_links_to_copies()
-# now, there is no symlink under the icon theme dir
-
-for size in sizes:
-    print 'for size: %d' % size
-    # all sub dirs containing icons of specified size
-    subdirs = sizes[size]
-
-    for ctx in contexts:
-        sub = None
-        # find subdir corresponding speficied context
-        for subdir in subdirs:
-            ctx_dirname = os.path.basename(subdir)
-            if ctx_dirname == ctx.name:
-                sub = subdir
-                print 'sub: %s' % sub
-                break
-        if not sub:
-            sub = ctx.name
-            print 'missing context: %s' % sub
-
-        fix_icons_of_specified_size(size, sub, ctx.mappings)
-
-
-print '\n\n--------------------symlinks----------------------\n\n'
-
-convert_duplicated_files_to_symlinks()
index 6781b98..a9244eb 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+       # Protect names problematic for `test' and other utilities.
+       case $dst_arg in
+         -* | [=\(\)!]) dst_arg=./$dst_arg;;
+       esac
        shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@ do
 
       case $dstdir in
        /*) prefix='/';;
-       -*) prefix='./';;
+       [-=\(\)!]*) prefix='./';;
        *)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@ do
 
       for d
       do
-       test -z "$d" && continue
+       test X"$d" = X && continue
 
        prefix=$prefix$d
        if test -d "$prefix"; then
diff --git a/legacy-icon-mapping.xml b/legacy-icon-mapping.xml
deleted file mode 100644 (file)
index fddc6d7..0000000
+++ /dev/null
@@ -1,1238 +0,0 @@
-<?xml version="1.0" standalone="yes" ?>
-<!DOCTYPE mapping SYSTEM "legacy-icon-mapping.dtd">
-
-<mapping>
-    <context dir="actions">
-       <icon name="address-book-new">
-           <link>stock_new-address-book</link>
-       </icon>
-       <icon name="application-exit">
-           <link>stock_exit</link>
-           <link>gtk-quit</link>
-           <link>exit</link>
-           <link>xfce-system-exit</link>
-       </icon>
-       <icon name="appointment-new">
-           <link>stock_new-appointment</link>
-           <link>appointment</link>
-       </icon>
-       <icon name="bookmark-new">
-           <link>stock_add-bookmark</link>
-           <link>stock_help-add-bookmark</link>
-           <link>bookmark_add</link>
-           <link>bookmarks_list_add</link>
-       </icon>
-       <icon name="contact-new">
-           <link>stock_new-bcard</link>
-       </icon>
-       <icon name="dialog-cancel">
-           <link>gtk-cancel</link>
-           <link>button_cancel</link>
-           <link>cancel</link>
-       </icon>
-       <icon name="document-new">
-           <link>gtk-new</link>
-           <link>stock_new-text</link>
-           <link>filenew</link>
-       </icon>
-       <icon name="document-open">
-           <link>gtk-open</link>
-           <link>fileopen</link>
-       </icon>
-       <icon name="document-page-setup">
-           <link>stock_print-setup</link>
-       </icon>
-       <icon name="document-print">
-           <link>gtk-print</link>
-           <link>stock_print</link>
-           <link>fileprint</link>
-       </icon>
-       <icon name="document-print-preview">
-           <link>gtk-print-preview</link>
-           <link>stock_print-preview</link>
-           <link>filequickprint</link>
-       </icon>
-       <icon name="document-properties">
-           <link>gtk-properties</link>
-           <link>stock_properties</link>
-           <link>stock_file-properites</link>
-       </icon>
-       <icon name="document-revert">
-           <link>gtk-revert-to-saved-ltr</link>
-           <link>gtk-revert-to-saved-rtl</link>
-           <link>revert</link>
-       </icon>
-       <icon name="document-save">
-           <link>gtk-save</link>
-           <link>stock_save</link>
-           <link>filesave</link>
-       </icon>
-       <icon name="document-save-as">
-           <link>gtk-save-as</link>
-           <link>stock_save-as</link>
-           <link>filesaveas</link>
-       </icon>
-       <icon name="edit-clear">
-           <link>gtk-clear</link>
-           <link>editclear</link>
-       </icon>
-       <icon name="edit-copy">
-           <link>gtk-copy</link>
-           <link>stock_copy</link>
-           <link>editcopy</link>
-       </icon>
-       <icon name="edit-cut">
-           <link>gtk-cut</link>
-           <link>stock_cut</link>
-           <link>editcut</link>
-       </icon>
-       <icon name="edit-delete">
-           <link>gtk-delete</link>
-           <link>stock_delete</link>
-           <link>editdelete</link>
-       </icon>
-       <icon name="edit-find">
-           <link>gtk-find</link>
-           <link>stock_search</link>
-           <link>filefind</link>
-           <link>find</link>
-       </icon>
-       <icon name="edit-find-replace">
-           <link>gtk-find-and-replace</link>
-           <link>stock_search-and-replace</link>
-       </icon>
-       <icon name="edit-paste">
-           <link>gtk-paste</link>
-           <link>stock_paste</link>
-           <link>editpaste</link>
-       </icon>
-       <icon name="edit-redo">
-           <link>gtk-redo-ltr</link>
-           <link>stock_redo</link>
-           <link>redo</link>
-       </icon>
-       <icon name="edit-select-all">
-           <link>gtk-select-all</link>
-           <link>stock_select-all</link>
-       </icon>
-       <icon name="edit-undo">
-           <link>gtk-undo-ltr</link>
-           <link>stock_undo</link>
-           <link>undo</link>
-       </icon>
-       <icon name="folder-new">
-           <link>stock_new-dir</link>
-           <link>folder_new</link>
-       </icon>
-       <icon name="format-indent-less">
-           <link>gtk-indent-rtl</link>
-           <link>gtk-unindent-ltr</link>
-           <link>stock_text_unindent</link>
-           <link>gnome-stock-text-unindent</link>
-       </icon>
-       <icon name="format-indent-more">
-           <link>gtk-indent-ltr</link>
-           <link>gtk-unindent-rtl</link>
-           <link>stock_text_indent</link>
-           <link>gnome-stock-text-indent</link>
-       </icon>
-       <icon name="format-justify-center">
-           <link>gtk-justify-center</link>
-           <link>stock_text_center</link>
-           <link>centrejust</link>
-       </icon>
-       <icon name="format-justify-fill">
-           <link>gtk-justify-fill</link>
-           <link>stock_text_justify</link>
-       </icon>
-       <icon name="format-justify-left">
-           <link>gtk-justify-left</link>
-           <link>stock_text_left</link>
-           <link>leftjust</link>
-       </icon>
-       <icon name="format-justify-right">
-           <link>gtk-justify-right</link>
-           <link>stock_text_right</link>
-           <link>rightjust</link>
-       </icon>
-       <icon name="format-text-bold">
-           <link>gtk-bold</link>
-           <link>stock_text_bold</link>
-           <link>text_bold</link>
-       </icon>
-       <icon name="format-text-italic">
-           <link>gtk-italic</link>
-           <link>stock_text_italic</link>
-           <link>text_italic</link>
-       </icon>
-       <icon name="format-text-strikethrough">
-           <link>gtk-strikethrough</link>
-           <link>stock_text-strikethrough</link>
-           <link>text_strike</link>
-       </icon>
-       <icon name="format-text-underline">
-           <link>gtk-underline</link>
-           <link>stock_text_underlined</link>
-           <link>text_under</link>
-       </icon>
-       <icon name="go-bottom">
-           <link>gtk-goto-bottom</link>
-           <link>stock_bottom</link>
-           <link>bottom</link>
-       </icon>
-       <icon name="go-down">
-           <link>gtk-go-down</link>
-           <link>stock_down</link>
-           <link>down</link>
-       </icon>
-       <icon name="go-first">
-           <link>gtk-goto-first-ltr</link>
-           <link>gtk-goto-last-rtl</link>
-           <link>stock_first</link>
-           <link>start</link>
-       </icon>
-       <icon name="go-home">
-           <link>gtk-home</link>
-           <link>stock_home</link>
-           <link>gohome</link>
-           <link>kfm_home</link>
-           <link>redhat-home</link>
-       </icon>
-       <icon name="go-jump">
-           <link>gtk-jump-to-ltr</link>
-           <link>gtk-jump-to-rtl</link>
-       </icon>
-       <icon name="go-last">
-           <link>gtk-goto-last-ltr</link>
-           <link>gtk-goto-first-rtl</link>
-           <link>stock_last</link>
-           <link>finish</link>
-       </icon>
-       <icon name="go-next">
-           <link>gtk-go-forward-ltr</link>
-           <link>gtk-go-back-rtl</link>
-           <link>stock_right</link>
-           <link>forward</link>
-           <link>next</link>
-       </icon>
-       <icon name="go-previous">
-           <link>gtk-go-back-ltr</link>
-           <link>gtk-go-forward-rtl</link>
-           <link>stock_left</link>
-           <link>back</link>
-           <link>previous</link>
-       </icon>
-       <icon name="go-top">
-           <link>gtk-goto-top</link>
-           <link>stock_top</link>
-           <link>top</link>
-       </icon>
-       <icon name="go-up">
-           <link>gtk-go-up</link>
-           <link>stock_up</link>
-           <link>up</link>
-       </icon>
-       <icon name="help-about">
-           <link>gtk-about</link>
-           <link>stock_about</link>
-       </icon>
-       <icon name="help-contents">
-           <link>gtk-help</link>
-           <link>stock_help</link>
-           <link>help</link>
-       </icon>
-       <icon name="list-add">
-           <link>gtk-add</link>
-           <link>add</link>
-       </icon>
-       <icon name="list-remove">
-           <link>gtk-remove</link>
-           <link>remove</link>
-       </icon>
-       <icon name="mail-forward">
-           <link>gnome-stock-mail-fwd</link>
-           <link>stock_mail-forward</link>
-           <link>mail_forward</link>
-       </icon>
-       <icon name="mail-mark-junk">
-           <link>stock_spam</link>
-           <link>mail_spam</link>
-       </icon>
-       <icon name="mail-mark-not-junk">
-           <link>stock_not-spam</link>
-       </icon>
-       <icon name="mail-message-new">
-           <link>stock_mail-compose</link>
-           <link>gnome-stock-mail-new</link>
-           <link>mail_new</link>
-       </icon>
-       <icon name="mail-reply-all">
-           <link>stock_mail-reply-to-all</link>
-           <link>mail_replyall</link>
-       </icon>
-       <icon name="mail-reply-sender">
-           <link>gnome-stock-mail-rpl</link>
-           <link>stock_mail-reply</link>
-           <link>mail_reply</link>
-       </icon>
-       <icon name="mail-send">
-           <link>gnome-stock-mail-snd</link>
-           <link>stock_mail-send</link>
-           <link>mail_send</link>
-       </icon>
-       <icon name="mail-send-receive">
-           <link>stock_mail-send-receive</link>
-       </icon>
-       <icon name="media-eject">
-           <link>player_eject</link>
-       </icon>
-       <icon name="media-playback-pause">
-           <link>gtk-media-pause</link>
-           <link>stock_media-pause</link>
-           <link>player_pause</link>
-       </icon>
-       <icon name="media-playback-start">
-           <link>gtk-media-play-ltr</link>
-           <link>stock_media-play</link>
-           <link>player_play</link>
-       </icon>
-       <icon name="media-playback-stop">
-           <link>gtk-media-stop</link>
-           <link>stock_media-stop</link>
-           <link>player_stop</link>
-       </icon>
-       <icon name="media-record">
-           <link>gtk-media-record</link>
-           <link>stock_media-rec</link>
-           <link>player_record</link>
-       </icon>
-       <icon name="media-seek-backward">
-           <link>gtk-media-rewind-ltr</link>
-           <link>gtk-media-forward-rtl</link>
-           <link>stock_media-rew</link>
-           <link>player_rew</link>
-       </icon>
-       <icon name="media-seek-forward">
-           <link>gtk-media-forward-ltr</link>
-           <link>gtk-media-rewind-rtl</link>
-           <link>stock_media-fwd</link>
-           <link>player_fwd</link>
-       </icon>
-       <icon name="media-skip-backward">
-           <link>gtk-media-previous-ltr</link>
-           <link>gtk-media-next-rtl</link>
-           <link>stock_media-prev</link>
-           <link>player_start</link>
-       </icon>
-       <icon name="media-skip-forward">
-           <link>gtk-media-next-ltr</link>
-           <link>gtk-media-previous-rtl</link>
-           <link>stock_media-next</link>
-           <link>player_end</link>
-       </icon>
-       <icon name="process-stop">
-           <link>gtk-cancel</link>
-           <link>gtk-stop</link>
-           <link>stock_stop</link>
-           <link>stop</link>
-       </icon>
-       <icon name="system-lock-screen">
-           <link>gnome-lockscreen</link>
-           <link>lock</link>
-           <link>xfce-system-lock</link>
-       </icon>
-       <icon name="system-log-out">
-           <link>gnome-logout</link>
-           <link>exit</link>
-       </icon>
-       <icon name="system-run">
-           <link>gnome-run</link>
-           <link>gtk-execute</link>
-       </icon>
-       <icon name="system-search">
-           <link>gnome-searchtool</link>
-           <link>search</link>
-           <link>kfind</link>
-       </icon>
-       <icon name="system-shutdown">
-           <link>gnome-shutdown</link>
-       </icon>
-       <icon name="tab-new">
-           <link>stock_new-tab</link>
-           <link>tab_new</link>
-       </icon>
-       <icon name="tools-check-spelling">
-           <link>gtk-spell-check</link>
-           <link>stock_spellcheck</link>
-       </icon>
-       <icon name="view-fullscreen">
-           <link>gtk-fullscreen</link>
-           <link>stock_fullscreen</link>
-           <link>window_fullscreen</link>
-       </icon>
-       <icon name="view-refresh">
-           <link>gtk-refresh</link>
-           <link>stock_refresh</link>
-           <link>reload</link>
-           <link>reload_all_tabs</link>
-           <link>reload_page</link>
-           <link>reload3</link>
-       </icon>
-       <icon name="view-restore">
-           <link>gtk-leave-fullscreen</link>
-           <link>stock_leave-fullscreen</link>
-           <link>window_nofullscreen</link>
-       </icon>
-       <icon name="view-sort-ascending">
-           <link>gtk-sort-ascending</link>
-       </icon>
-       <icon name="view-sort-descending">
-           <link>gtk-sort-descending</link>
-       </icon>
-       <icon name="window-close">
-           <link>gtk-close</link>
-           <link>stock_close</link>
-       </icon>
-       <icon name="window-new">
-           <link>stock_new-window</link>
-           <link>window_new</link>
-       </icon>
-       <icon name="zoom-fit-best">
-           <link>zoom-best-fit</link>
-           <link>gtk-zoom-fit</link>
-           <link>stock_zoom-page</link>
-           <link>viewmagfit</link>
-       </icon>
-        <icon name="zoom-in">
-            <link>gtk-zoom-in</link>
-           <link>stock_zoom-in</link>
-           <link>viewmag+</link>
-        </icon>
-        <icon name="zoom-original">
-            <link>gtk-zoom-100</link>
-           <link>stock_zoom-1</link>
-           <link>viewmag1</link>
-        </icon>
-        <icon name="zoom-out">
-            <link>gtk-zoom-out</link>
-           <link>stock_zoom-out</link>
-           <link>viewmag-</link>
-        </icon>
-    </context>
-    <context dir="animations">
-       <icon name="process-idle">
-           <link>gnome-spinner-rest</link>
-       </icon>
-       <icon name="process-working">
-           <link>gnome-spinner</link>
-       </icon>
-    </context>
-    <context dir="apps">
-       <icon name="accessories-calculator">
-           <link>gnome-calculator</link>
-           <link>kcalc</link>
-           <link>calc</link>
-       </icon>
-       <icon name="accessories-character-map">
-           <link>gnome-character-map</link>
-           <link>gucharmap</link>
-           <link>kcharselect</link>
-       </icon>
-       <icon name="accessories-text-editor">
-           <link>text-editor</link>
-           <link>kedit</link>
-       </icon>
-       <icon name="help-browser">
-           <link>khelpcenter</link>
-           <link>susehelpcenter</link>
-           <link>gnome-help</link>
-       </icon>
-       <icon name="internet-mail">
-           <link>email</link>
-           <link>mail_generic</link>
-           <link>redhat-email</link>
-           <link>xfce-mail</link>
-       </icon>
-       <icon name="internet-web-browser">
-           <link>browser</link>
-           <link>web-browser</link>
-           <link>redhat-web-browser</link>
-       </icon>
-       <icon name="multimedia-volume-control">
-           <link>gnome-mixer</link>
-           <link>volume-knob</link>
-           <link>arts</link>
-           <link>kcmsound</link>
-           <link>multimedia</link>
-           <link>xfce4-mixer</link>
-       </icon>
-       <icon name="office-calendar">
-           <link>ximian-evolution-calendar</link>
-           <link>date</link>
-           <link>xfcalendar</link>
-       </icon>
-       <icon name="preferences-desktop-accessibility">
-           <link>gnome-settings-accessibility-technologies</link>
-           <link>accessibility-directory</link>
-           <link>access</link>
-       </icon>
-       <icon name="preferences-desktop-font">
-           <link>gnome-settings-font</link>
-           <link>fonts</link>
-       </icon>
-       <icon name="preferences-desktop-keyboard-shortcuts">
-           <link>gnome-settings-keybindings</link>
-           <link>key_bindings</link>
-       </icon>
-       <icon name="preferences-desktop-locale">
-           <link>config-language</link>
-           <link>locale</link>
-       </icon>
-       <icon name="preferences-desktop-remote-desktop">
-           <link>gnome-remote-desktop</link>
-           <link>krfb</link>
-       </icon>
-       <icon name="preferences-desktop-screensaver">
-           <link>screensaver</link>
-           <link>kscreensaver</link>
-           <link>xscreensaver</link>
-       </icon>
-       <icon name="preferences-desktop-sound">
-           <link>gnome-settings-sound</link>
-           <link>knotify</link>
-           <link>xfce4-sound</link>
-       </icon>
-       <icon name="preferences-desktop-theme">
-           <link>gnome-settings-theme</link>
-           <link>style</link>
-       </icon>
-       <icon name="preferences-desktop-wallpaper">
-           <link>gnome-settings-background</link>
-           <link>wallpaper</link>
-           <link>background</link>
-           <link>xfce4-backdrop</link>
-       </icon>
-       <icon name="preferences-system-network-proxy">
-           <link>stock_proxy</link>
-           <link>proxy-config</link>
-           <link>proxy</link>
-       </icon>
-       <icon name="preferences-system-session">
-           <link>gnome-session</link>
-           <link>xfce4-session</link>
-       </icon>
-       <icon name="preferences-system-windows">
-           <link>gnome-window-manager</link>
-           <link>kcmkwm</link>
-           <link>kwin</link>
-           <link>xfwm4</link>
-       </icon>
-       <icon name="system-file-manager">
-           <link>file-manager</link>
-           <link>kfm</link>
-           <link>redhat-filemanager</link>
-           <link>xfce-filemanager</link>
-       </icon>
-       <icon name="system-software-update">
-           <link>update-manager</link>
-           <link>zen-icon</link>
-       </icon>
-       <icon name="system-users">
-           <link>kuser</link>
-           <link>config-users</link>
-           <link>system-config-users</link>
-       </icon>
-       <icon name="utilities-system-monitor">
-           <link>gnome-monitor</link>
-           <link>ksysguard</link>
-       </icon>
-       <icon name="utilities-terminal">
-           <link>gnome-terminal</link>
-           <link>konsole</link>
-           <link>openterm</link>
-           <link>terminal</link>
-           <link>xfce-terminal</link>
-       </icon>
-    </context>
-    <context dir="categories">
-       <icon name="applications-accessories">
-           <link>gnome-util</link>
-           <link>package_utilities</link>
-           <link>redhat-accessories</link>
-           <link>xfce-utils</link> 
-       </icon>
-       <icon name="applications-development">
-           <link>gnome-devel</link>
-           <link>package_development</link>
-           <link>redhat-programming</link>
-       </icon>
-       <icon name="applications-games">
-           <link>gnome-joystick</link>
-           <link>package_games</link>
-           <link>redhat-games</link>
-           <link>xfce-games</link>
-       </icon>
-       <icon name="applications-graphics">
-           <link>gnome-graphics</link>
-           <link>package_graphics</link>
-           <link>redhat-graphics</link>
-           <link>xfce-graphics</link>
-       </icon>
-       <icon name="applications-internet">
-           <link>gnome-globe</link>
-           <link>stock_internet</link>
-           <link>package_network</link>
-           <link>redhat-internet</link>
-           <link>xfce-internet</link>
-       </icon>
-       <icon name="applications-multimedia">
-           <link>gnome-multimedia</link>
-           <link>package_multimedia</link>
-           <link>redhat-sound_video</link>
-           <link>xfce-multimedia</link>
-       </icon>
-       <icon name="applications-office">
-           <link>gnome-applications</link>
-           <link>package_office</link>
-           <link>redhat-office</link>
-           <link>xfce-office</link>
-       </icon>
-       <icon name="applications-other">
-           <link>gnome-other</link>
-       </icon>
-       <icon name="applications-system">
-           <link>gnome-system</link>
-           <link>package_system</link>
-           <link>redhat-system_tools</link>
-       </icon>
-       <icon name="applications-utilities">
-           <link>package_utilities</link>
-       </icon>
-       <icon name="preferences-desktop">
-           <link>gnome-control-center</link>
-           <link>gnome-settings</link>
-           <link>gtk-preferences</link>
-           <link>redhat-preferences</link>
-           <link>kcontrol</link>
-           <link>xfce4-settings</link>
-       </icon>
-       <icon name="preferences-desktop-peripherals">
-           <link>input_devices_settings</link>
-       </icon>
-       <icon name="preferences-system">
-           <link>package_settings</link>
-           <link>redhat-system_settings</link>
-           <link>xfce-system-settings</link>
-       </icon>
-    </context>
-    <context dir="devices">
-       <icon name="audio-card">
-           <link>yast_soundcard</link>
-       </icon>
-       <icon name="audio-input-microphone">
-           <link>stock_mic</link>
-           <link>gnome-stock-mic</link>
-       </icon>
-       <icon name="battery">
-           <link>gnome-dev-battery</link>
-       </icon>
-       <icon name="camera-photo">
-           <link>camera</link>
-           <link>camera_unmount</link>
-       </icon>
-       <icon name="computer">
-           <link>gnome-dev-computer</link>
-           <link>gnome-fs-client</link>
-           <link>system</link>
-       </icon>
-       <icon name="drive-harddisk">
-           <link>gtk-harddisk</link>
-           <link>gnome-dev-harddisk</link>
-           <link>gnome-dev-harddisk-usb</link>
-           <link>gnome-dev-harddisk-1394</link>
-           <link>harddrive</link>
-           <link>hdd_unmount</link>
-           <link>yast_HD</link>
-           <link>yast_idetude</link>
-       </icon>
-       <icon name="drive-optical">
-           <link>drive-cdrom</link>
-           <link>gnome-dev-cdrom</link>
-           <link>gnome-dev-dvd</link>
-       </icon>
-       <icon name="drive-removable-media">
-           <link>gnome-dev-removable</link>
-           <link>gnome-dev-removable-usb</link>
-           <link>gnome-dev-removable-1394</link>
-           <link>usbpendrive_unmount</link>
-       </icon>
-       <icon name="input-gaming">
-           <link>joystick</link>
-           <link>yast_joystick</link>
-       </icon>
-       <icon name="input-keyboard">
-           <link>gnome-dev-keyboard</link>
-           <link>keyboard</link>
-           <link>kxkb</link>
-           <link>xfce4-keyboard</link>
-       </icon>
-       <icon name="input-mouse">
-           <link>gnome-dev-mouse-ball</link>
-           <link>gnome-dev-mouse-optical</link>
-           <link>mouse</link>
-           <link>yast_mouse</link>
-           <link>xfce4-mouse</link>
-       </icon>
-       <icon name="media-flash">
-           <link>gnome-dev-media-cf</link>
-           <link>gnome-dev-media-ms</link>
-           <link>gnome-dev-media-sdmmc</link>
-           <link>gnome-dev-media-sm</link>
-       </icon>
-       <icon name="media-floppy">
-           <link>gnome-dev-floppy</link>
-           <link>gtk-floppy</link>
-           <link>system-floppy</link>
-           <link>3floppy_unmount</link>
-       </icon>
-       <icon name="media-jaz">
-           <link>gnome-dev-jazdisk</link>
-       </icon>
-       <icon name="media-optical">
-           <link>media-cdrom</link>
-           <link>gtk-cdrom</link>
-           <link>gnome-dev-cdrom-audio</link>
-           <link>gnome-dev-disc-cdr</link>
-           <link>gnome-dev-disc-cdrw</link>
-           <link>gnome-dev-disc-dvdr</link>
-           <link>gnome-dev-disc-dvdr-plus</link>
-           <link>gnome-dev-disc-dvdram</link>
-           <link>gnome-dev-disc-dvdrom</link>
-           <link>gnome-dev-disc-dvdrw</link>
-           <link>cdrom_unmount</link>
-           <link>cdwriter_unmount</link>
-           <link>dvd_unmount</link>
-       </icon>
-       <icon name="media-zip">
-           <link>gnome-dev-zipdisk</link>
-       </icon>
-       <icon name="modem">
-           <link>gnome-modem</link>
-       </icon>
-       <icon name="multimedia-player">
-           <link>gnome-dev-ipod</link>
-           <link>ipod_mount</link>
-       </icon>
-       <icon name="network-wired">
-           <link>gnome-dev-ethernet</link>
-       </icon>
-       <icon name="network-wireless">
-           <link>gnome-dev-wavelan</link>
-       </icon>
-       <icon name="phone">
-           <link>stock_cell-phone</link>
-       </icon>
-       <icon name="printer">
-           <link>gnome-dev-printer</link>
-           <link>printer-remote</link>
-           <link>stock_printers</link>
-           <link>yast_printer</link>
-           <link>printer1</link>
-           <link>printmgr</link>
-           <link>kjobviewer</link>
-           <link>xfce-printer</link>
-       </icon>
-       <icon name="video-display">
-           <link>chardevice</link>
-           <link>display</link>
-           <link>xfce4-display</link>
-       </icon>
-    </context>
-    <context dir="emblems">
-       <icon name="emblem-readonly">
-           <link>emblem-nowrite</link>
-       </icon>
-       <icon name="emblem-unreadable">
-           <link>emblem-noread</link>
-       </icon>
-    </context>
-    <context dir="emotes">
-       <icon name="face-angel">
-           <link>stock_smiley-18</link>
-       </icon>
-       <icon name="face-cool">
-           <link>stock_smiley-15</link>
-       </icon>
-       <icon name="face-crying">
-           <link>stock_smiley-11</link>
-       </icon>
-       <icon name="face-embarassed">
-           <link>stock_smiley-12</link>
-       </icon>
-       <icon name="face-kiss">
-           <link>stock_smiley-13</link>
-       </icon>
-       <icon name="face-monkey">
-           <link>stock_smiley-22</link>
-       </icon>
-       <icon name="face-plain">
-           <link>stock_smiley-8</link>
-       </icon>
-       <icon name="face-raspberry">
-           <link>stock_smiley-10</link>
-       </icon>
-       <icon name="face-sad">
-           <link>stock_smiley-4</link>
-       </icon>
-       <icon name="face-smile">
-           <link>stock_smiley-1</link>
-           <link>stock_smiley-2</link>
-           <link>stock_smiley-7</link>
-       </icon>
-       <icon name="face-smile-big">
-           <link>stock_smiley-6</link>
-       </icon>
-       <icon name="face-surprise">
-           <link>stock_smiley-5</link>
-       </icon>
-       <icon name="face-wink">
-           <link>stock_smiley-3</link>
-       </icon>
-    </context>
-    <context dir="mimetypes">
-       <icon name="application-certificate">
-           <link>stock_certificate</link>
-       </icon>
-       <icon name="application-x-executable">
-           <link>gnome-fs-executable</link>
-           <link>gnome-mime-application-x-executable</link>
-           <link>gnome-mime-application-x-ms-dos-executable</link>
-           <link>binary</link>
-           <link>exec</link>
-       </icon>
-       <icon name="audio-x-generic">
-           <link>gnome-mime-audio</link>
-           <link>gnome-mime-application-ogg</link>
-           <link>sound</link>
-       </icon>
-       <icon name="font-x-generic">
-           <link>gnome-mime-application-x-font-afm</link>
-           <link>gnome-mime-application-x-font-bdf</link>
-           <link>gnome-mime-application-x-font-linux-psf</link>
-           <link>gnome-mime-application-x-font-pcf</link>
-           <link>gnome-mime-application-x-font-sunos-news</link>
-           <link>gnome-mime-application-x-font-ttf</link>
-           <link>gnome-mime-x-font-afm</link>
-           <link>font</link>
-           <link>font_bitmap</link>
-           <link>font_truetype</link>
-           <link>font_type1</link>
-       </icon>
-       <icon name="image-x-generic">
-           <link>gnome-mime-image</link>
-           <link>gnome-mime-application-x-killustrator</link>
-           <link>image</link>
-       </icon>
-       <icon name="package-x-generic">
-           <link>gnome-package</link>
-           <link>gnome-mime-application-zip</link>
-           <link>gnome-mime-application-x-archive</link>
-           <link>gnome-mime-application-x-arj</link>
-           <link>gnome-mime-application-x-bzip</link>
-           <link>gnome-mime-application-x-bzip-compressed-tar</link>
-           <link>gnome-mime-application-x-compress</link>
-           <link>gnome-mime-application-x-compressed-tar</link>
-           <link>gnome-mime-application-x-cpio</link>
-           <link>gnome-mime-application-x-cpio-compressed</link>
-           <link>gnome-mime-application-x-deb</link>
-           <link>gnome-mime-application-x-gzip</link>
-           <link>gnome-mime-application-x-jar</link>
-           <link>gnome-mime-application-x-lha</link>
-           <link>gnome-mime-application-x-lhz</link>
-           <link>gnome-mime-application-x-lzma</link>
-           <link>gnome-mime-application-x-lzma-compressed-tar</link>
-           <link>gnome-mime-application-x-rar</link>
-           <link>gnome-mime-application-x-rpm</link>
-           <link>gnome-mime-application-x-stuffit</link>
-           <link>gnome-mime-application-x-tar</link>
-           <link>gnome-mime-application-x-tarz</link>
-           <link>gnome-mime-application-x-7z-compressed</link>
-           <link>folder_tar</link>
-           <link>package</link>
-           <link>deb</link>
-           <link>rpm</link>
-           <link>tar</link>
-           <link>tgz</link>
-           <link>zip</link>
-       </icon>
-       <icon name="text-html">
-           <link>gnome-mime-text-html</link>
-           <link>gnome-mime-text-vnd.wap.wml</link>
-           <link>gnome-mime-application-vnd.oasis.opendocument.text-web</link>
-           <link>gnome-mime-application-x-php</link>
-           <link>gnome-mime-application-xhtml+xml</link>
-           <link>html</link>
-           <link>www</link>
-       </icon>
-       <icon name="text-x-generic">
-           <link>gnome-mime-text</link>
-           <link>ascii</link>
-           <link>empty</link>
-           <link>mime_ascii</link>
-           <link>misc</link>
-           <link>txt</link>
-           <link>txt2</link>
-           <link>unknown</link>
-           <link>package_editors</link>
-       </icon>
-       <icon name="text-x-preview">
-           <link>gnome-fs-regular</link>
-           <link>gtk-file</link>
-       </icon>
-       <icon name="text-x-generic-template">
-           <link>template_source</link>
-       </icon>
-       <icon name="text-x-script">
-           <link>gnome-mime-application-x-perl</link>
-           <link>gnome-mime-application-x-python-bytecode</link>
-           <link>gnome-mime-application-x-shellscript</link>
-           <link>gnome-mime-text-x-csh</link>
-           <link>gnome-mime-text-x-python</link>
-           <link>gnome-mime-text-x-sh</link>
-           <link>gnome-mime-text-x-zsh</link>
-           <link>stock_script</link>
-           <link>shellscript</link>
-       </icon>
-       <icon name="video-x-generic">
-           <link>gnome-mime-application-x-shockwave-flash</link>
-           <link>gnome-mime-application-vnd.rn-realmedia</link>
-           <link>gnome-mime-application-vnd.rn-realmedia-secure</link>
-           <link>gnome-mime-application-vnd.rn-realmedia-vbr</link>
-           <link>gnome-mime-video</link>
-           <link>video</link>
-       </icon>
-       <icon name="x-office-address-book">
-           <link>gnome-mime-text-x-vcard</link>
-           <link>stock_addressbook</link>
-           <link>contents2</link>
-           <link>vcard</link>
-       </icon>
-       <icon name="x-office-calendar">
-           <link>gnome-mime-text-x-vcalendar</link>
-           <link>stock_calendar</link>
-           <link>plan</link>
-           <link>vcalendar</link>
-       </icon>
-       <icon name="x-office-document">
-           <link>application-vnd.ms-word.document.macroEnabled.12</link>
-           <link>application-vnd.openxmlformats-officedocument.wordprocessingml.document</link>
-           <link>gnome-mime-application-msword</link>
-           <link>gnome-mime-application-pdf</link>
-           <link>gnome-mime-application-postscript</link>
-           <link>gnome-mime-application-rtf</link>
-           <link>gnome-mime-application-vnd.oasis.opendocument.text</link>
-           <link>gnome-mime-application-vnd.stardivision.writer</link>
-           <link>gnome-mime-application-vnd.sun.xml.writer</link>
-           <link>gnome-mime-application-wordperfect</link>
-           <link>gnome-mime-application-x-abiword</link>
-           <link>gnome-mime-application-x-applix-word</link>
-           <link>gnome-mime-application-x-dvi</link>
-           <link>gnome-mime-application-x-gzpostscript</link>
-           <link>gnome-mime-application-x-kword</link>
-           <link>gnome-mime-application-x-scribus</link>
-           <link>gnome-mime-application-x-tex</link>
-           <link>document</link>
-           <link>package_wordprocessing</link>
-           <link>wordprocessing</link>
-       </icon>
-       <icon name="x-office-document-template">
-           <link>application-vnd.openxmlformats-officedocument.wordprocessingml.template</link>
-           <link>gnome-mime-application-vnd.oasis.opendocument.text-template</link>
-           <link>gnome-mime-application-vnd.sun.xml.writer.template</link>
-       </icon>
-       <icon name="x-office-drawing">
-           <link>gnome-mime-application-vnd.oasis.opendocument.graphics</link>
-           <link>gnome-mime-application-vnd.oasis.opendocument.image</link>
-           <link>gnome-mime-application-vnd.sun.xml.draw</link>
-       </icon>
-       <icon name="x-office-drawing-template">
-           <link>gnome-mime-application-vnd.oasis.opendocument.graphics-template</link>
-           <link>gnome-mime-application-vnd.sun.xml.draw.template</link>
-       </icon>
-       <icon name="x-office-presentation">
-           <link>application-vnd.ms-powerpoint.presentation.macroEnabled.12</link>
-           <link>application-vnd.openxmlformats-officedocument.presentationml.presentation</link>
-           <link>gnome-mime-application-magicpoint</link>
-           <link>gnome-mime-application-vnd.ms-powerpoint</link>
-           <link>gnome-mime-application-vnd.oasis.opendocument.presentation</link>
-           <link>gnome-mime-application-vnd.stardivision.impress</link>
-           <link>gnome-mime-application-vnd.sun.xml.impress</link>
-           <link>gnome-mime-application-x-kpresenter</link>
-           <link>kpresenter_kpr</link>
-       </icon>
-       <icon name="x-office-presentation-template">
-           <link>application-vnd.openxmlformats-officedocument.presentationml.template</link>
-           <link>gnome-mime-application-vnd.oasis.opendocument.presentation-template</link>
-           <link>gnome-mime-application-vnd.sun.xml.impress.template</link>
-       </icon>
-       <icon name="x-office-spreadsheet">
-           <link>application-vnd.ms-excel.sheet.macroEnabled.12</link>
-           <link>application-vnd.openxmlformats-officedocument.spreadsheetml.sheet</link>
-           <link>gnome-mime-application-vnd.lotus-1-2-3</link>
-           <link>gnome-mime-application-vnd.ms-excel</link>
-           <link>gnome-mime-application-vnd.oasis.opendocument.spreadsheet</link>
-           <link>gnome-mime-application-vnd.stardivision.calc</link>
-           <link>gnome-mime-application-vnd.sun.xml.calc</link>
-           <link>gnome-mime-application-x-applix-spreadsheet</link>
-           <link>gnome-mime-application-x-gnumeric</link>
-           <link>gnome-mime-application-x-kspread</link>
-           <link>spreadsheet</link>
-       </icon>
-       <icon name="x-office-spreadsheet-template">
-           <link>application-vnd.openxmlformats-officedocument.spreadsheetml.template</link>
-           <link>gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template</link>
-           <link>gnome-mime-application-vnd.sun.xml.calc.template</link>
-       </icon>
-    </context>
-    <context dir="places">
-       <icon name="folder">
-           <link>gnome-fs-directory</link>
-           <link>gtk-directory</link>
-           <link>stock_folder</link>
-           <link>inode-directory</link>
-       </icon>
-       <icon name="folder-remote-ftp">
-           <link>gnome-fs-ftp</link>
-       </icon>
-       <icon name="folder-remote-nfs">
-           <link>gnome-fs-nfs</link>
-       </icon>
-       <icon name="folder-remote-smb">
-           <link>gnome-fs-smb</link>
-           <link>gnome-mime-x-directory-smb-share</link>
-       </icon>
-       <icon name="folder-remote-ssh">
-           <link>gnome-fs-ssh</link>
-       </icon>
-       <icon name="folder-remote">
-           <link>gnome-fs-share</link>
-           <link>gnome-fs-ftp</link>
-           <link>gnome-fs-nfs</link>
-           <link>gnome-fs-smb</link>
-           <link>gnome-fs-ssh</link>
-           <link>gnome-mime-x-directory-smb-share</link>
-           <link>network</link>
-       </icon>
-       <icon name="folder-saved-search">
-           <link>application-x-gnome-saved-search</link>
-       </icon>
-       <icon name="mail-folder-sent">
-           <link>stock_sent-mail</link>
-       </icon>
-       <icon name="mail-inbox">
-           <link>stock_inbox</link>
-       </icon>
-       <icon name="mail-outbox">
-           <link>stock_outbox</link>
-       </icon>
-       <icon name="network-server">
-           <link>gnome-fs-server</link>
-           <link>gnome-mime-x-directory-smb-server</link>
-           <link>gnome-mime-x-directory-nfs-server</link>
-           <link>server</link>
-           <link>redhat-network-server</link>
-       </icon>
-       <icon name="network-workgroup">
-           <link>gnome-fs-network</link>
-           <link>gnome-mime-x-directory-smb-workgroup</link>
-           <link>gtk-network</link>
-           <link>network_local</link>
-       </icon>
-       <icon name="start-here">
-           <link>gnome-main-menu</link>
-           <link>distributor-logo</link>
-           <link>novell-button</link>
-       </icon>
-       <icon name="user-desktop">
-           <link>gnome-fs-desktop</link>
-           <link>desktop</link>
-       </icon>
-       <icon name="user-home">
-           <link>gnome-fs-home</link>
-           <link>folder_home</link>
-       </icon>
-       <icon name="user-trash">
-           <link>gnome-fs-trash-empty</link>
-           <link>emptytrash</link>
-           <link>trashcan_empty</link>
-           <link>gnome-stock-trash</link>
-           <link>xfce-trash_empty</link>
-       </icon>
-    </context>
-    <context dir="status">
-       <icon name="appointment-missed">
-           <link>stock_appointment-reminder-excl</link>
-       </icon>
-       <icon name="appointment-soon">
-           <link>stock_appointment-reminder</link>
-       </icon>
-       <icon name="audio-volume-high">
-           <link>stock_volume-max</link>
-           <link>stock_volume</link>
-       </icon>
-       <icon name="audio-volume-low">
-           <link>stock_volume-0</link>
-           <link>stock_volume-min</link>
-       </icon>
-       <icon name="audio-volume-medium">
-           <link>stock_volume-med</link>
-       </icon>
-       <icon name="audio-volume-muted">
-           <link>stock_volume-mute</link>
-       </icon>
-       <icon name="dialog-error">
-           <link>gtk-dialog-error</link>
-           <link>stock_dialog-error</link>
-           <link>error</link>
-           <link>messagebox_critical</link>
-       </icon>
-       <icon name="dialog-information">
-           <link>gtk-dialog-info</link>
-           <link>stock_dialog-info</link>
-           <link>info</link>
-           <link>messagebox_info</link>
-       </icon>
-       <icon name="dialog-password">
-           <link>gtk-dialog-authentication</link>
-       </icon>
-       <icon name="dialog-question">
-           <link>gtk-dialog-question</link>
-           <link>stock_dialog-question</link>
-       </icon>
-       <icon name="dialog-warning">
-           <link>gtk-dialog-warning</link>
-           <link>stock_dialog-warning</link>
-           <link>messagebox_warning</link>
-           <link>important</link>
-       </icon>
-       <icon name="folder-drag-accept">
-           <link>gnome-fs-directory-accept</link>
-       </icon>
-       <icon name="folder-open">
-           <link>stock_open</link>
-           <link>folder_open</link>
-       </icon>
-       <icon name="folder-visiting">
-           <link>gnome-fs-directory-visiting</link>
-       </icon>
-       <icon name="image-loading">
-           <link>gnome-fs-loading-icon</link>
-       </icon>
-       <icon name="image-missing">
-           <link>gtk-missing-image</link>
-       </icon>
-       <icon name="mail-attachment">
-           <link>stock_attach</link>
-       </icon>
-       <icon name="mail-read">
-           <link>stock_mail-open</link>
-       </icon>
-       <icon name="mail-replied">
-           <link>stock_mail-replied</link>
-       </icon>
-       <icon name="mail-unread">
-           <link>stock_mail-unread</link>
-       </icon>
-       <icon name="media-playlist-repeat">
-           <link>stock_repeat</link>
-       </icon>
-       <icon name="media-playlist-shuffle">
-           <link>stock_shuffle</link>
-       </icon>
-       <icon name="network-error">
-           <link>gnome-netstatus-error</link>
-       </icon>
-       <icon name="network-idle">
-           <link>gnome-netstatus-idle</link>
-           <link>nm-adhoc</link>
-           <link>nm-device-wired</link>
-           <link>nm-device-wireless</link>
-           <link>connect_established</link>
-       </icon>
-       <icon name="network-offline">
-           <link>gnome-netstatus-disconn</link>
-           <link>nm-no-connection</link>
-           <link>connect_no</link>
-       </icon>
-       <icon name="network-receive">
-           <link>gnome-netstatus-rx</link>
-       </icon>
-       <icon name="network-transmit">
-           <link>gnome-netstatus-tx</link>
-       </icon>
-       <icon name="network-transmit-receive">
-           <link>gnome-netstatus-txrx</link>
-           <link>connect_creating</link>
-       </icon>
-       <icon name="network-wireless-encrypted">
-           <link>gnome-dev-wavelan-encrypted</link>
-       </icon>
-       <icon name="network-wireless-high">
-           <link>nm-signal-100</link>
-           <link>nm-signal-75</link>
-       </icon>
-       <icon name="network-wireless-low">
-           <link>nm-signal-00</link>
-           <link>nm-signal-25</link>
-       </icon>
-       <icon name="network-wireless-medium">
-           <link>nm-signal-50</link>
-       </icon>
-       <icon name="security-high">
-           <link>stock_lock-ok</link>
-       </icon>
-       <icon name="security-low">
-           <link>stock_lock-broken</link>
-           <link>stock_lock-open</link>
-       </icon>
-       <icon name="security-medium">
-           <link>stock_lock</link>
-       </icon>
-       <icon name="user-trash-full">
-           <link>gnome-fs-trash-full</link>
-           <link>edittrash</link>
-           <link>trashcan_full</link>
-           <link>gnome-stock-trash-full</link>
-           <link>stock_trash_full</link>
-           <link>xfce-trash_full</link>
-       </icon>
-       <icon name="weather-clear">
-           <link>stock_weather-sunny</link>
-           <link>sunny</link>
-       </icon>
-       <icon name="weather-clear-night">
-           <link>stock_weather-night-clear</link>
-       </icon>
-       <icon name="weather-few-clouds">
-           <link>stock_weather-few-clouds</link>
-       </icon>
-       <icon name="weather-few-clouds-night">
-           <link>stock_weather-night-few-clouds</link>
-       </icon>
-       <icon name="weather-fog">
-           <link>stock_weather-fog</link>
-       </icon>
-       <icon name="weather-overcast">
-           <link>stock_weather-cloudy</link>
-       </icon>
-       <icon name="weather-showers">
-           <link>stock_weather-showers</link>
-       </icon>
-       <icon name="weather-snow">
-           <link>stock_weather-snow</link>
-       </icon>
-       <icon name="weather-storm">
-           <link>stock_weather-storm</link>
-       </icon>
-    </context>
-</mapping>
diff --git a/missing b/missing
index 28055d2..86a8fc3 100755 (executable)
--- a/missing
+++ b/missing
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@ Supported PROGRAM values:
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@ case $1 in
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@ WARNING: \`$1' $msg.  You should only need it if
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
        case $LASTARG in
        *.y)
            SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@ WARNING: \`$1' is $msg.  You should only need it if
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
        case $LASTARG in
        *.l)
            SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-       case $firstarg in
-       *o*)
-           firstarg=`echo "$firstarg" | sed s/o//`
-           tar "$firstarg" "$@" && exit 0
-           ;;
-       esac
-       case $firstarg in
-       *h*)
-           firstarg=`echo "$firstarg" | sed s/h//`
-           tar "$firstarg" "$@" && exit 0
-           ;;
-       esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
diff --git a/nuoveXT2/128x128/emblems/placeholder b/nuoveXT2/128x128/emblems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/128x128/emotes/placeholder b/nuoveXT2/128x128/emotes/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/128x128/filesystems/placeholder b/nuoveXT2/128x128/filesystems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/16x16/emblems/placeholder b/nuoveXT2/16x16/emblems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/16x16/emotes/placeholder b/nuoveXT2/16x16/emotes/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/16x16/filesystems/placeholder b/nuoveXT2/16x16/filesystems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/22x22/emblems/placeholder b/nuoveXT2/22x22/emblems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/22x22/emotes/placeholder b/nuoveXT2/22x22/emotes/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/22x22/filesystems/placeholder b/nuoveXT2/22x22/filesystems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/24x24/emblems/placeholder b/nuoveXT2/24x24/emblems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/24x24/emotes/placeholder b/nuoveXT2/24x24/emotes/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/24x24/filesystems/placeholder b/nuoveXT2/24x24/filesystems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/32x32/emblems/placeholder b/nuoveXT2/32x32/emblems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/32x32/emotes/placeholder b/nuoveXT2/32x32/emotes/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/32x32/filesystems/placeholder b/nuoveXT2/32x32/filesystems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/36x36/emblems/placeholder b/nuoveXT2/36x36/emblems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/36x36/emotes/placeholder b/nuoveXT2/36x36/emotes/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/36x36/filesystems/placeholder b/nuoveXT2/36x36/filesystems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/48x48/emblems/placeholder b/nuoveXT2/48x48/emblems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/48x48/emotes/placeholder b/nuoveXT2/48x48/emotes/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/48x48/filesystems/placeholder b/nuoveXT2/48x48/filesystems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/64x64/emblems/placeholder b/nuoveXT2/64x64/emblems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/64x64/emotes/placeholder b/nuoveXT2/64x64/emotes/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/64x64/filesystems/placeholder b/nuoveXT2/64x64/filesystems/placeholder
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/72x72/filesystems/.gitignore b/nuoveXT2/72x72/filesystems/.gitignore
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/nuoveXT2/96x96/filesystems/.gitignore b/nuoveXT2/96x96/filesystems/.gitignore
new file mode 100644 (file)
index 0000000..e69de29