--- metatheme-gilouche-11.1.2.orig/debian/changelog +++ metatheme-gilouche-11.1.2/debian/changelog @@ -0,0 +1,12 @@ +metatheme-gilouche (11.1.2-2) unstable; urgency=low + + * debian/copyright: Correct the names of the copyright holders, + add more details (as provided by Jakub Steiner). + + -- Julian Andres Klode Wed, 25 Mar 2009 15:42:19 +0100 + +metatheme-gilouche (11.1.2-1) unstable; urgency=low + + * Initial upload (Closes: #520282) (LP: #96042) + + -- Julian Andres Klode Wed, 18 Mar 2009 17:44:31 +0100 --- metatheme-gilouche-11.1.2.orig/debian/docs +++ metatheme-gilouche-11.1.2/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README --- metatheme-gilouche-11.1.2.orig/debian/copyright +++ metatheme-gilouche-11.1.2/debian/copyright @@ -0,0 +1,44 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=443 +Upstream-Source: + http://forgeftp.novell.com/opensuse-art/openSUSE11.1/metatheme/ +X-Comment: + The statement that the code can be licensed under later versions as well has + been taken from Novell's RPM Package. The names of the copyright holders have + been sent per email by Jakub Steiner . + +Files: debian/* +Copyright: © 2009 Julian Andres Klode +License: GPL-2+ + +Files: metacity-1/* +Copyright: © 2002 Ximian, Inc. +Copyright: © 2004 Canonical Ltd. +Copyright: © 2005 Daniel Borgmann +Copyright: © 2006-2007 Novell, Inc. +License: GPL-2+ + +Files: icons/* +Copyright: © 2008 Jakub Steiner, Novell Inc. +License: GPL-2+ + +Files: gtk-2.0/* +Copyright: © Jakub Steiner +Copyright: © Garrett LeSage +Copyright: © Aaron Bockover +Copyright: © Richard Stellingwerff +Copyright: © Emil Jacobs +Copyright: © Daniel Borgmann +License: GPL-2+ + +Files: * +Copyright: © 2006-2008 Novell, Inc. +License: GPL-2+ + +License: GPL-2+ + This package 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. + . + On Debian systems, the complete text of the GNU General Public + License can be found in `/usr/share/common-licenses/GPL-2'. --- metatheme-gilouche-11.1.2.orig/debian/rules +++ metatheme-gilouche-11.1.2/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f +include /usr/share/quilt/quilt.make + +build install binary-arch binary-indep binary: patch + dh $@ + +clean: unpatch +unpatch: clean-unpatched +clean-unpatched: + dh clean + +.PHONY: build install binary-arch binary-indep binary clean clean-unpatched --- metatheme-gilouche-11.1.2.orig/debian/compat +++ metatheme-gilouche-11.1.2/debian/compat @@ -0,0 +1 @@ +7 --- metatheme-gilouche-11.1.2.orig/debian/README.source +++ metatheme-gilouche-11.1.2/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt to manage all modifications to the upstream source. +Please see /usr/share/doc/quilt/README.source for further information. --- metatheme-gilouche-11.1.2.orig/debian/watch +++ metatheme-gilouche-11.1.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://forgeftp.novell.com/opensuse-art/openSUSE11.1/metatheme/metatheme-gilouche-(.*)\.tar\.gz --- metatheme-gilouche-11.1.2.orig/debian/control +++ metatheme-gilouche-11.1.2/debian/control @@ -0,0 +1,22 @@ +Source: metatheme-gilouche +Section: gnome +Priority: optional +Maintainer: Julian Andres Klode +Build-Depends: debhelper (>= 7), quilt +Build-Depends-Indep: icon-naming-utils, intltool, pkg-config +Standards-Version: 3.8.1 +Homepage: http://forgeftp.novell.com/opensuse-art/openSUSE11.1/metatheme/ +VCS-Git: git://git.debian.org/collab-maint/metatheme-gilouche.git +VCS-Browser: http://git.debian.org/?p=collab-maint/metatheme-gilouche.git + +Package: gnome-theme-gilouche +Conflicts: industrial-icon-theme +Replaces: industrial-icon-theme +Depends: ${misc:Depends}, tango-icon-theme +Architecture: all +Description: openSUSE Gilouche Theme + This theme is the default one used in openSUSE. This package provides the + complete theme, consisting of icons, and Metacity and GTK+ themes. + . + The icon theme was previously known as openSUSE Industrial, but has been + renamed to Gilouche as well. --- metatheme-gilouche-11.1.2.orig/debian/patches/no-gtk-engines.diff +++ metatheme-gilouche-11.1.2/debian/patches/no-gtk-engines.diff @@ -0,0 +1,15 @@ +Fix configure to not check for gtk-engines, because it is not needed +for building and fails. +--- a/configure.ac ++++ b/configure.ac +@@ -19,8 +19,8 @@ AC_PROG_INTLTOOL([0.34.1]) + + + ### Check for gtk-engines including Gilouche engine +-PKG_CHECK_EXISTS(gtk-engines-2 >= 2.6.0,, +- AC_MSG_ERROR([gtk-engines >= 2.6.0 is required to use metatheme-gilouche])) ++#PKG_CHECK_EXISTS(gtk-engines-2 >= 2.6.0,, ++# AC_MSG_ERROR([gtk-engines >= 2.6.0 is required to use metatheme-gilouche])) + + ### Icon naming utils check + UTILS_REQUIRED=0.6.0 --- metatheme-gilouche-11.1.2.orig/debian/patches/series +++ metatheme-gilouche-11.1.2/debian/patches/series @@ -0,0 +1,2 @@ +no-gtk-engines.diff +run-autoreconf.diff --- metatheme-gilouche-11.1.2.orig/debian/patches/run-autoreconf.diff +++ metatheme-gilouche-11.1.2/debian/patches/run-autoreconf.diff @@ -0,0 +1,624 @@ +Run autoreconf so it works again. +--- a/Makefile.in ++++ b/Makefile.in +@@ -143,6 +143,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -374,6 +374,18 @@ glib_DEFUN([GLIB_GNU_GETTEXT], + fi + fi + ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) ++ + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po +@@ -443,9 +455,8 @@ fi]) + + dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) + # serial 40 IT_PROG_INTLTOOL +-AC_DEFUN([IT_PROG_INTLTOOL], [ +-AC_PREREQ([2.50])dnl +-AC_REQUIRE([AM_NLS])dnl ++AC_DEFUN([IT_PROG_INTLTOOL], ++[AC_PREREQ([2.50])dnl + + case "$am__api_version" in + 1.[01234]) +@@ -518,7 +529,6 @@ AC_SUBST(INTLTOOL_POLICY_RULE) + AC_PATH_PROG(XGETTEXT, xgettext) + AC_PATH_PROG(MSGMERGE, msgmerge) + AC_PATH_PROG(MSGFMT, msgfmt) +-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi +@@ -590,9 +600,6 @@ dnl The following CONFIG_COMMANDS should + dnl of config.status. + AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ +- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then +- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) +- fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d +@@ -601,55 +608,28 @@ AC_CONFIG_COMMANDS_PRE([ + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] ++ if test ! -f "$1/Makefile"; then ++ AC_MSG_ERROR([$1/Makefile is not ready.]) ++ fi ++ mv "$1/Makefile" "$1/Makefile.tmp" + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } +- ' "$1/Makefile.in" >"$1/Makefile"] ++ ' "$1/Makefile.tmp" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) + ])dnl + ]) + ++ + # deprecated macros + AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) + # A hint is needed for aclocal from Automake <= 1.9.4: + # AC_DEFUN([AC_PROG_INTLTOOL], ...) + + +-# nls.m4 serial 3 (gettext-0.15) +-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +-dnl This file is free software; the Free Software Foundation +-dnl gives unlimited permission to copy and/or distribute it, +-dnl with or without modifications, as long as this notice is preserved. +-dnl +-dnl This file can can be used in projects which are not available under +-dnl the GNU General Public License or the GNU Library General Public +-dnl License but which still want to provide support for the GNU gettext +-dnl functionality. +-dnl Please note that the actual code of the GNU gettext library is covered +-dnl by the GNU Library General Public License, and the rest of the GNU +-dnl gettext package package is covered by the GNU General Public License. +-dnl They are *not* in the public domain. +- +-dnl Authors: +-dnl Ulrich Drepper , 1995-2000. +-dnl Bruno Haible , 2000-2003. +- +-AC_PREREQ(2.50) +- +-AC_DEFUN([AM_NLS], +-[ +- AC_MSG_CHECKING([whether NLS is requested]) +- dnl Default is enabled NLS +- AC_ARG_ENABLE(nls, +- [ --disable-nls do not use Native Language Support], +- USE_NLS=$enableval, USE_NLS=yes) +- AC_MSG_RESULT($USE_NLS) +- AC_SUBST(USE_NLS) +-]) +- + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- + # + # Copyright © 2004 Scott James Remnant . +@@ -718,14 +698,16 @@ fi]) + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -769,9 +751,9 @@ See the pkg-config man page for more det + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +--- a/configure ++++ b/configure +@@ -668,6 +668,7 @@ INTLTOOL_DESKTOP_RULE + INTLTOOL_EXTRACT + INTLTOOL_MERGE + INTLTOOL_UPDATE ++MKINSTALLDIRS + POSUB + POFILES + PO_IN_DATADIR_FALSE +@@ -767,7 +768,6 @@ ac_subst_files='' + ac_user_opts=' + enable_option_checking + enable_dependency_tracking +-enable_nls + ' + ac_precious_vars='build_alias + host_alias +@@ -1408,7 +1408,6 @@ Optional Features: + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors +- --disable-nls do not use Native Language Support + + Some influential environment variables: + CC C compiler command +@@ -5832,6 +5831,15 @@ $as_echo "$LINGUAS" >&6; } + fi + fi + ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ ++ + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +@@ -5848,21 +5856,6 @@ $as_echo "$LINGUAS" >&6; } + + + +- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +-$as_echo_n "checking whether NLS is requested... " >&6; } +- # Check whether --enable-nls was given. +-if test "${enable_nls+set}" = set; then +- enableval=$enable_nls; USE_NLS=$enableval +-else +- USE_NLS=yes +-fi +- +- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 +-$as_echo "$USE_NLS" >&6; } +- +- +- +- + case "$am__api_version" in + 1.01234) + { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 +@@ -6176,47 +6169,6 @@ $as_echo "no" >&6; } + fi + + +-# Extract the first word of "gmsgfmt", so it can be a program name with args. +-set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GMSGFMT+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $GMSGFMT in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +- ;; +-esac +-fi +-GMSGFMT=$ac_cv_path_GMSGFMT +-if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +-$as_echo "$GMSGFMT" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 + $as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} +@@ -6454,6 +6406,14 @@ fi + + + ### Check for gtk-engines including Gilouche engine ++#PKG_CHECK_EXISTS(gtk-engines-2 >= 2.6.0,, ++# AC_MSG_ERROR([gtk-engines >= 2.6.0 is required to use metatheme-gilouche])) ++ ++### Icon naming utils check ++UTILS_REQUIRED=0.6.0 ++ ++{ $as_echo "$as_me:$LINENO: checking icon-naming-utils >= $UTILS_REQUIRED" >&5 ++$as_echo_n "checking icon-naming-utils >= $UTILS_REQUIRED... " >&6; } + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +@@ -6571,24 +6531,6 @@ $as_echo "no" >&6; } + + fi + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-engines-2 >= 2.6.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gtk-engines-2 >= 2.6.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- : +-else +- { { $as_echo "$as_me:$LINENO: error: gtk-engines >= 2.6.0 is required to use metatheme-gilouche" >&5 +-$as_echo "$as_me: error: gtk-engines >= 2.6.0 is required to use metatheme-gilouche" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-### Icon naming utils check +-UTILS_REQUIRED=0.6.0 +- +-{ $as_echo "$as_me:$LINENO: checking icon-naming-utils >= $UTILS_REQUIRED" >&5 +-$as_echo_n "checking icon-naming-utils >= $UTILS_REQUIRED... " >&6; } +-if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"icon-naming-utils >= \$UTILS_REQUIRED\"") >&5 + ($PKG_CONFIG --exists --print-errors "icon-naming-utils >= $UTILS_REQUIRED") 2>&5 + ac_status=$? +@@ -8062,11 +8004,6 @@ done + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac ;; + "po/stamp-it":C) +- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then +- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 +-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} +- { (exit 1); exit 1; }; } +- fi + rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" + >"po/stamp-it.tmp" + sed '/^#/d +@@ -8075,11 +8012,17 @@ $as_echo "$as_me: error: po/Makefile.in. + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" + ++ if test ! -f "po/Makefile"; then ++ { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5 ++$as_echo "$as_me: error: po/Makefile is not ready." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ mv "po/Makefile" "po/Makefile.tmp" + sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r po/POTFILES + } +- ' "po/Makefile.in" >"po/Makefile" ++ ' "po/Makefile.tmp" >"po/Makefile" + rm -f "po/Makefile.tmp" + mv "po/stamp-it.tmp" "po/stamp-it" + ;; +--- a/gtk-2.0/Makefile.in ++++ b/gtk-2.0/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/16x16/Makefile.in ++++ b/icons/16x16/Makefile.in +@@ -117,6 +117,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/16x16/actions/Makefile.in ++++ b/icons/16x16/actions/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/16x16/places/Makefile.in ++++ b/icons/16x16/places/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/16x16/status/Makefile.in ++++ b/icons/16x16/status/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/22x22/Makefile.in ++++ b/icons/22x22/Makefile.in +@@ -117,6 +117,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/22x22/actions/Makefile.in ++++ b/icons/22x22/actions/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/22x22/places/Makefile.in ++++ b/icons/22x22/places/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/22x22/status/Makefile.in ++++ b/icons/22x22/status/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/24x24/Makefile.in ++++ b/icons/24x24/Makefile.in +@@ -117,6 +117,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/24x24/actions/Makefile.in ++++ b/icons/24x24/actions/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/24x24/places/Makefile.in ++++ b/icons/24x24/places/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/24x24/status/Makefile.in ++++ b/icons/24x24/status/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/256x256/Makefile.in ++++ b/icons/256x256/Makefile.in +@@ -117,6 +117,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/256x256/actions/Makefile.in ++++ b/icons/256x256/actions/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/256x256/places/Makefile.in ++++ b/icons/256x256/places/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/256x256/status/Makefile.in ++++ b/icons/256x256/status/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/32x32/Makefile.in ++++ b/icons/32x32/Makefile.in +@@ -117,6 +117,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/32x32/actions/Makefile.in ++++ b/icons/32x32/actions/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/32x32/places/Makefile.in ++++ b/icons/32x32/places/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/32x32/status/Makefile.in ++++ b/icons/32x32/status/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/48x48/Makefile.in ++++ b/icons/48x48/Makefile.in +@@ -117,6 +117,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/48x48/actions/Makefile.in ++++ b/icons/48x48/actions/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/48x48/animations/Makefile.in ++++ b/icons/48x48/animations/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/48x48/places/Makefile.in ++++ b/icons/48x48/places/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/48x48/status/Makefile.in ++++ b/icons/48x48/status/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/icons/Makefile.in ++++ b/icons/Makefile.in +@@ -127,6 +127,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@ +--- a/metacity-1/Makefile.in ++++ b/metacity-1/Makefile.in +@@ -115,6 +115,7 @@ LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ + MSGMERGE = @MSGMERGE@