rev 5188 - in kde-extras/kde-style-klearlook/trunk/debian: . patches

Sune Vuorela pusling-guest at alioth.debian.org
Thu Dec 28 13:09:13 CET 2006


Author: pusling-guest
Date: 2006-12-28 13:09:11 +0100 (Thu, 28 Dec 2006)
New Revision: 5188

Added:
   kde-extras/kde-style-klearlook/trunk/debian/dirs
   kde-extras/kde-style-klearlook/trunk/debian/patches/
   kde-extras/kde-style-klearlook/trunk/debian/patches/01_fix_makefile.am.diff
   kde-extras/kde-style-klearlook/trunk/debian/patches/97_update_admin.diff
   kde-extras/kde-style-klearlook/trunk/debian/patches/series
Modified:
   kde-extras/kde-style-klearlook/trunk/debian/changelog
   kde-extras/kde-style-klearlook/trunk/debian/control
   kde-extras/kde-style-klearlook/trunk/debian/rules
Log:
Finishing reworking stuff and relibtoolizing.


Modified: kde-extras/kde-style-klearlook/trunk/debian/changelog
===================================================================
--- kde-extras/kde-style-klearlook/trunk/debian/changelog	2006-12-24 14:14:37 UTC (rev 5187)
+++ kde-extras/kde-style-klearlook/trunk/debian/changelog	2006-12-28 12:09:11 UTC (rev 5188)
@@ -1,3 +1,15 @@
+kde-style-klearlook (0.9.9.2-3) experimental; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Taking over for now (Closes: #394841)
+  * Relibtoolizing on build and fixes build-system
+  * Updating admin/
+  * Let us go experimental - this is not targetted etch - and too much have
+    been reworked.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 28 Dec 2006 13:00:06 +0100
+
 kde-style-klearlook (0.9.9.2-2) unstable; urgency=low
 
   * QA Upload.

Modified: kde-extras/kde-style-klearlook/trunk/debian/control
===================================================================
--- kde-extras/kde-style-klearlook/trunk/debian/control	2006-12-24 14:14:37 UTC (rev 5187)
+++ kde-extras/kde-style-klearlook/trunk/debian/control	2006-12-28 12:09:11 UTC (rev 5188)
@@ -1,8 +1,9 @@
 Source: kde-style-klearlook
 Section: kde
 Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, kdelibs4-dev
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Sune Vuorela <debian at pusling.com>
+Build-Depends: debhelper (>= 5), autotools-dev, kdelibs4-dev, libtool, automake1.9, autoconf, quilt
 Standards-Version: 3.7.2
 
 Package: kde-style-klearlook

Added: kde-extras/kde-style-klearlook/trunk/debian/dirs
===================================================================
--- kde-extras/kde-style-klearlook/trunk/debian/dirs	2006-12-24 14:14:37 UTC (rev 5187)
+++ kde-extras/kde-style-klearlook/trunk/debian/dirs	2006-12-28 12:09:11 UTC (rev 5188)
@@ -0,0 +1 @@
+usr/share/apps/kdisplay/color-schemes/

Added: kde-extras/kde-style-klearlook/trunk/debian/patches/01_fix_makefile.am.diff
===================================================================
--- kde-extras/kde-style-klearlook/trunk/debian/patches/01_fix_makefile.am.diff	2006-12-24 14:14:37 UTC (rev 5187)
+++ kde-extras/kde-style-klearlook/trunk/debian/patches/01_fix_makefile.am.diff	2006-12-28 12:09:11 UTC (rev 5188)
@@ -0,0 +1,24 @@
+--- kde-style-klearlook-0.9.9.2.orig/kde/Makefile.am
++++ kde-style-klearlook-0.9.9.2/kde/Makefile.am
+@@ -10,8 +10,8 @@
+ INCLUDES = -I$(top_srcdir)/kdefx $(all_includes)
+ noinst_HEADERS = klearlook.h common.h
+ kde_style_LTLIBRARIES = klearlook.la
+-klearlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-klearlook_la_LIBADD = -lkdefx 
++klearlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
++klearlook_la_LIBADD = -lkdefx $(LIB_QT)
+ klearlook_la_SOURCES = klearlook.cpp plugin.cpp common.c
+ klearlook_la_METASOURCES = AUTO
+ 
+--- kde-style-klearlook-0.9.9.2.orig/kde/config/Makefile.am
++++ kde-style-klearlook-0.9.9.2/kde/config/Makefile.am
+@@ -2,7 +2,7 @@
+ noinst_HEADERS = klearlookconfig.h
+ kde_module_LTLIBRARIES = kstyle_klearlook_config.la
+ kstyle_klearlook_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kstyle_klearlook_config_la_LIBADD  = $(LIB_KDEUI)
++kstyle_klearlook_config_la_LIBADD  = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+ kstyle_klearlook_config_la_SOURCES = klearlookconfigbase.ui klearlookconfig.cpp
+ kstyle_klearlook_config_la_METASOURCES = AUTO
+ 

Added: kde-extras/kde-style-klearlook/trunk/debian/patches/97_update_admin.diff
===================================================================
--- kde-extras/kde-style-klearlook/trunk/debian/patches/97_update_admin.diff	2006-12-24 14:14:37 UTC (rev 5187)
+++ kde-extras/kde-style-klearlook/trunk/debian/patches/97_update_admin.diff	2006-12-28 12:09:11 UTC (rev 5188)
@@ -0,0 +1,3652 @@
+--- kde-style-klearlook-0.9.9.2.orig/admin/Makefile.common
++++ kde-style-klearlook-0.9.9.2/admin/Makefile.common
+@@ -6,7 +6,7 @@
+ 
+ SHELL=/bin/sh
+ 
+-cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages:
++cvs dist configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages:
+ 	@admindir=$(admindir); \
+ 	if test "x$$admindir" = x; then \
+ 	  admindir=.; until test -f $$admindir/admin/cvs.sh; do \
+@@ -30,6 +30,8 @@
+ configure.in: configure.files subdirs
+ configure.files: subdirs
+ 
++svn: cvs
++
+ .SILENT:
+ 
+-.PHONY: cvs dist cvs-clean package-merge package-messages
++.PHONY: svn cvs dist package-merge package-messages
+--- kde-style-klearlook-0.9.9.2.orig/admin/acinclude.m4.in
++++ kde-style-klearlook-0.9.9.2/admin/acinclude.m4.in
+@@ -16,8 +16,8 @@
+ 
+ dnl    You should have received a copy of the GNU Library General Public License
+ dnl    along with this library; see the file COPYING.LIB.  If not, write to
+-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-dnl    Boston, MA 02111-1307, USA.
++dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++dnl    Boston, MA 02110-1301, USA.
+ 
+ dnl IMPORTANT NOTE:
+ dnl Please do not modify this file unless you expect your modifications to be
+@@ -593,6 +593,11 @@
+               if test "$kde_qtsubver" -le 2; then
+                 kde33ornewer=
+               fi
++              if test "$KDECONFIG" != "compiled"; then
++                if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
++                  kde33ornewer=
++                fi
++              fi
+             fi
+         fi
+ 
+@@ -606,7 +611,7 @@
+         fi
+         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
+ 
+-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
++        if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
+  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
+@@ -779,7 +784,7 @@
+    # CoreAudio framework
+    AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
+      AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
+-     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
++     FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
+    ])
+ 
+    AC_CHECK_RES_INIT
+@@ -803,6 +808,7 @@
+    KDE_CHECK_TYPES
+    KDE_CHECK_LIBDL
+    KDE_CHECK_STRLCPY
++   KDE_CHECK_PIE_SUPPORT
+ 
+ # darwin needs this to initialize the environment
+ AC_CHECK_HEADERS(crt_externs.h)
+@@ -1174,15 +1180,15 @@
+     if test $kde_qtsubver -gt 0; then
+ 	 if test $kde_qtsubver -gt 1; then
+ 	    if test $kde_qtsubver -gt 2; then
+-		kde_qt_minversion=">= Qt 3.3"
++		kde_qt_minversion=">= Qt 3.3 and < 4.0"
+ 	    else
+-	        kde_qt_minversion=">= Qt 3.2"
++	        kde_qt_minversion=">= Qt 3.2 and < 4.0"
+ 	    fi
+ 	 else
+-            kde_qt_minversion=">= Qt 3.1 (20021021)"
++            kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
+          fi
+     else
+-      kde_qt_minversion=">= Qt 3.0"
++      kde_qt_minversion=">= Qt 3.0 and < 4.0"
+     fi
+   fi
+   if test "$kde_qtver" = "1"; then
+@@ -1216,6 +1222,9 @@
+    kde_qt_verstring="$3"
+ fi
+ 
++if test $kde_qtver = 4; then
++  kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
++fi
+ if test $kde_qtver = 3; then
+   kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ fi
+@@ -1347,22 +1356,17 @@
+   fi
+ fi
+ 
+-if test -z "$LIBQT"; then
+ dnl ------------------------------------------------------------
+ dnl If we got --enable-embedded then adjust the Qt library name.
+ dnl ------------------------------------------------------------
+-  if test "x$kde_use_qt_emb" = "xyes"; then
+-    qtlib="qte"
+-  else
+-    qtlib="qt"
+-  fi
+-
+-  kde_int_qt="-l$qtlib"
++if test "x$kde_use_qt_emb" = "xyes"; then
++  qtlib="qte"
+ else
+-  kde_int_qt="$LIBQT"
+-  kde_lib_qt_set=yes
++  qtlib="qt"
+ fi
+ 
++kde_int_qt="-l$qtlib"
++
+ if test -z "$LIBQPE"; then
+ dnl ------------------------------------------------------------
+ dnl If we got --enable-palmtop then add -lqpe to the link line
+@@ -1383,13 +1387,8 @@
+ dnl ------------------------------------------------------------------------
+ 
+ if test "x$kde_use_qt_mt" = "xyes"; then
+-  if test -z "$LIBQT"; then
+-    LIBQT="-l$qtlib-mt"
+-    kde_int_qt="-l$qtlib-mt"
+-  else
+-    LIBQT="$qtlib-mt"
+-    kde_int_qt="$qtlib-mt"
+-  fi
++  LIBQT="-l$qtlib-mt"
++  kde_int_qt="-l$qtlib-mt"
+   LIBQT_GLOB="lib$qtlib-mt.*"
+   USING_QT_MT="using -mt"
+ else
+@@ -1644,7 +1643,15 @@
+ 
+ AC_MSG_RESULT([$kde_cv_uic_plugins])
+ if test "$kde_cv_uic_plugins" != yes; then
+-	AC_MSG_ERROR([you need to install kdelibs first.])
++	AC_MSG_ERROR([
++you need to install kdelibs first.
++
++If you did install kdelibs, then the Qt version that is picked up by
++this configure is not the same version you used to compile kdelibs. 
++The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
++_same Qt version_, compiled with the _same compiler_ and the same Qt
++configuration settings.
++])
+ fi
+ fi
+ ])
+@@ -1682,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
+@@ -2056,6 +2054,11 @@
+    AC_REQUIRE([K_PATH_X])
+ 
+ if test $kde_qtver = 3; then
++   case $host in 
++               *cygwin*) lib_kded="-lkdeinit_kded" ;;
++               *) lib_kded="" ;;
++       esac
++   AC_SUBST(LIB_KDED, $lib_kded)
+    AC_SUBST(LIB_KDECORE, "-lkdecore")
+    AC_SUBST(LIB_KDEUI, "-lkdeui")
+    AC_SUBST(LIB_KIO, "-lkio")
+@@ -2072,6 +2075,7 @@
+    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
+    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
++   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+ # these are for backward compatibility
+    AC_SUBST(LIB_KSYCOCA, "-lkio")
+    AC_SUBST(LIB_KFILE, "-lkio")
+@@ -2131,9 +2135,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],
+@@ -2490,22 +2491,16 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+ AC_TRY_LINK(
+-[/* Override any gcc2 internal prototype to avoid an error.  */
+-struct jpeg_decompress_struct;
+-typedef struct jpeg_decompress_struct * j_decompress_ptr;
+-typedef int size_t;
++[
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-    void jpeg_CreateDecompress(j_decompress_ptr cinfo,
+-                                    int version, size_t structsize);
++void jpeg_CreateDecompress();
+ #ifdef __cplusplus
+ }
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+ ],
+-            [jpeg_CreateDecompress(0L, 0, 0);],
++[jpeg_CreateDecompress();],
+             eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
+             eval "ac_cv_lib_jpeg_$1=no")
+ LIBS="$ac_save_LIBS"
+@@ -2712,6 +2707,73 @@
+ AC_SUBST(LIBTIFF)
+ ])
+ 
++AC_DEFUN([KDE_FIND_LIBEXR],
++[
++AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
++AC_REQUIRE([AC_FIND_ZLIB])
++AC_CACHE_VAL(ac_cv_libexr,
++[
++  if test -z "$PKG_CONFIG"; then
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++  fi
++
++  AC_MSG_CHECKING([for OpenEXR libraries])
++
++  if test "$PKG_CONFIG" = "no" ; then
++     AC_MSG_RESULT(no)
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     if !(`$PKG_CONFIG --exists OpenEXR`) ; then
++        AC_MSG_RESULT(no)
++        EXRSTATUS=no
++     else
++        if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
++           AC_MSG_RESULT(no)
++           EXRSTATUS=old
++        else
++           kde_save_LIBS="$LIBS"
++           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++           AC_LANG_SAVE
++           AC_LANG_CPLUSPLUS
++           kde_save_CXXFLAGS="$CXXFLAGS"
++           EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
++           CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
++
++           AC_TRY_LINK(dnl
++               [
++               #include <ImfRgbaFile.h>
++               ],
++               [
++               using namespace Imf;
++               RgbaInputFile file ("dummy");
++               return 0;
++               ],
++               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++               eval "ac_cv_libexr=no"
++           )
++           LIBS="$kde_save_LIBS"
++           CXXFLAGS="$kde_save_CXXFLAGS"
++           AC_LANG_RESTORE
++           ])dnl
++           if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
++               AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
++               LIB_EXR="$ac_cv_libexr"
++               AC_MSG_RESULT($ac_cv_libexr)
++           else
++               AC_MSG_RESULT(no)
++               LIB_EXR=""
++           fi
++        fi
++     fi
++  fi
++  AC_SUBST(LIB_EXR)
++  AC_SUBST(EXR_FLAGS)
++])
++
++
+ 
+ AC_DEFUN([AC_FIND_PNG],
+ [
+@@ -2900,6 +2962,76 @@
+   fi
+ ])
+ 
++
++AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
++[
++  AC_MSG_CHECKING([whether $CC is blacklisted])
++
++  dnl In theory we have tu run this test against $CC and $CXX
++  dnl in C and in C++ mode, because its perfectly legal for
++  dnl the user to mix compiler versions, since C has a defined
++  dnl ABI. 
++  dnl 
++  dnl For now, we assume the user is not on crack.
++
++  AC_TRY_COMPILE([
++#ifdef __GNUC__
++#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
++choke me
++#endif
++#endif
++], ,
++  kde_bad_compiler=no, 
++  kde_bad_compiler=yes
++)
++
++  AC_MSG_RESULT($kde_bad_compiler)
++
++if test "$kde_bad_compiler" = "yes"; then
++  AC_MSG_ERROR([
++
++This particular compiler version is blacklisted because it
++is known to miscompile KDE. Please use a newer version, or
++if that is not yet available, choose an older version. 
++
++Please do not report a bug or bother us reporting this
++configure error. We know about it, and we introduced
++it by intention to avoid untraceable bugs or crashes in KDE.
++
++])
++fi
++
++])
++
++
++AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
++[
++  AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
++    kde_cv_opt_noinline_match,
++  [
++  kde_cv_opt_noinline_match=irrelevant
++  dnl if we don't use both -O2 and -fno-inline, this check is moot
++  if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
++     && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
++
++    ac_cflags_save="$CFLAGS"
++    CFLAGS="$CFLAGS -D_USE_GNU"
++
++    AC_TRY_LINK([
++  #include <string.h>
++], [  const char *pt, *et;
++  et = __extension__      ({ char __a0, __a1, __a2;       (__builtin_constant_p (  ";,"  ) && ((size_t)(const void *)((   ";,"   )+ 1) - (size_t)(const void *)(   ";,"   ) == 1)        ? ((__a0 =((__const char  *) (  ";,"  ))[0], __a0 == '\0')     ? ((void) (  pt ),((void *)0) )        : ((__a1 = ((__const char *) (  ";,"  ))[1], __a1== '\0')      ? (__extension__ (__builtin_constant_p (  __a0 ) && ( __a0 ) == '\0'   ? (char *) __rawmemchr (   pt  ,   __a0)       : strchr(   pt  ,   __a0 )))   : ((__a2 = ((__const char *) (  ";,"  ))[2], __a2 == '\0')      ? __strpbrk_c2 (  pt , __a0, __a1)      :(((__const char *) (  ";,"  ))[3] == '\0'     ? __strpbrk_c3 (  pt ,__a0, __a1, __a2): strpbrk (  pt ,   ";,"  ))))) : strpbrk (  pt ,  ";,"  )); }) ;
++],
++    kde_cv_opt_noinline_match=yes,
++    kde_cv_opt_noinline_match=no
++    )
++
++    CFLAGS="$ac_cflags_save"
++  fi
++  ])
++])
++
++
+ dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
+ AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
+ [dnl
+@@ -2984,7 +3116,7 @@
+       if test $kde_use_debug_code = "full"; then
+         CFLAGS="-g3 -fno-inline $CFLAGS"
+       else
+-        CFLAGS="-g -O2 $CFLAGS"
++        CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
+       fi
+     else
+       CFLAGS="-O2 $CFLAGS"
+@@ -3009,6 +3141,8 @@
+ 
+   AC_PROG_CXX
+ 
++  KDE_CHECK_FOR_BAD_COMPILER
++
+   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+     if test "$kde_use_debug_code" != "no"; then
+       if test "$CXX" = "KCC"; then
+@@ -3017,7 +3151,7 @@
+         if test "$kde_use_debug_code" = "full"; then
+           CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
+         else
+-          CXXFLAGS="-g -O2 $CXXFLAGS"
++          CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
+         fi
+       fi
+       KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
+@@ -3030,7 +3164,7 @@
+         CXXFLAGS="+K3 $CXXFLAGS"
+       else
+         CXXFLAGS="-O2 $CXXFLAGS"
+-      fi  
++      fi
+     fi
+   fi
+ 
+@@ -3048,10 +3182,10 @@
+ 
+   if test "$kde_use_warnings" = "yes"; then
+       if test "$GCC" = "yes"; then
+-        CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
++        CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
+         case $host in
+           *-*-linux-gnu)	
+-            CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
++            CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
+             KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
+@@ -3059,7 +3193,8 @@
+         esac
+         KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
+         KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
+-        KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
++        dnl ### FIXME: revert for KDE 4
++        KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
+      fi
+   fi
+ 
+@@ -3076,6 +3211,14 @@
+   AC_SUBST([HAVE_GCC_VISIBILITY])
+ 
+   if test "$GXX" = "yes"; then
++    gcc_no_reorder_blocks=NO
++    KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
++    if test $kde_use_debug_code != "no" && \
++       test $kde_use_debug_code != "full" && \
++       test "YES" = "$gcc_no_reorder_blocks" ; then
++          CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
++          CFLAGS="$CFLAGS -fno-reorder-blocks"
++    fi
+     KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
+     KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
+     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
+@@ -3104,8 +3247,13 @@
+         fi
+         rm -f conftest.h conftest.h.gch
+     fi
+-    AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
++
++    KDE_CHECK_FOR_OPT_NOINLINE_MATCH
++    if test "x$kde_cv_opt_noinline_match" = "xno" ; then
++       CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
++    fi
+   fi
++  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
+   if test "$CXX" = "KCC"; then
+     dnl unfortunately we currently cannot disable exception support in KCC
+     dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
+@@ -3194,26 +3342,114 @@
+   ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
+ ])
+ 
+-AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
++AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
++  [
++    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
++      [
++        AC_LANG_SAVE
++        AC_LANG_CPLUSPLUS
++
++        safe_CXXFLAGS=$CXXFLAGS
++        safe_LDFLAGS=$LDFLAGS
++        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
++        LDFLAGS="$LDFLAGS -shared -fPIC"
++
++        AC_TRY_LINK(
++        [
++          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
++	  #include <string>
++          int some_function( void ) __attribute__ ((visibility("default")));
++          int some_function( void )
++          {
++	    std::string s("blafasel");
++            return 0;
++          }
++        ], [/* elvis is alive */],
++        kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
++
++        CXXFLAGS=$safe_CXXFLAGS
++        LDFLAGS=$safe_LDFLAGS
++        AC_LANG_RESTORE
++      ]
++    )
++
++    if test x$kde_cv_val_gcc_visibility_bug = xno; then
++      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
++    fi
++  ]
++)
++
++AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+ [
+-  if test "$GXX" = "yes"; then
+-    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
+-    KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
+-    KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
++  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
++
++  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
++
++  if test "x$GXX" = "xyes"; then
++    AC_LANG_SAVE
++    AC_LANG_CPLUSPLUS
++    AC_EGREP_CPP(
++       [GCC visibility push],
++       [ #include <exception> 
++       ], 
++    [
++      AC_MSG_RESULT(yes)
++      kde_stdc_visibility_patched=yes ],
++    [ 
++      AC_MSG_RESULT(no)
++      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
++                   visibility support. Disabling -fvisibility=hidden])
++
++      kde_stdc_visibility_patched=no ])
++
++    AC_LANG_RESTORE
++
++    kde_have_gcc_visibility=no
+     KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
+     [
+-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
++      kde_have_gcc_visibility=yes
++      dnl the whole toolchain is just a mess, gcc is just too buggy
++      dnl to handle STL with visibility enabled. Lets reconsider 
++      dnl when gcc 4.2 is out or when things get fixed in the compiler.
++      dnl Contact mueller at kde.org for details.
++      AC_ARG_ENABLE(gcc-hidden-visibility,
++        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
++          [kde_have_gcc_visibility=$enableval],
++          [kde_have_gcc_visibility=no])
++
++      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
++        [
++          AC_LANG_SAVE
++          AC_LANG_CPLUSPLUS
++
++          safe_CXXFLAGS=$CXXFLAGS
++          CXXFLAGS="$CXXFLAGS $all_includes"
++
++          AC_TRY_COMPILE(
++          [
++#include <qglobal.h>
++#if Q_EXPORT - 0 != 0
++/* if this compiles, then Q_EXPORT is undefined */
++/* if Q_EXPORT is nonempty, this will break compilation */
++#endif
++          ], [/* elvis is alive */],
++          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
++
++          CXXFLAGS=$safe_CXXFLAGS
++          AC_LANG_RESTORE
++        ]
++      )
++
++      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++        KDE_CHECK_VISIBILITY_GCC_BUG
+         HAVE_GCC_VISIBILITY=1
+         AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
++      fi
+     ])
+   fi
+ ])
+ 
+-AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+-[
+-  AC_REQUIRE([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY])
+-])
+-
+ AC_DEFUN([KDE_ADD_DEPENDENCIES],
+ [
+    [A]M_DEPENDENCIES(CC)
+@@ -3241,23 +3477,37 @@
+ KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
+ AC_SUBST(KDE_PLUGIN)
+ 
++# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
++KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
++AC_SUBST(KDE_CHECK_PLUGIN)
++
+ # we patch configure quite some so we better keep that consistent for incremental runs 
+ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
+ ])
+ 
+ AC_DEFUN([KDE_CHECK_LIB64],
+ [
+-    kdelibsuff="$kde_libs_suffix"
+-    if test -z "$kdelibsuff"; then
+-       kdelibsuff=no
+-    fi
+     AC_ARG_ENABLE(libsuffix,
+         AC_HELP_STRING([--enable-libsuffix],
+-            [/lib directory suffix (64,32,none[=default])]),
+-            kdelibsuff=$enableval)
+-    # TODO: add an auto case that compiles a little C app to check
+-    # where the glibc is
+-    if test "$kdelibsuff" = "no"; then
++            [/lib directory suffix (64,32,none,auto[=default])]),
++            kdelibsuff=$enableval, kdelibsuff="auto")
++    
++    if test "$kdelibsuff" = "auto"; then
++    
++cat > conftest.c << EOF
++#include <stdio.h>
++int main() {
++ return 0;
++}
++EOF
++        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
++    s,.*/lib\([[^\/]]*\)/.*,\1, 
++    p 
++}'`
++	rm -rf conftest.*
++    fi	
++	
++    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
+        kdelibsuff=
+     fi
+     if test -z "$kdelibsuff"; then
+@@ -3669,7 +3919,8 @@
+       ac_save_ldflags="$LDFLAGS"
+       ac_save_cflags="$CFLAGS"
+       ac_save_libs="$LIBS"
+-      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
++      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
++      LIBS="-lX11 -lXext $LIBSOCKET"
+       CFLAGS="$CFLAGS $X_INCLUDES"
+       test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
+       AC_TRY_LINK([
+@@ -3680,12 +3931,7 @@
+ 	  int foo_test_dpms()
+ 	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
+ 	  ac_cv_have_dpms="yes", [
+-              LDFLAGS="$ac_save_ldflags"
+-              CFLAGS="$ac_save_cflags"
+-              LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
+-              LIBS="$LIBS -lXdpms"
+-              CFLAGS="$CFLAGS $X_INCLUDES"
+-              test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
++              LIBS="-lXdpms $LIBS"
+               AC_TRY_LINK([
+ 	          #include <X11/Xproto.h>
+         	  #include <X11/X.h>
+@@ -3734,12 +3980,14 @@
+    [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
+  AC_CHECK_DECL(DPMSCapable,
+    AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
+-   [#include <X11/extensions/dpms.h>])
++   [#include <X11/Xlib.h>
++   #include <X11/extensions/dpms.h>])
+  AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
+    [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
+  AC_CHECK_DECL(DPMSInfo,
+    AC_DEFINE(HAVE_DPMSINFO_PROTO),,
+-   [#include <X11/extensions/dpms.h>])
++   [#include <X11/Xlib.h>
++   #include <X11/extensions/dpms.h>])
+  CFLAGS="$ac_save_cflags"
+  AC_SUBST(DPMSINC)
+  AC_SUBST(DPMSLIB)
+@@ -3765,11 +4013,13 @@
+    [
+     AC_LANG_SAVE
+     AC_LANG_CPLUSPLUS
+-    ac_save_ldflags="$LDFLAGS"
+-    ac_save_cxxflags="$CXXFLAGS"
+-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lGL -lGLU"
+-    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
+-    LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
++    ac_save_ldflags=$LDFLAGS
++    ac_save_cxxflags=$CXXFLAGS
++    ac_save_libs=$LIBS
++    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
++    LIBS="$LIBS -lGL -lGLU"
++    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
++    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
+     CXXFLAGS="$CFLAGS $X_INCLUDES"
+     test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
+     AC_TRY_LINK([#include <GL/gl.h>
+@@ -3777,8 +4027,9 @@
+ ], [],
+ 	ac_cv_have_gl="yes", ac_cv_have_gl="no")
+     AC_LANG_RESTORE
+-    LDFLAGS="$ac_save_ldflags"
+-    CXXFLAGS="$ac_save_cxxflags"
++    LDFLAGS=$ac_save_ldflags
++    CXXFLAGS=$ac_save_cxxflags
++    LIBS=$ac_save_libs
+    ])dnl
+ 
+   if test "$ac_cv_have_gl" = "no"; then
+@@ -4361,12 +4612,14 @@
+ 
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+-  KDE_CHECK_PYTHON_INTERN("2.4",
+-   [KDE_CHECK_PYTHON_INTERN("2.3", 
+-     [KDE_CHECK_PYTHON_INTERN("2.2", 
+-       [KDE_CHECK_PYTHON_INTERN("2.1", 
+-         [KDE_CHECK_PYTHON_INTERN("2.0", 
+-           [KDE_CHECK_PYTHON_INTERN($1, $2) ])
++  KDE_CHECK_PYTHON_INTERN("2.5",
++    [KDE_CHECK_PYTHON_INTERN("2.4",
++     [KDE_CHECK_PYTHON_INTERN("2.3", 
++       [KDE_CHECK_PYTHON_INTERN("2.2", 
++         [KDE_CHECK_PYTHON_INTERN("2.1", 
++           [KDE_CHECK_PYTHON_INTERN("2.0", 
++             [KDE_CHECK_PYTHON_INTERN($1, $2) ])
++           ])
+          ])
+        ])
+      ])
+@@ -4638,13 +4891,13 @@
+ 
+ AC_DEFUN([KDE_CHECK_HEADER],
+ [
+-   AC_LANG_SAVE
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
++   AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    AC_CHECK_HEADER([$1], [$2], [$3], [$4])
+-   CPPFLAGS=$kde_safe_cppflags
+    AC_LANG_RESTORE
++   CPPFLAGS=$kde_safe_cppflags
+ ])
+ 
+ AC_DEFUN([KDE_CHECK_HEADERS],
+@@ -4734,7 +4987,6 @@
+                     ])
+   fi
+   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+-  kde_libs_suffix=`$KDECONFIG --libsuffix`
+ 
+   AC_MSG_CHECKING([where to install])
+   if test "x$prefix" = "xNONE"; then
+@@ -5110,7 +5362,7 @@
+   JAVAC=$kde_java_bindir/javac
+   JAVAH=$kde_java_bindir/javah
+   JAR=$kde_java_bindir/jar
+-  JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
++  JVMLIBS="-Wl,-framework,JavaVM"
+ 
+   AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
+   AC_MSG_RESULT([Apple Java Framework])
+@@ -5653,11 +5905,55 @@
+ dnl also defines KSTUFF_PKG_ERRORS on error
+ AC_DEFUN([KDE_PKG_CHECK_MODULES], [
+ 
+-   PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
++   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
+    if test "$prefix" != "$kde_libs_prefix"; then
+-       PKG_CONFIG_PATH="$kde_libs_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
++       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
+    fi
+    export PKG_CONFIG_PATH
+-   PKG_CHECK_MODULES($1,$2,$3,$4)
++   PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
+ ])
+ 
++
++dnl Check for PIE support in the compiler and linker
++AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
++[
++  AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support,
++  [
++    AC_LANG_SAVE
++    AC_LANG_CPLUSPLUS
++    safe_CXXFLAGS=$CXXFLAGS
++    safe_LDFLAGS=$LDFLAGS
++    CXXFLAGS="$CXXFLAGS -fPIE"
++    LDFLAGS="$LDFLAGS -pie"
++
++    AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
++
++    CXXFLAGS=$safe_CXXFLAGS
++    LDFLAGS=$safe_LDFLAGS
++    AC_LANG_RESTORE
++  ])
++
++  AC_MSG_CHECKING(if enabling -pie/fPIE support)
++
++  AC_ARG_ENABLE(pie,
++    AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
++      [kde_has_pie_support=$enableval],
++      [kde_has_pie_support=detect])
++
++  if test "$kde_has_pie_support" = "detect"; then
++    kde_has_pie_support=$kde_cv_val_pie_support
++  fi
++
++  AC_MSG_RESULT([$kde_has_pie_support])
++
++  KDE_USE_FPIE=""
++  KDE_USE_PIE=""
++
++  AC_SUBST([KDE_USE_FPIE])
++  AC_SUBST([KDE_USE_PIE])
++
++  if test "$kde_has_pie_support" = "yes"; then
++    KDE_USE_FPIE="-fPIE"
++    KDE_USE_PIE="-pie"
++  fi
++])
+--- kde-style-klearlook-0.9.9.2.orig/admin/bcheck.pl
++++ kde-style-klearlook-0.9.9.2/admin/bcheck.pl
+@@ -0,0 +1,157 @@
++#!/usr/bin/perl -w
++
++use DB_File;
++use Fcntl ':flock';
++
++if (!defined($ARGV[0])) {
++    print "usage: requires .class dump as parameter!\n";
++    exit;
++}
++
++sub bailout
++{
++    untie %bcheckdb if(defined(%bcheckdb));
++
++    if(defined(MYLOCK)) {
++        flock MYLOCK, LOCK_UN;
++        close(MYLOCK);
++    }
++
++    print @_;
++    exit 5;
++}
++
++sub ask_user
++{
++    my ($dbkey, $dbchunk) = @_;
++
++    if (defined($ENV{"BCHECK_UPDATE"})) {
++        $bcheckdb{$dbkey} = $dbchunk;
++        return;
++    }
++
++    &bailout("BC problem detected") if (! -t STDIN);
++
++    print "(I)gnore / (Q)uit / (U)pdate: ";
++
++    my $key;
++    while(defined(read STDIN, $key, 1)) {
++        $key = lc($key);
++
++        print "got: >$key<\n";
++
++        return if ($key eq 'i');
++
++        &bailout("BC problem. aborted") if ($key eq 'q');
++
++        if ($key eq 'u') {
++            $bcheckdb{$dbkey} = $dbchunk;
++            return;
++        }
++        print "\n(I)gnore / (Q)uit / (U)pdate: ";
++    }
++}
++
++sub diff_chunk($$)
++{
++    my ($oldl, $newl) = @_;
++    my @old = split /^/m, $oldl;
++    my @new = split /^/m, $newl;
++    my $haschanges = 0;
++    my $max = $#old > $#new ? $#old : $#new;
++
++    die "whoops. key different" if ($old[0] ne $new[0]);
++
++    if ($#old != $#new) {
++        warn ("Structural difference.\n");
++        print @old;
++        print "-----------------------------------------------\n";
++        print @new;
++        $haschanges = 1;
++        return $haschanges;
++    }
++
++    print $old[0];
++
++    my ($class) = ($old[0] =~ /^(?:Class |Vtable for )(\S+)/);
++
++    my $c = 1;
++    while ($c < $max) {
++        my ($o, $n) = ($old[$c], $new[$c]);
++        chomp $o;
++        chomp $n;
++        $c++;
++        next if ($o eq $n);
++
++        if(defined($class) and $n =~ /^(\d+\s+)\w+(::\S+\s*.*)$/) {
++            next if ($n eq "$1$class$2");
++        }
++
++        $haschanges = 1;
++
++        print "-$o\n+$n\n\n";
++    }
++
++    return $haschanges;
++}
++
++local $dblock = $ENV{"HOME"} . "/bcheck.lock";
++my $dbfile = $ENV{"HOME"} . "/bcheck.db";
++my $cdump  = $ARGV[0];
++
++die "file $cdump is not readable: $!" if (! -f $cdump);
++
++# make sure the advisory lock exists
++open(MYLOCK, ">$dblock");
++print MYLOCK "";
++
++flock MYLOCK, LOCK_EX;
++
++tie %bcheckdb, 'DB_File', $dbfile;
++
++my $chunk = "";
++
++open (IN, "<$cdump") or die "cannot open $cdump: $!";
++while (<IN>) {
++
++    chop;
++
++    s/0x[0-9a-fA-F]+/0x......../g;
++    s/base size=/size=/g;
++    s/\(\)\s*$//g;
++    s/base align=/align=/g;
++
++    $chunk .= $_ . "\n";
++
++    if(/^\s*$/) {
++        my @lines = split /^/m, $chunk;
++        my $key = $lines[0];
++        chomp $key;
++
++        if($key !~ /<anonymous struct>/ &&
++           $key !~ /<anonymous union>/) {
++            if(defined($bcheckdb{$key})) {
++                my $dbversion = $bcheckdb{$key};
++
++                if($dbversion ne $chunk) {
++                     &ask_user($key, $chunk) if(&diff_chunk($dbversion, $chunk));
++                }
++            }
++            else {
++                $bcheckdb{$key} = $chunk;
++                print "NEW: $key\n";
++            }
++        }
++
++        $chunk = "";
++        next;
++    }
++
++}
++close(IN);
++
++untie %bcheckdb;
++flock MYLOCK, LOCK_UN;
++close(MYLOCK);
++
++exit 0;
+--- kde-style-klearlook-0.9.9.2.orig/admin/am_edit
++++ kde-style-klearlook-0.9.9.2/admin/am_edit
+@@ -351,7 +351,7 @@
+     my $tmp = "force-reedit:\n";
+     $tmp   .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
+     appendLines($tmp);
+-    
++
+     make_bcheck_target();
+     make_meta_classes();
+     tag_COMPILE_FIRST();
+@@ -422,10 +422,6 @@
+       substituteLine($lookup, "RECURSIVE_TARGETS = $1 nmcheck-recursive bcheck-recursive");
+     }
+ 
+-    my $cvs_lines = "cvs-clean:\n";
+-    $cvs_lines .= "\t\$(MAKE) admindir=\$(top_srcdir)/admin -f \$(top_srcdir)/admin/Makefile.common cvs-clean\n";
+-    appendLines($cvs_lines);
+-
+     $cvs_lines  = "kde-rpo-clean:\n";
+     $cvs_lines .= "\t-rm -f *.rpo\n";
+     appendLines($cvs_lines);
+@@ -483,6 +479,7 @@
+             $MakefileData =~ s/$lookup/$replacement/;
+             $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
+             $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
++            next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
+             substituteLine($lookup, $replacement);
+         } else {
+             $found = 0;
+@@ -634,7 +631,7 @@
+ 		if ($pre eq '' && exists($varcontent{$variable})) {
+ 		    my @addlist = split(/[\034\s]+/, $varcontent{$variable});
+ 		    push(@objlist, @addlist);
+-                } elsif ($variable !~ 'OBJEXT') {
++                } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
+                     $ocv = 1;
+ 		}
+             }
+@@ -875,8 +872,9 @@
+                 $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}.la.$cxxsuffix\n";
+ 
+                 $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n";
+-                $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
+-                $lines .= "\techo 'extern \"C\" int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
++                $lines .= "\techo '#include <kdemacros.h>' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
++                $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${kdeinit}_dummy.$cxxsuffix; \\\n";
++                $lines .= "\techo 'extern \"C\" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
+ 
+                 push(@cleanfiles, "${kdeinit}.la.$cxxsuffix");
+                 push(@cleanfiles, "${kdeinit}_dummy.$cxxsuffix");
+@@ -1376,8 +1374,11 @@
+ 		$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
+                 $dep_lines .= "$source.h: $sourcedir$source.ui\n";
+                 $dep_lines .= "\trm -rf $source.h;\n";
+-                $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
+-
++                if (!$kdeopts{"qtonly"}) {
++                    $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
++                } else {
++                    $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
++                }
+                 $dep_lines .= "$source.moc: $source.h\n";
+                 $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
+ 
+@@ -1931,21 +1932,21 @@
+         $foundfiles{$file} = 0 if (defined $foundfiles{$file});
+     }
+ 
+-#    my $KDE_DIST = "";
+-#    foreach $file (keys %foundfiles) {
+-#        if ($foundfiles{$file} == 1) {
+-#            $KDE_DIST .= "$file ";
+-#        }
+-#    }
+-#    if ($KDE_DIST) {
+-#        print "KDE_DIST $printname $KDE_DIST\n" if ($verbose);
+-#
+-#        my $lookup = 'DISTFILES\s*=[ \t]*(.*)';
+-#        if ($MakefileData =~ /\n$lookup/) {
+-#            substituteLine($lookup, "DISTFILES = $1 \$(KDE_DIST)");
+-#            appendLines("KDE_DIST=$KDE_DIST\n");
+-#        }
+-#    }
++    my $KDE_DIST = "";
++    foreach $file (keys %foundfiles) {
++        if ($foundfiles{$file} == 1) {
++            $KDE_DIST .= "$file ";
++        }
++    }
++    if ($KDE_DIST) {
++        print "KDE_DIST $printname $KDE_DIST\n" if ($verbose);
++
++        my $lookup = 'DISTFILES\s*=[ \t]*(.*)';
++        if ($MakefileData =~ /\n$lookup/) {
++            substituteLine($lookup, "DISTFILES = $1 \$(KDE_DIST)");
++            appendLines("KDE_DIST=$KDE_DIST\n");
++        }
++    }
+ }
+ 
+ #-----------------------------------------------------------------------------
+@@ -2027,7 +2028,7 @@
+ 
+       $lines .= "\n";
+       $lines .= "uninstall-docs:\n";
+-      $lines .= "\t-rm -rf \$(kde_htmldir)/$kdelang/$appname\n";
++      $lines .= "\t-rm -rf \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n";
+       $lines .= "\n";
+       $lines .= "clean-docs:\n";
+       $lines .= "\t-rm -f index.cache.bz2\n";
+@@ -2276,7 +2277,7 @@
+            "\t        echo \"\$\$i\"; \\\n" . 
+            "\t        if ! ";
+     $t .=  $cxxsuffix eq "KKK" ?
+-           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
++           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
+            "\$(CXXCOMPILE) ";
+     $t .=  " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
+            "\t            rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
+@@ -2352,7 +2353,7 @@
+     $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
+     # Append our $progId line, _below_ the "generated by automake" line
+     # because automake-1.6 relies on the first line to be his own.
+-    my $progIdLine = "\# $progId - " . '$Revision: 1.1 $ '."\n";
++    my $progIdLine = "\# $progId - " . '$Revision: 483858 $ '."\n";
+     if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+         warn "automake line not found in $makefile\n";
+ 	# Fallback: first line
+--- kde-style-klearlook-0.9.9.2.orig/admin/conf.change.pl
++++ kde-style-klearlook-0.9.9.2/admin/conf.change.pl
+@@ -19,8 +19,8 @@
+ 
+ #   You should have received a copy of the GNU Library General Public License
+ #   along with this library; see the file COPYING.LIB.  If not, write to
+-#   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-#   Boston, MA 02111-1307, USA.
++#   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++#   Boston, MA 02110-1301, USA.
+ 
+ # we have to change two places
+ # 1. the splitting of the substitutions into chunks of 90 (or even 48 in
+--- kde-style-klearlook-0.9.9.2.orig/admin/compile
++++ kde-style-klearlook-0.9.9.2/admin/compile
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+-
+ # Wrapper for compilers which do not understand `-c -o'.
+ 
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++scriptversion=2005-05-14.22
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ # Written by Tom Tromey <tromey at cygnus.com>.
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -17,83 +18,125 @@
+ #
+ # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+-# Usage:
+-# compile PROGRAM [ARGS]...
+-# `-o FOO.o' is removed from the args passed to the actual compile.
+-
+-prog=$1
+-shift
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++case $1 in
++  '')
++     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
++     exit 1;
++     ;;
++  -h | --h*)
++    cat <<\EOF
++Usage: compile [--help] [--version] PROGRAM [ARGS]
++
++Wrapper for compilers which do not understand `-c -o'.
++Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
++arguments, and rename the output as expected.
++
++If you are trying to build a whole package this is not the
++right script to run: please start by reading the file `INSTALL'.
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++    exit $?
++    ;;
++  -v | --v*)
++    echo "compile $scriptversion"
++    exit $?
++    ;;
++esac
+ 
+ ofile=
+ cfile=
+-args=
+-while test $# -gt 0; do
+-   case "$1" in
+-    -o)
+-       # configure might choose to run compile as `compile cc -o foo foo.c'.
+-       # So we do something ugly here.
+-       ofile=$2
+-       shift
+-       case "$ofile" in
+-	*.o | *.obj)
+-	   ;;
+-	*)
+-	   args="$args -o $ofile"
+-	   ofile=
+-	   ;;
+-       esac
+-       ;;
+-    *.c)
+-       cfile=$1
+-       args="$args $1"
+-       ;;
+-    *)
+-       args="$args $1"
+-       ;;
+-   esac
+-   shift
++eat=
++
++for arg
++do
++  if test -n "$eat"; then
++    eat=
++  else
++    case $1 in
++      -o)
++	# configure might choose to run compile as `compile cc -o foo foo.c'.
++	# So we strip `-o arg' only if arg is an object.
++	eat=1
++	case $2 in
++	  *.o | *.obj)
++	    ofile=$2
++	    ;;
++	  *)
++	    set x "$@" -o "$2"
++	    shift
++	    ;;
++	esac
++	;;
++      *.c)
++	cfile=$1
++	set x "$@" "$1"
++	shift
++	;;
++      *)
++	set x "$@" "$1"
++	shift
++	;;
++    esac
++  fi
++  shift
+ done
+ 
+ if test -z "$ofile" || test -z "$cfile"; then
+-   # If no `-o' option was seen then we might have been invoked from a
+-   # pattern rule where we don't need one.  That is ok -- this is a
+-   # normal compilation that the losing compiler can handle.  If no
+-   # `.c' file was seen then we are probably linking.  That is also
+-   # ok.
+-   exec "$prog" $args
++  # If no `-o' option was seen then we might have been invoked from a
++  # pattern rule where we don't need one.  That is ok -- this is a
++  # normal compilation that the losing compiler can handle.  If no
++  # `.c' file was seen then we are probably linking.  That is also
++  # ok.
++  exec "$@"
+ fi
+ 
+ # Name of file we expect compiler to create.
+-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+ 
+ # Create the lock directory.
+ # Note: use `[/.-]' here to ensure that we don't use the same name
+ # that we are using for the .o file.  Also, base the name on the expected
+ # object file name, since that is what matters with a parallel build.
+-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+ while true; do
+-   if mkdir $lockdir > /dev/null 2>&1; then
+-      break
+-   fi
+-   sleep 1
++  if mkdir "$lockdir" >/dev/null 2>&1; then
++    break
++  fi
++  sleep 1
+ done
+ # FIXME: race condition here if user kills between mkdir and trap.
+-trap "rmdir $lockdir; exit 1" 1 2 15
++trap "rmdir '$lockdir'; exit 1" 1 2 15
+ 
+ # Run the compile.
+-"$prog" $args
+-status=$?
++"$@"
++ret=$?
+ 
+ if test -f "$cofile"; then
+-   mv "$cofile" "$ofile"
++  mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++  mv "${cofile}bj" "$ofile"
+ fi
+ 
+-rmdir $lockdir
+-exit $status
++rmdir "$lockdir"
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- kde-style-klearlook-0.9.9.2.orig/admin/configure.in.bot.end
++++ kde-style-klearlook-0.9.9.2/admin/configure.in.bot.end
+@@ -16,6 +16,21 @@
+   fi
+ fi
+ 
++if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
++  echo ""
++  echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
++  echo "was not included. Therefore, GCC symbol visibility support remains disabled."
++  echo ""
++  echo "For better performance, consider including the Qt visibility supporting patch"
++  echo "located at:"
++  echo ""
++  echo "http://bugs.kde.org/show_bug.cgi?id=109386"
++  echo ""
++  echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
++  echo "everything will continue to work just fine without it."
++  echo ""
++fi
++
+ if test "$all_tests" = "bad"; then
+   if test ! "$cache_file" = "/dev/null"; then
+     echo ""
+--- kde-style-klearlook-0.9.9.2.orig/admin/config.pl
++++ kde-style-klearlook-0.9.9.2/admin/config.pl
+@@ -25,8 +25,8 @@
+ 
+ #   You should have received a copy of the GNU Library General Public License
+ #   along with this library; see the file COPYING.LIB.  If not, write to
+-#   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-#   Boston, MA 02111-1307, USA.
++#   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++#   Boston, MA 02110-1301, USA.
+ 
+ use strict;
+ 
+@@ -53,6 +53,7 @@
+ 
+ open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
+ my @subs = <CF>;
++my $pat;
+ close(CF);
+ chomp @subs;
+ @comp_match=();
+@@ -60,7 +61,7 @@
+ 
+ if ($bad_perl) {
+     print "Using perl older than version 5.005\n";
+-    foreach my $pat (@subs) {
++    foreach $pat (@subs) {
+ 	if (  ($pat =~ m/s%([^%]*)%([^%]*)%g/ )
+ 	   || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ )
+            || ($pat =~ m/s,([^,]*),(.*),;t/)
+@@ -85,7 +86,7 @@
+ 	}
+     }
+ } else {
+-    foreach my $pat (@subs) {
++    foreach $pat (@subs) {
+        if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) ||
+             ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) ||
+             ($pat =~ /s,([^,]*),(.*),;t/) ) {
+@@ -192,8 +193,9 @@
+     my $filedata;
+     my @infiles=split(' ', $infiles);
+     my $i=0;
++    my $name;
+ 
+-    foreach my $name (@infiles) {
++    foreach $name (@infiles) {
+ 	if (open(CF, "< $name")) {
+ 	    while (<CF>) {
+ 		$filedata .= $_;
+--- kde-style-klearlook-0.9.9.2.orig/admin/configure.in.min
++++ kde-style-klearlook-0.9.9.2/admin/configure.in.min
+@@ -13,8 +13,8 @@
+  
+ dnl    You should have received a copy of the GNU Library General Public License
+ dnl    along with this library; see the file COPYING.LIB.  If not, write to
+-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-dnl    Boston, MA 02111-1307, USA.
++dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++dnl    Boston, MA 02110-1301, USA.
+ 
+ # Original Author was Kalle at kde.org
+ # I lifted it in some mater. (Stephan Kulow)
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
+--- kde-style-klearlook-0.9.9.2.orig/admin/cvs.sh
++++ kde-style-klearlook-0.9.9.2/admin/cvs.sh
+@@ -32,7 +32,7 @@
+ required_autoconf_version="2.53 or newer"
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+ case $AUTOCONF_VERSION in
+-  Autoconf*2.5* | autoconf*2.5* ) : ;;
++  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
+   "" )
+     echo "*** AUTOCONF NOT FOUND!."
+     echo "*** KDE requires autoconf $required_autoconf_version"
+@@ -44,10 +44,10 @@
+     exit 1
+     ;;
+ esac
+- 
++
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+-  Autoconf*2.5* | autoheader*2.5* ) : ;;
++  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+   "" )
+     echo "*** AUTOHEADER NOT FOUND!."
+     echo "*** KDE requires autoheader $required_autoconf_version"
+@@ -60,8 +60,6 @@
+     ;;
+ esac
+ 
+-unset UNSERMAKE || :
+-
+ AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
+ required_automake_version="1.6.1 or newer"
+ case $AUTOMAKE_STRING in
+@@ -70,7 +68,10 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) : ;;
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++    echo "*** $AUTOMAKE_STRING found."
++    UNSERMAKE=no
++    ;;
+   "" )
+     echo "*** AUTOMAKE NOT FOUND!."
+     echo "*** KDE requires automake $required_automake_version"
+@@ -130,12 +131,13 @@
+ if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+   echo "*** Creating config.h template"
+   $AUTOHEADER || exit 1
++  touch config.h.in
+ fi
+ 
+ echo "*** Creating Makefile templates"
+ $AUTOMAKE || exit 1
+ 
+-if test -z "$UNSERMAKE"; then
++if test "$UNSERMAKE" = no; then
+   echo "*** Postprocessing Makefile templates"
+   perl -w admin/am_edit || exit 1
+ fi
+@@ -185,9 +187,10 @@
+ if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+   echo "*** Creating config.h template"
+   $AUTOHEADER || exit 1
++  touch config.h.in
+ fi
+-$AUTOMAKE --foreign
+-if test -z "$UNSERMAKE"; then
++$AUTOMAKE --foreign || exit 1
++if test "$UNSERMAKE" = no; then
+   echo "*** Postprocessing Makefile templates"
+   perl -w admin/am_edit || exit 1
+ fi
+@@ -218,6 +221,7 @@
+ {
+ $ACLOCAL $ACLOCALFLAGS
+ $AUTOHEADER
++touch config.h.in
+ $AUTOMAKE
+ AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
+ case $AUTOMAKE_STRING in
+@@ -312,7 +316,7 @@
+    fi
+ fi
+ if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
+-     VERSION="\"3.3.92\""
++     VERSION="\"3.5.5\""
+ fi
+ if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
+    modulename=`pwd`; 
+@@ -505,17 +509,6 @@
+   fi
+ }
+ 
+-cvs_clean()
+-{
+-if test -d CVS; then :; else
+-  echo "You don't have a toplevel CVS directory."
+-  echo "You most certainly didn't use cvs to get these sources."
+-  echo "But this function depends on cvs's information."
+-  exit 1
+-fi
+-perl $admindir/cvs-clean.pl
+-}
+-
+ package_merge()
+ {
+ catalogs=$POFILES
+@@ -555,13 +548,16 @@
+ 	    echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line"
+ 	fi
+    fi
+-   if find . -name \*.c\* -o -name \*.h\* | xargs fgrep -s -q KAboutData ; then
++   if find . -name \*.c\* -o -name \*.h\* | fgrep -v ".svn" | xargs fgrep -s -q KAboutData ; then
+ 	echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
+    else echo " " > _translatorinfo.cpp
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
++   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++   if ! test -f $kdepotpath; then
++	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++   fi
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ 	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
+@@ -584,7 +580,7 @@
+ mkdir po.backup
+ 
+ for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
+-  egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
++  egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
+   cat po/$i > po.backup/backup_$i
+   touch -r po/$i po.backup/backup_$i
+   rm po/$i
+@@ -596,11 +592,11 @@
+   test -f po/$i || echo "disappeared: $i"
+ done
+ for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
+-   sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
+-   #msgmerge -q -o po/$i po/$i po/$i
+-   egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
++  sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
++  #msgmerge -q -o po/$i po/$i po/$i
++  egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
+   if test -f po.backup/$i && ! cmp -s temp.pot po.backup/$i; then
+-	echo "will update $i"
++    echo "will update $i"
+   else
+     if test -f po.backup/backup_$i; then
+       test -z "$VERBOSE" || echo "I'm restoring $i"
+@@ -615,7 +611,9 @@
+ rm -rf po.backup
+ }
+ 
+-unset LC_ALL || :
++# Make sure that sorting is always done the same way
++LC_ALL=C
++export LC_ALL
+ unset LANG || :
+ unset LC_CTYPE || :
+ unset LANGUAGE || :
+@@ -633,8 +631,9 @@
+   rm -f $makefile_wo
+ fi
+ 
+-# Suck in the AUTOCONF detection code
+-. $admindir/detect-autoconf.sh
++# Call script to find autoconf and friends.  Uses eval since the script outputs
++# sh-compatible code.
++eval `$admindir/detect-autoconf.pl`
+ 
+ ###
+ ### Main
+@@ -647,7 +646,7 @@
+   configure ) call_and_fix_autoconf ;;
+   * ) echo "Usage: cvs.sh <target>"
+       echo "Target can be one of:"
+-      echo "    cvs cvs-clean dist"
++      echo "    cvs svn dist"
+       echo "    configure.in configure.files"
+       echo "    package-merge package-messages"
+       echo ""
+--- kde-style-klearlook-0.9.9.2.orig/admin/depcomp
++++ kde-style-klearlook-0.9.9.2/admin/depcomp
+@@ -1,7 +1,9 @@
+ #! /bin/sh
+-
+ # depcomp - compile a program generating dependencies as side-effects
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++
++scriptversion=2005-07-09.11
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 
+ # 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
+@@ -15,8 +17,8 @@
+ 
+ # 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -25,13 +27,45 @@
+ 
+ # Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+ 
++case $1 in
++  '')
++     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
++     exit 1;
++     ;;
++  -h | --h*)
++    cat <<\EOF
++Usage: depcomp [--help] [--version] PROGRAM [ARGS]
++
++Run PROGRAMS ARGS to compile a file, generating dependencies
++as side-effects.
++
++Environment variables:
++  depmode     Dependency tracking mode.
++  source      Source file read by `PROGRAMS ARGS'.
++  object      Object file output by `PROGRAMS ARGS'.
++  DEPDIR      directory where to store dependencies.
++  depfile     Dependency file to output.
++  tmpdepfile  Temporary file to use when outputing dependencies.
++  libtool     Whether libtool is used (yes/no).
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++    exit $?
++    ;;
++  -v | --v*)
++    echo "depcomp $scriptversion"
++    exit $?
++    ;;
++esac
++
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+   echo "depcomp: Variables source, object and depmode must be set" 1>&2
+   exit 1
+ fi
+-# `libtool' can also be set to `yes' or `no'.
+ 
+-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
++depfile=${depfile-`echo "$object" |
++  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+ 
+ rm -f "$tmpdepfile"
+@@ -163,19 +197,25 @@
+ 
+ aix)
+   # The C for AIX Compiler uses -M and outputs the dependencies
+-  # in a .u file.  This file always lives in the current directory.
+-  # Also, the AIX compiler puts `$object:' at the start of each line;
+-  # $object doesn't have directory information.
+-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
++  # in a .u file.  In older versions, this file always lives in the
++  # current directory.  Also, the AIX compiler puts `$object:' at the
++  # start of each line; $object doesn't have directory information.
++  # Version 6 uses the directory in both cases.
++  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+   tmpdepfile="$stripped.u"
+-  outname="$stripped.o"
+   if test "$libtool" = yes; then
+     "$@" -Wc,-M
+   else
+     "$@" -M
+   fi
+-
+   stat=$?
++
++  if test -f "$tmpdepfile"; then :
++  else
++    stripped=`echo "$stripped" | sed 's,^.*/,,'`
++    tmpdepfile="$stripped.u"
++  fi
++
+   if test $stat -eq 0; then :
+   else
+     rm -f "$tmpdepfile"
+@@ -183,6 +223,7 @@
+   fi
+ 
+   if test -f "$tmpdepfile"; then
++    outname="$stripped.o"
+     # Each line is of the form `foo.o: dependent.h'.
+     # Do two passes, one to just change these to
+     # `$object: dependent.h' and one to simply `dependent.h:'.
+@@ -198,11 +239,9 @@
+   ;;
+ 
+ icc)
+-  # Must come before tru64.
+-
+-  # Intel's C compiler understands `-MD -MF file'.  However
++  # Intel's C compiler understands `-MD -MF file'.  However on
+   #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+-  # will fill foo.d with something like
++  # ICC 7.0 will fill foo.d with something like
+   #    foo.o: sub/foo.c
+   #    foo.o: sub/foo.h
+   # which is wrong.  We want:
+@@ -210,6 +249,12 @@
+   #    sub/foo.o: sub/foo.h
+   #    sub/foo.c:
+   #    sub/foo.h:
++  # ICC 7.1 will output
++  #    foo.o: sub/foo.c sub/foo.h
++  # and will wrap long lines using \ :
++  #    foo.o: sub/foo.c ... \
++  #     sub/foo.h ... \
++  #     ...
+ 
+   "$@" -MD -MF "$tmpdepfile"
+   stat=$?
+@@ -219,45 +264,70 @@
+     exit $stat
+   fi
+   rm -f "$depfile"
+-  # Each line is of the form `foo.o: dependent.h'.
++  # Each line is of the form `foo.o: dependent.h',
++  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+   # Do two passes, one to just change these to
+   # `$object: dependent.h' and one to simply `dependent.h:'.
+-  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+-  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
++  # Some versions of the HPUX 10.20 sed can't process this invocation
++  # correctly.  Breaking it into two sed invocations is a workaround.
++  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
++    sed -e 's/$/ :/' >> "$depfile"
+   rm -f "$tmpdepfile"
+   ;;
+ 
+ tru64)
+-   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
++   # The Tru64 compiler uses -MD to generate dependencies as a side
+    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
++   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+    # dependencies in `foo.d' instead, so we check for that too.
+    # Subdirectories are respected.
++   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++   test "x$dir" = "x$object" && dir=
++   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ 
+-   tmpdepfile1="$object.d"
+-   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
+    if test "$libtool" = yes; then
++      # With Tru64 cc, shared objects can also be used to make a
++      # static library.  This mecanism is used in libtool 1.4 series to
++      # handle both shared and static libraries in a single compilation.
++      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
++      #
++      # With libtool 1.5 this exception was removed, and libtool now
++      # generates 2 separate objects for the 2 libraries.  These two
++      # compilations output dependencies in in $dir.libs/$base.o.d and
++      # in $dir$base.o.d.  We have to check for both files, because
++      # one of the two compilations can be disabled.  We should prefer
++      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
++      # automatically cleaned when .libs/ is deleted, while ignoring
++      # the former would cause a distcleancheck panic.
++      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
++      tmpdepfile2=$dir$base.o.d          # libtool 1.5
++      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
++      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+       "$@" -Wc,-MD
+    else
++      tmpdepfile1=$dir$base.o.d
++      tmpdepfile2=$dir$base.d
++      tmpdepfile3=$dir$base.d
++      tmpdepfile4=$dir$base.d
+       "$@" -MD
+    fi
+ 
+    stat=$?
+    if test $stat -eq 0; then :
+    else
+-      rm -f "$tmpdepfile1" "$tmpdepfile2"
++      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+       exit $stat
+    fi
+ 
+-   if test -f "$tmpdepfile1"; then
+-      tmpdepfile="$tmpdepfile1"
+-   else
+-      tmpdepfile="$tmpdepfile2"
+-   fi
++   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++   do
++     test -f "$tmpdepfile" && break
++   done
+    if test -f "$tmpdepfile"; then
+       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+-      # That's a space and a tab in the [].
+-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++      # That's a tab and a space in the [].
++      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    else
+       echo "#dummy" > "$depfile"
+    fi
+@@ -270,34 +340,42 @@
+ 
+ dashmstdout)
+   # Important note: in order to support this mode, a compiler *must*
+-  # always write the proprocessed file to stdout, regardless of -o,
+-  # because we must use -o when running libtool.
+-  test -z "$dashmflag" && dashmflag=-M
+-  ( IFS=" "
+-    case " $* " in
+-    *" --mode=compile "*) # this is libtool, let us make it quiet
+-      for arg
+-      do # cycle over the arguments
+-        case "$arg" in
+-	"--mode=compile")
+-	  # insert --quiet before "--mode=compile"
+-	  set fnord "$@" --quiet
+-	  shift # fnord
+-	  ;;
+-	esac
+-	set fnord "$@" "$arg"
+-	shift # fnord
+-	shift # "$arg"
+-      done
++  # always write the preprocessed file to stdout, regardless of -o.
++  "$@" || exit $?
++
++  # Remove the call to Libtool.
++  if test "$libtool" = yes; then
++    while test $1 != '--mode=compile'; do
++      shift
++    done
++    shift
++  fi
++
++  # Remove `-o $object'.
++  IFS=" "
++  for arg
++  do
++    case $arg in
++    -o)
++      shift
++      ;;
++    $object)
++      shift
++      ;;
++    *)
++      set fnord "$@" "$arg"
++      shift # fnord
++      shift # $arg
+       ;;
+     esac
+-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
+-  ) &
+-  proc=$!
+-  "$@"
+-  stat=$?
+-  wait "$proc"
+-  if test "$stat" != 0; then exit $stat; fi
++  done
++
++  test -z "$dashmflag" && dashmflag=-M
++  # Require at least two characters before searching for `:'
++  # in the target name.  This is to cope with DOS-style filenames:
++  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
++  "$@" $dashmflag |
++    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+   rm -f "$depfile"
+   cat < "$tmpdepfile" > "$depfile"
+   tr ' ' '
+@@ -315,36 +393,40 @@
+   ;;
+ 
+ makedepend)
+-  # X makedepend
+-  (
+-    shift
+-    cleared=no
+-    for arg in "$@"; do
+-      case $cleared in no)
+-        set ""; shift
+-	cleared=yes
+-      esac
+-      case "$arg" in
+-        -D*|-I*)
+-	  set fnord "$@" "$arg"; shift;;
+-	-*)
+-	  ;;
+-	*)
+-	  set fnord "$@" "$arg"; shift;;
+-      esac
++  "$@" || exit $?
++  # Remove any Libtool call
++  if test "$libtool" = yes; then
++    while test $1 != '--mode=compile'; do
++      shift
+     done
+-    obj_suffix="`echo $object | sed 's/^.*\././'`"
+-    touch "$tmpdepfile"
+-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+-  ) &
+-  proc=$!
+-  "$@"
+-  stat=$?
+-  wait "$proc"
+-  if test "$stat" != 0; then exit $stat; fi
++    shift
++  fi
++  # X makedepend
++  shift
++  cleared=no
++  for arg in "$@"; do
++    case $cleared in
++    no)
++      set ""; shift
++      cleared=yes ;;
++    esac
++    case "$arg" in
++    -D*|-I*)
++      set fnord "$@" "$arg"; shift ;;
++    # Strip any option that makedepend may not understand.  Remove
++    # the object too, otherwise makedepend will parse it as a source file.
++    -*|$object)
++      ;;
++    *)
++      set fnord "$@" "$arg"; shift ;;
++    esac
++  done
++  obj_suffix="`echo $object | sed 's/^.*\././'`"
++  touch "$tmpdepfile"
++  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+   rm -f "$depfile"
+   cat < "$tmpdepfile" > "$depfile"
+-  tail +3 "$tmpdepfile" | tr ' ' '
++  sed '1,2d' "$tmpdepfile" | tr ' ' '
+ ' | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly.  Breaking it into two sed invocations is a workaround.
+@@ -354,35 +436,40 @@
+ 
+ cpp)
+   # Important note: in order to support this mode, a compiler *must*
+-  # always write the proprocessed file to stdout, regardless of -o,
+-  # because we must use -o when running libtool.
+-  ( IFS=" "
+-    case " $* " in
+-    *" --mode=compile "*)
+-      for arg
+-      do # cycle over the arguments
+-        case $arg in
+-	"--mode=compile")
+-	  # insert --quiet before "--mode=compile"
+-	  set fnord "$@" --quiet
+-	  shift # fnord
+-	  ;;
+-	esac
+-	set fnord "$@" "$arg"
+-	shift # fnord
+-	shift # "$arg"
+-      done
++  # always write the preprocessed file to stdout.
++  "$@" || exit $?
++
++  # Remove the call to Libtool.
++  if test "$libtool" = yes; then
++    while test $1 != '--mode=compile'; do
++      shift
++    done
++    shift
++  fi
++
++  # Remove `-o $object'.
++  IFS=" "
++  for arg
++  do
++    case $arg in
++    -o)
++      shift
++      ;;
++    $object)
++      shift
++      ;;
++    *)
++      set fnord "$@" "$arg"
++      shift # fnord
++      shift # $arg
+       ;;
+     esac
+-    "$@" -E |
+-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++  done
++
++  "$@" -E |
++    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+     sed '$ s: \\$::' > "$tmpdepfile"
+-  ) &
+-  proc=$!
+-  "$@"
+-  stat=$?
+-  wait "$proc"
+-  if test "$stat" != 0; then exit $stat; fi
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"
+   cat < "$tmpdepfile" >> "$depfile"
+@@ -392,34 +479,27 @@
+ 
+ msvisualcpp)
+   # Important note: in order to support this mode, a compiler *must*
+-  # always write the proprocessed file to stdout, regardless of -o,
++  # always write the preprocessed file to stdout, regardless of -o,
+   # because we must use -o when running libtool.
+-  ( IFS=" "
+-    case " $* " in
+-    *" --mode=compile "*)
+-      for arg
+-      do # cycle over the arguments
+-        case $arg in
+-	"--mode=compile")
+-	  # insert --quiet before "--mode=compile"
+-	  set fnord "$@" --quiet
+-	  shift # fnord
+-	  ;;
+-	esac
++  "$@" || exit $?
++  IFS=" "
++  for arg
++  do
++    case "$arg" in
++    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
++	set fnord "$@"
++	shift
++	shift
++	;;
++    *)
+ 	set fnord "$@" "$arg"
+-	shift # fnord
+-	shift # "$arg"
+-      done
+-      ;;
++	shift
++	shift
++	;;
+     esac
+-    "$@" -E |
+-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+-  ) &
+-  proc=$!
+-  "$@"
+-  stat=$?
+-  wait "$proc"
+-  if test "$stat" != 0; then exit $stat; fi
++  done
++  "$@" -E |
++  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"
+   . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+@@ -439,3 +519,12 @@
+ esac
+ 
+ exit 0
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- kde-style-klearlook-0.9.9.2.orig/admin/deps.am
++++ kde-style-klearlook-0.9.9.2/admin/deps.am
+@@ -0,0 +1,19 @@
++$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
++
++$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in
++
++$(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES)
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh
++
++$(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am
++
++$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs
++
++# defining default rules for files that may not be present
++$(top_srcdir)/Makefile.am.in:
++$(CONF_FILES):
++
+--- kde-style-klearlook-0.9.9.2.orig/admin/install-sh
++++ kde-style-klearlook-0.9.9.2/admin/install-sh
+@@ -1,19 +1,38 @@
+ #!/bin/sh
+-#
+ # install - install a program, script, or datafile
+-# This comes from X11R5 (mit/util/scripts/install.sh).
++
++scriptversion=2005-05-14.22
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
+ #
+-# Copyright 1991 by the Massachusetts Institute of Technology
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of M.I.T. not be used in advertising or
+-# publicity pertaining to distribution of the software without specific,
+-# written prior permission.  M.I.T. makes no representations about the
+-# suitability of this software for any purpose.  It is provided "as is"
+-# without express or implied warranty.
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++#
++# FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+@@ -23,13 +42,11 @@
+ # from scratch.  It can only install one file at a time, a restriction
+ # shared with many OS's install programs.
+ 
+-
+ # set DOITPROG to echo to test this script
+ 
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+ 
+-
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+ 
+ mvprog="${MVPROG-mv}"
+@@ -41,236 +58,266 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+ 
+-transformbasename=""
+-transform_arg=""
+-instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++chowncmd=
++chgrpcmd=
++stripcmd=
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+-    case $1 in
+-	-c) instcmd=$cpprog
+-	    shift
+-	    continue;;
+-
+-	-d) dir_arg=true
+-	    shift
+-	    continue;;
+-
+-	-m) chmodcmd="$chmodprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-o) chowncmd="$chownprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-g) chgrpcmd="$chgrpprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-s) stripcmd=$stripprog
+-	    shift
+-	    continue;;
+-
+-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+-	    shift
+-	    continue;;
+-
+-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+-	    shift
+-	    continue;;
+-
+-	*)  if [ x"$src" = x ]
+-	    then
+-		src=$1
+-	    else
+-		# this colon is to work around a 386BSD /bin/sh bug
+-		:
+-		dst=$1
+-	    fi
+-	    shift
+-	    continue;;
+-    esac
+-done
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++   or: $0 [OPTION]... SRCFILES... DIRECTORY
++   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++   or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++-c         (ignored)
++-d         create directories instead of installing files.
++-g GROUP   $chgrpprog installed files to GROUP.
++-m MODE    $chmodprog installed files to MODE.
++-o USER    $chownprog installed files to USER.
++-s         $stripprog installed files.
++-t DIRECTORY  install into DIRECTORY.
++-T         report an error if DSTFILE is a directory.
++--help     display this help and exit.
++--version  display version info and exit.
++
++Environment variables override the default commands:
++  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++  case $1 in
++    -c) shift
++        continue;;
++
++    -d) dir_arg=true
++        shift
++        continue;;
++
++    -g) chgrpcmd="$chgrpprog $2"
++        shift
++        shift
++        continue;;
++
++    --help) echo "$usage"; exit $?;;
++
++    -m) chmodcmd="$chmodprog $2"
++        shift
++        shift
++        continue;;
++
++    -o) chowncmd="$chownprog $2"
++        shift
++        shift
++        continue;;
++
++    -s) stripcmd=$stripprog
++        shift
++        continue;;
+ 
+-if [ x"$src" = x ]
+-then
+-	echo "$0: no input file specified" >&2
+-	exit 1
+-else
+-	:
+-fi
+-
+-if [ x"$dir_arg" != x ]; then
+-	dst=$src
+-	src=""
+-
+-	if [ -d "$dst" ]; then
+-		instcmd=:
+-		chmodcmd=""
+-	else
+-		instcmd=$mkdirprog
+-	fi
+-else
+-
+-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+-# might cause directories to be created, which would be especially bad
+-# if $src (and thus $dsttmp) contains '*'.
+-
+-	if [ -f "$src" ] || [ -d "$src" ]
+-	then
+-		:
+-	else
+-		echo "$0: $src does not exist" >&2
+-		exit 1
+-	fi
+-
+-	if [ x"$dst" = x ]
+-	then
+-		echo "$0: no destination specified" >&2
+-		exit 1
+-	else
+-		:
+-	fi
+-
+-# If destination is a directory, append the input filename; if your system
+-# does not like double slashes in filenames, you may need to add some logic
+-
+-	if [ -d "$dst" ]
+-	then
+-		dst=$dst/`basename "$src"`
+-	else
+-		:
+-	fi
+-fi
+-
+-## this sed command emulates the dirname command
+-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+-
+-# Make sure that the destination directory exists.
+-#  this part is taken from Noah Friedman's mkinstalldirs script
+-
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='
+-	'
+-IFS="${IFS-$defaultIFS}"
+-
+-oIFS=$IFS
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS=$oIFS
+-
+-pathcomp=''
++    -t) dstarg=$2
++	shift
++	shift
++	continue;;
+ 
+-while [ $# -ne 0 ] ; do
+-	pathcomp=$pathcomp$1
++    -T) no_target_directory=true
+ 	shift
++	continue;;
+ 
+-	if [ ! -d "$pathcomp" ] ;
+-        then
+-		$mkdirprog "$pathcomp"
+-	else
+-		:
+-	fi
++    --version) echo "$0 $scriptversion"; exit $?;;
+ 
+-	pathcomp=$pathcomp/
++    *)  # When -d is used, all remaining arguments are directories to create.
++	# When -t is used, the destination is already specified.
++	test -n "$dir_arg$dstarg" && break
++        # Otherwise, the last argument is the destination.  Remove it from $@.
++	for arg
++	do
++          if test -n "$dstarg"; then
++	    # $@ is not empty: it contains at least $arg.
++	    set fnord "$@" "$dstarg"
++	    shift # fnord
++	  fi
++	  shift # arg
++	  dstarg=$arg
++	done
++	break;;
++  esac
+ done
+-fi
+-
+-if [ x"$dir_arg" != x ]
+-then
+-	$doit $instcmd "$dst" &&
+ 
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+-else
+-
+-# If we're going to rename the final executable, determine the name now.
+-
+-	if [ x"$transformarg" = x ]
+-	then
+-		dstfile=`basename "$dst"`
+-	else
+-		dstfile=`basename "$dst" $transformbasename |
+-			sed $transformarg`$transformbasename
+-	fi
+-
+-# don't allow the sed command to completely eliminate the filename
+-
+-	if [ x"$dstfile" = x ]
+-	then
+-		dstfile=`basename "$dst"`
+-	else
+-		:
+-	fi
+-
+-# Make a couple of temp file names in the proper directory.
+-
+-	dsttmp=$dstdir/#inst.$$#
+-	rmtmp=$dstdir/#rm.$$#
+-
+-# Trap to clean up temp files at exit.
+-
+-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+-	trap '(exit $?); exit' 1 2 13 15
+-
+-# Move or copy the file name to the temp name
+-
+-	$doit $instcmd "$src" "$dsttmp" &&
+-
+-# and set any options; do chmod last to preserve setuid bits
+-
+-# If any of these fail, we abort the whole thing.  If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
+-
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+-
+-# Now remove or move aside any old file at destination location.  We try this
+-# two ways since rm can't unlink itself on some systems and the destination
+-# file might be busy for other reasons.  In this case, the final cleanup
+-# might fail but the new file should still install successfully.
+-
+-{
+-	if [ -f "$dstdir/$dstfile" ]
+-	then
+-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+-		{
+-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+-		  (exit 1); exit
+-		}
+-	else
+-		:
+-	fi
+-} &&
+-
+-# Now rename the file to the real destination.
++if test -z "$1"; then
++  if test -z "$dir_arg"; then
++    echo "$0: no input file specified." >&2
++    exit 1
++  fi
++  # It's OK to call `install-sh -d' without argument.
++  # This can happen when creating conditional directories.
++  exit 0
++fi
+ 
+-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++for src
++do
++  # Protect names starting with `-'.
++  case $src in
++    -*) src=./$src ;;
++  esac
++
++  if test -n "$dir_arg"; then
++    dst=$src
++    src=
++
++    if test -d "$dst"; then
++      mkdircmd=:
++      chmodcmd=
++    else
++      mkdircmd=$mkdirprog
++    fi
++  else
++    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++    # might cause directories to be created, which would be especially bad
++    # if $src (and thus $dsttmp) contains '*'.
++    if test ! -f "$src" && test ! -d "$src"; then
++      echo "$0: $src does not exist." >&2
++      exit 1
++    fi
++
++    if test -z "$dstarg"; then
++      echo "$0: no destination specified." >&2
++      exit 1
++    fi
++
++    dst=$dstarg
++    # Protect names starting with `-'.
++    case $dst in
++      -*) dst=./$dst ;;
++    esac
+ 
+-fi &&
++    # If destination is a directory, append the input filename; won't work
++    # if double slashes aren't ignored.
++    if test -d "$dst"; then
++      if test -n "$no_target_directory"; then
++	echo "$0: $dstarg: Is a directory" >&2
++	exit 1
++      fi
++      dst=$dst/`basename "$src"`
++    fi
++  fi
++
++  # This sed command emulates the dirname command.
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++
++  # Make sure that the destination directory exists.
++
++  # Skip lots of stat calls in the usual case.
++  if test ! -d "$dstdir"; then
++    defaultIFS='
++	 '
++    IFS="${IFS-$defaultIFS}"
++
++    oIFS=$IFS
++    # Some sh's can't handle IFS=/ for some reason.
++    IFS='%'
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
++    IFS=$oIFS
++
++    pathcomp=
++
++    while test $# -ne 0 ; do
++      pathcomp=$pathcomp$1
++      shift
++      if test ! -d "$pathcomp"; then
++        $mkdirprog "$pathcomp"
++	# mkdir can fail with a `File exist' error in case several
++	# install-sh are creating the directory concurrently.  This
++	# is OK.
++	test -d "$pathcomp" || exit
++      fi
++      pathcomp=$pathcomp/
++    done
++  fi
++
++  if test -n "$dir_arg"; then
++    $doit $mkdircmd "$dst" \
++      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
++
++  else
++    dstfile=`basename "$dst"`
++
++    # Make a couple of temp file names in the proper directory.
++    dsttmp=$dstdir/_inst.$$_
++    rmtmp=$dstdir/_rm.$$_
++
++    # Trap to clean up those temp files at exit.
++    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++    trap '(exit $?); exit' 1 2 13 15
++
++    # Copy the file name to the temp name.
++    $doit $cpprog "$src" "$dsttmp" &&
++
++    # and set any options; do chmod last to preserve setuid bits.
++    #
++    # If any of these fail, we abort the whole thing.  If we want to
++    # ignore errors from any of these, just make sure not to ignore
++    # errors from the above "$doit $cpprog $src $dsttmp" command.
++    #
++    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
++
++    # Now rename the file to the real destination.
++    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
++      || {
++	   # The rename failed, perhaps because mv can't rename something else
++	   # to itself, or perhaps because mv is so ancient that it does not
++	   # support -f.
++
++	   # Now remove or move aside any old file at destination location.
++	   # We try this two ways since rm can't unlink itself on some
++	   # systems and the destination file might be busy for other
++	   # reasons.  In this case, the final cleanup might fail but the new
++	   # file should still install successfully.
++	   {
++	     if test -f "$dstdir/$dstfile"; then
++	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
++	       || {
++		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++		 (exit 1); exit 1
++	       }
++	     else
++	       :
++	     fi
++	   } &&
++
++	   # Now rename the file to the real destination.
++	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++	 }
++    }
++  fi || { (exit 1); exit 1; }
++done
+ 
+ # The final little trick to "correctly" pass the exit status to the exit trap.
+-
+ {
+-	(exit 0); exit
++  (exit 0); exit 0
+ }
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- kde-style-klearlook-0.9.9.2.orig/admin/missing
++++ kde-style-klearlook-0.9.9.2/admin/missing
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
++
++scriptversion=2005-06-08.21
++
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
++#   Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+ 
+ # This program is free software; you can redistribute it and/or modify
+@@ -15,8 +19,8 @@
+ 
+ # 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., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -38,18 +42,24 @@
+   configure_ac=configure.in
+ fi
+ 
++msg="missing on your system"
++
+ case "$1" in
+ --run)
+   # Try to run requested program, and just exit if it succeeds.
+   run=
+   shift
+   "$@" && exit 0
++  # Exit code 63 means version mismatch.  This often happens
++  # when the user try to use an ancient version of a tool on
++  # a file that requires a minimum version.  In this case we
++  # we should proceed has if the program had been absent, or
++  # if --run hadn't been passed.
++  if test $? = 63; then
++    run=:
++    msg="probably too old"
++  fi
+   ;;
+-esac
+-
+-# If it does not exist, or fails to run (possibly an outdated version),
+-# try to emulate it.
+-case "$1" in
+ 
+   -h|--h|--he|--hel|--help)
+     echo "\
+@@ -74,11 +84,15 @@
+   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]"
++  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
++
++Send bug reports to <bug-automake at gnu.org>."
++    exit $?
+     ;;
+ 
+   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+-    echo "missing 0.4 - GNU automake"
++    echo "missing $scriptversion (GNU Automake)"
++    exit $?
+     ;;
+ 
+   -*)
+@@ -87,14 +101,44 @@
+     exit 1
+     ;;
+ 
+-  aclocal*)
++esac
++
++# Now exit if we have it, but it failed.  Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program).
++case "$1" in
++  lex|yacc)
++    # 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.
+        exit 1
++    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++       # Could not run --version or --help.  This is probably someone
++       # running `$TOOL --version' or `$TOOL --help' to check whether
++       # $TOOL exists and not knowing $TOOL uses missing.
++       exit 1
+     fi
++    ;;
++esac
+ 
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case "$1" in
++  aclocal*)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+          to install the \`Automake' and \`Perl' packages.  Grab them from
+          any GNU archive site."
+@@ -102,13 +146,8 @@
+     ;;
+ 
+   autoconf)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+          you modified \`${configure_ac}'.  You might want to install the
+          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+          archive site."
+@@ -116,13 +155,8 @@
+     ;;
+ 
+   autoheader)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+          from any GNU archive site."
+@@ -140,13 +174,8 @@
+     ;;
+ 
+   automake*)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+          You might want to install the \`Automake' and \`Perl' packages.
+          Grab them from any GNU archive site."
+@@ -156,16 +185,11 @@
+     ;;
+ 
+   autom4te)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
+     echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+-         system.  You might have modified some files without having the
++WARNING: \`$1' is needed, but is $msg.
++         You might have modified some files without having the
+          proper tools for further handling them.
+-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
++         You can get \`$1' as part of \`Autoconf' from any GNU
+          archive site."
+ 
+     file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+@@ -185,7 +209,7 @@
+ 
+   bison|yacc)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' $msg.  You should only need it if
+          you modified a \`.y' file.  You may need the \`Bison' package
+          in order for those modifications to take effect.  You can get
+          \`Bison' from any GNU archive site."
+@@ -215,7 +239,7 @@
+ 
+   lex|flex)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+          you modified a \`.l' file.  You may need the \`Flex' package
+          in order for those modifications to take effect.  You can get
+          \`Flex' from any GNU archive site."
+@@ -237,13 +261,8 @@
+     ;;
+ 
+   help2man)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+ 	 you modified a dependency of a manual page.  You may need the
+ 	 \`Help2man' package in order for those modifications to take
+ 	 effect.  You can get \`Help2man' from any GNU archive site."
+@@ -262,32 +281,30 @@
+     ;;
+ 
+   makeinfo)
+-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+-       # We have makeinfo, but it failed.
+-       exit 1
+-    fi
+-
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+          you modified a \`.texi' or \`.texinfo' file, or any other file
+          indirectly affecting the aspect of the manual.  The spurious
+          call might also be the consequence of using a buggy \`make' (AIX,
+          DU, IRIX).  You might want to install the \`Texinfo' package or
+          the \`GNU make' package.  Grab either from any GNU archive site."
++    # The file to touch is that specified with -o ...
+     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+     if test -z "$file"; then
+-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+-    fi
++      # ... or it is the one specified with @setfilename ...
++      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
++      # ... or it is derived from the source name (dir/f.texi becomes f.info)
++      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++    fi
++    # If the file does not exist, the user really needs makeinfo;
++    # let's fail without touching anything.
++    test -f $file || exit 1
+     touch $file
+     ;;
+ 
+   tar)
+     shift
+-    if test -n "$run"; then
+-      echo 1>&2 "ERROR: \`tar' requires --run"
+-      exit 1
+-    fi
+ 
+     # We have already tried tar in the generic part.
+     # Look for gnutar/gtar before invocation to avoid ugly error
+@@ -323,10 +340,10 @@
+ 
+   *)
+     echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+-         system.  You might have modified some files without having the
++WARNING: \`$1' is needed, and is $msg.
++         You might have modified some files without having the
+          proper tools for further handling them.  Check the \`README' file,
+-         it often tells you about the needed prerequirements for installing
++         it often tells you about the needed prerequisites for installing
+          this package.  You may also peek at any GNU archive site, in case
+          some other package would contain this missing \`$1' program."
+     exit 1
+@@ -334,3 +351,10 @@
+ esac
+ 
+ exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- kde-style-klearlook-0.9.9.2.orig/admin/mkinstalldirs
++++ kde-style-klearlook-0.9.9.2/admin/mkinstalldirs
+@@ -1,21 +1,33 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
++
++scriptversion=2005-06-29.22
++
++# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+-# Public domain
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
+ 
+ errstatus=0
+-dirmode=""
++dirmode=
+ 
+ usage="\
+-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake at gnu.org>."
+ 
+ # process command line arguments
+ while test $# -gt 0 ; do
+   case $1 in
+     -h | --help | --h*)         # -h for help
+-      echo "$usage" 1>&2
+-      exit 0
++      echo "$usage"
++      exit $?
+       ;;
+     -m)                         # -m PERM arg
+       shift
+@@ -23,6 +35,10 @@
+       dirmode=$1
+       shift
+       ;;
++    --version)
++      echo "$0 $scriptversion"
++      exit $?
++      ;;
+     --)                         # stop option processing
+       shift
+       break
+@@ -50,30 +66,58 @@
+   0) exit 0 ;;
+ esac
+ 
++# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error.  This is a problem when calling mkinstalldirs
++# from a parallel make.  We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
+ case $dirmode in
+   '')
+-    if mkdir -p -- . 2>/dev/null; then
++    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+       echo "mkdir -p -- $*"
+       exec mkdir -p -- "$@"
++    else
++      # On NextStep and OpenStep, the `mkdir' command does not
++      # recognize any option.  It will interpret all options as
++      # directories to create, and then abort because `.' already
++      # exists.
++      test -d ./-p && rmdir ./-p
++      test -d ./--version && rmdir ./--version
+     fi
+     ;;
+   *)
+-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
++    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++       test ! -d ./--version; then
+       echo "mkdir -m $dirmode -p -- $*"
+       exec mkdir -m "$dirmode" -p -- "$@"
++    else
++      # Clean up after NextStep and OpenStep mkdir.
++      for d in ./-m ./-p ./--version "./$dirmode";
++      do
++        test -d $d && rmdir $d
++      done
+     fi
+     ;;
+ esac
+ 
+ for file
+ do
+-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++  case $file in
++    /*) pathcomp=/ ;;
++    *)  pathcomp= ;;
++  esac
++  oIFS=$IFS
++  IFS=/
++  set fnord $file
+   shift
++  IFS=$oIFS
+ 
+-  pathcomp=
+   for d
+   do
+-    pathcomp="$pathcomp$d"
++    test "x$d" = x && continue
++
++    pathcomp=$pathcomp$d
+     case $pathcomp in
+       -*) pathcomp=./$pathcomp ;;
+     esac
+@@ -84,21 +128,21 @@
+       mkdir "$pathcomp" || lasterr=$?
+ 
+       if test ! -d "$pathcomp"; then
+-  	errstatus=$lasterr
++	errstatus=$lasterr
+       else
+-  	if test ! -z "$dirmode"; then
++	if test ! -z "$dirmode"; then
+ 	  echo "chmod $dirmode $pathcomp"
+-    	  lasterr=""
+-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
++	  lasterr=
++	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+ 
+-  	  if test ! -z "$lasterr"; then
+-  	    errstatus=$lasterr
+-  	  fi
+-  	fi
++	  if test ! -z "$lasterr"; then
++	    errstatus=$lasterr
++	  fi
++	fi
+       fi
+     fi
+ 
+-    pathcomp="$pathcomp/"
++    pathcomp=$pathcomp/
+   done
+ done
+ 
+@@ -107,5 +151,8 @@
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
+ # End:
+-# mkinstalldirs ends here
+--- kde-style-klearlook-0.9.9.2.orig/admin/ylwrap
++++ kde-style-klearlook-0.9.9.2/admin/ylwrap
+@@ -1,6 +1,11 @@
+ #! /bin/sh
+ # ylwrap - wrapper for lex/yacc invocations.
+-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
++
++scriptversion=2005-05-14.22
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
++#   Free Software Foundation, Inc.
++#
+ # Written by Tom Tromey <tromey at cygnus.com>.
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -15,51 +20,73 @@
+ #
+ # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+-# Usage:
+-#     ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+-# * INPUT is the input file
+-# * OUTPUT is file PROG generates
+-# * DESIRED is file we actually want
+-# * PROGRAM is program to run
+-# * ARGS are passed to PROG
+-# Any number of OUTPUT,DESIRED pairs may be used.
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++case "$1" in
++  '')
++    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
++    exit 1
++    ;;
++  --basedir)
++    basedir=$2
++    shift 2
++    ;;
++  -h|--h*)
++    cat <<\EOF
++Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
++
++Wrapper for lex/yacc invocations, renaming files as desired.
++
++  INPUT is the input file
++  OUTPUT is one file PROG generates
++  DESIRED is the file we actually want instead of OUTPUT
++  PROGRAM is program to run
++  ARGS are passed to PROG
++
++Any number of OUTPUT,DESIRED pairs may be used.
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++    exit $?
++    ;;
++  -v|--v*)
++    echo "ylwrap $scriptversion"
++    exit $?
++    ;;
++esac
++
+ 
+ # The input.
+ input="$1"
+ shift
+ case "$input" in
+- [\\/]* | ?:[\\/]*)
++  [\\/]* | ?:[\\/]*)
+     # Absolute path; do nothing.
+     ;;
+- *)
++  *)
+     # Relative path.  Make it absolute.
+     input="`pwd`/$input"
+     ;;
+ esac
+ 
+-# The directory holding the input.
+-input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+-# Quote $INPUT_DIR so we can use it in a regexp.
+-# FIXME: really we should care about more than `.' and `\'.
+-input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
+-
+-echo "got $input_rx"
+-
+ pairlist=
+ while test "$#" -ne 0; do
+-   if test "$1" = "--"; then
+-      shift
+-      break
+-   fi
+-   pairlist="$pairlist $1"
+-   shift
++  if test "$1" = "--"; then
++    shift
++    break
++  fi
++  pairlist="$pairlist $1"
++  shift
+ done
+ 
+ # The program to run.
+@@ -67,8 +94,8 @@
+ shift
+ # Make any relative path in $prog absolute.
+ case "$prog" in
+- [\\/]* | ?:[\\/]*) ;;
+- *[\\/]*) prog="`pwd`/$prog" ;;
++  [\\/]* | ?:[\\/]*) ;;
++  *[\\/]*) prog="`pwd`/$prog" ;;
+ esac
+ 
+ # FIXME: add hostname here for parallel makes that run commands on
+@@ -79,65 +106,118 @@
+ 
+ cd $dirname
+ 
+-$prog ${1+"$@"} "$input"
+-status=$?
++case $# in
++  0) $prog "$input" ;;
++  *) $prog "$@" "$input" ;;
++esac
++ret=$?
+ 
+-if test $status -eq 0; then
+-   set X $pairlist
+-   shift
+-   first=yes
+-   # Since DOS filename conventions don't allow two dots,
+-   # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+-   # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+-   y_tab_nodot="no"
+-   if test -f y_tab.c || test -f y_tab.h; then
+-      y_tab_nodot="yes"
+-   fi
+-
+-   while test "$#" -ne 0; do
+-      from="$1"
+-      # Handle y_tab.c and y_tab.h output by DOS
+-      if test $y_tab_nodot = "yes"; then
+-	 if test $from = "y.tab.c"; then
+-	    from="y_tab.c"
+-	 else
+-	    if test $from = "y.tab.h"; then
+-	       from="y_tab.h"
+-	    fi
+-	 fi
+-      fi
+-      if test -f "$from"; then
+-         # If $2 is an absolute path name, then just use that,
+-         # otherwise prepend `../'.
+-         case "$2" in
+-	   [\\/]* | ?:[\\/]*) target="$2";;
+-	   *) target="../$2";;
+-	 esac
+-
+-	 # Edit out `#line' or `#' directives.  We don't want the
+-	 # resulting debug information to point at an absolute srcdir;
+-	 # it is better for it to just mention the .y file with no
+-	 # path.
+-	 sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
++if test $ret -eq 0; then
++  set X $pairlist
++  shift
++  first=yes
++  # Since DOS filename conventions don't allow two dots,
++  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
++  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
++  y_tab_nodot="no"
++  if test -f y_tab.c || test -f y_tab.h; then
++    y_tab_nodot="yes"
++  fi
++
++  # The directory holding the input.
++  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
++  # Quote $INPUT_DIR so we can use it in a regexp.
++  # FIXME: really we should care about more than `.' and `\'.
++  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
++
++  while test "$#" -ne 0; do
++    from="$1"
++    # Handle y_tab.c and y_tab.h output by DOS
++    if test $y_tab_nodot = "yes"; then
++      if test $from = "y.tab.c"; then
++    	from="y_tab.c"
+       else
+-	 # A missing file is only an error for the first file.  This
+-	 # is a blatant hack to let us support using "yacc -d".  If -d
+-	 # is not specified, we don't want an error when the header
+-	 # file is "missing".
+-	 if test $first = yes; then
+-	    status=1
+-	 fi
++    	if test $from = "y.tab.h"; then
++    	  from="y_tab.h"
++    	fi
+       fi
+-      shift
+-      shift
+-      first=no
+-   done
++    fi
++    if test -f "$from"; then
++      # If $2 is an absolute path name, then just use that,
++      # otherwise prepend `../'.
++      case "$2" in
++    	[\\/]* | ?:[\\/]*) target="$2";;
++    	*) target="../$2";;
++      esac
++
++      # We do not want to overwrite a header file if it hasn't
++      # changed.  This avoid useless recompilations.  However the
++      # parser itself (the first file) should always be updated,
++      # because it is the destination of the .y.c rule in the
++      # Makefile.  Divert the output of all other files to a temporary
++      # file so we can compare them to existing versions.
++      if test $first = no; then
++	realtarget="$target"
++	target="tmp-`echo $target | sed s/.*[\\/]//g`"
++      fi
++      # Edit out `#line' or `#' directives.
++      #
++      # We don't want the resulting debug information to point at
++      # an absolute srcdir; it is better for it to just mention the
++      # .y file with no path.
++      #
++      # We want to use the real output file name, not yy.lex.c for
++      # instance.
++      #
++      # We want the include guards to be adjusted too.
++      FROM=`echo "$from" | sed \
++            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++      TARGET=`echo "$2" | sed \
++            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++
++      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
++          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
++
++      # Check whether header files must be updated.
++      if test $first = no; then
++	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
++	  echo "$2" is unchanged
++	  rm -f "$target"
++	else
++          echo updating "$2"
++          mv -f "$target" "$realtarget"
++        fi
++      fi
++    else
++      # A missing file is only an error for the first file.  This
++      # is a blatant hack to let us support using "yacc -d".  If -d
++      # is not specified, we don't want an error when the header
++      # file is "missing".
++      if test $first = yes; then
++        ret=1
++      fi
++    fi
++    shift
++    shift
++    first=no
++  done
+ else
+-   status=$?
++  ret=$?
+ fi
+ 
+ # Remove the directory.
+ cd ..
+ rm -rf $dirname
+ 
+-exit $status
++exit $ret
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+--- kde-style-klearlook-0.9.9.2.orig/admin/detect-autoconf.pl
++++ kde-style-klearlook-0.9.9.2/admin/detect-autoconf.pl
+@@ -0,0 +1,173 @@
++#!/usr/bin/env perl
++
++# Try to locate best version of auto*
++# By Michael Pyne <michael.pyne at kdemail.net>
++#
++# Copyright (c) 2005.
++# This code is public domain.  You may use it however you like (including
++# relicensing).
++
++# Emulate the 'which' program.
++sub which
++{
++    my $prog = shift;
++    my @paths = split(/:/, $ENV{'PATH'});
++
++    for $path (@paths)
++    {
++	return "$path/$prog" if -x "$path/$prog";
++    }
++
++    return "";
++}
++
++# Subroutine to determine the highest installed version of the given program,
++# searching from the given paths.
++sub findBest
++{
++    my ($program, @paths) = @_;
++    my $best_version_found = '0'; # Deliberately a string.
++    my %versions;
++    my %minimumVersions = (
++ 	'autoconf' => '2.5',
++	'automake' => '1.6',
++    );
++
++    # Allow user to use environment variable to override search.
++    return $ENV{uc $program} if $ENV{uc $program};
++
++    for $prefix (@paths)
++    {
++	@files = glob "$prefix/$program*";
++	for $file (@files)
++	{
++	    # Don't check non-executable scripts.
++	    next unless -x $file;
++
++	    ($version) = $file =~ /$prefix\/$program-?(.*)$/;
++	    $version =~ s/-|\.//g;
++
++	    # Special case some programs to make sure it has a minimum version.
++	    if (not $version and exists $minimumVersions{$program})
++	    {
++		my $min_version = $minimumVersions{$program};
++		my $versionOutput = `$program --version 2>/dev/null | head -n 1`;
++
++		# If we can't run the script to get the version it likely won't work later.
++		next unless $versionOutput; 
++
++		# Use number.number for version (we don't need the excess in general).
++		($versionOutput) = ($versionOutput =~ /(\d\.\d)/);
++
++		# Use lt to do lexicographical comparison of strings (which should be
++		# equivalent and doesn't involve issues with floating point conversions).
++		if (not $versionOutput or $versionOutput lt $min_version)
++		{
++		    next;
++		}
++	    }
++
++	    # If no version suffix then use it in favor of a versioned autotool
++	    # since the ever-popular WANT_AUTOFOO should then work (in theory).
++	    return $file unless $version;
++
++	    # Emulate 'which', and abort if we've already seen this version.
++	    next if exists $versions{$version};
++
++	    # Save filename of program.
++	    $versions{$version} = $file;
++
++	    # Use string comparison so that e.g. 253a will be > 253 but < 254.
++	    if ($version gt $best_version_found)
++	    {
++		$best_version_found = $version;
++	    }
++	}
++    }
++
++    return $versions{$best_version_found};
++}
++
++# Find an appropriate "which" program for later use by the shell script calling
++# us.
++sub findWhich
++{
++    for $candidate ('type -p', 'which', 'type')
++    {
++	$test = `$candidate sh 2>/dev/null`;
++	chomp $test;
++
++	return $candidate if -x $test;
++    }
++}
++
++# Uses which() to find a program unless the user provided its path in the
++# environment (the upper case program name is searched).
++sub findProgram
++{
++    $suffix = ""; # For use if @_ has only one param.
++    my ($program, $suffix) = @_;
++
++    return $ENV{uc $program} if $ENV{uc $program};
++    return which("$program$suffix");
++}
++
++# SCRIPT STARTS.
++
++# Search in path.
++ at paths = split(/:/, $ENV{'PATH'});
++
++# Make sure at least /usr/bin and /usr/local/bin are in this search.
++unshift @paths, '/usr/local/bin' unless grep $_ eq '/usr/local/bin', @paths;
++unshift @paths, '/usr/bin' unless grep $_ eq '/usr/bin', @paths;
++
++$autoconf = findBest('autoconf', @paths);
++($autoconf_suffix) = $autoconf =~ /.*autoconf(.*)$/;
++
++# Find matching autoconf companions.
++$autoheader = findProgram('autoheader', $autoconf_suffix);
++$autom4te = findProgram('autom4te', $autoconf_suffix);
++
++# Get best automake, and look for unsermake to possibly override it.
++$automake = findBest('automake', @paths);
++$unsermake = "";
++# backward compatible: if $UNSERMAKE points to a path, use it
++$unsermake = findProgram('unsermake') if (defined($ENV{'UNSERMAKE'}) and $ENV{'UNSERMAKE'} =~ /\//);
++# new compatible: if it says 'yes', use the one from path
++$unsermake = which('unsermake') if ($ENV{'UNSERMAKE'} ne 'no');
++
++($automake_suffix) = $automake =~ /.*automake(.*)$/;
++
++# Use unsermake if we found it.
++$automake = "$unsermake -c" if $unsermake;
++
++# Find matching automake companions.
++$aclocal = findProgram('aclocal', $automake_suffix);
++
++$which = findWhich();
++
++# Make sure we have all of the needed programs.
++for $i (qw'autoconf autoheader autom4te automake aclocal')
++{
++    unless(${$i})
++    {
++	print "# Unable to find $i!!\n";
++	exit 1;
++    }
++}
++
++# Print results in eval-able form.
++print <<EOF;
++AUTOCONF="$autoconf"
++AUTOHEADER="$autoheader"
++AUTOM4TE="$autom4te"
++
++AUTOMAKE="$automake"
++ACLOCAL="$aclocal"
++
++WHICH="$which"
++
++export AUTOCONF AUTOHEADER AUTOM4TE AUTOMAKE ACLOCAL WHICH
++EOF
++
++exit 0;
+--- kde-style-klearlook-0.9.9.2.orig/admin/pkg.m4.in
++++ kde-style-klearlook-0.9.9.2/admin/pkg.m4.in
+@@ -0,0 +1,57 @@
++
++dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
++dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
++dnl also defines GSTUFF_PKG_ERRORS on error
++AC_DEFUN([PKG_CHECK_MODULES], [
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        AC_MSG_CHECKING(for $2)
++
++        if $PKG_CONFIG --exists "$2" ; then
++            AC_MSG_RESULT(yes)
++            succeeded=yes
++
++            AC_MSG_CHECKING($1_CFLAGS)
++            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
++            AC_MSG_RESULT($$1_CFLAGS)
++
++            AC_MSG_CHECKING($1_LIBS)
++            $1_LIBS=`$PKG_CONFIG --libs "$2"`
++            AC_MSG_RESULT($$1_LIBS)
++        else
++            $1_CFLAGS=""
++            $1_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++            ifelse([$4], ,echo $$1_PKG_ERRORS,)
++        fi
++
++        AC_SUBST($1_CFLAGS)
++        AC_SUBST($1_LIBS)
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     ifelse([$3], , :, [$3])
++  else
++     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
++  fi
++])
++
++

Added: kde-extras/kde-style-klearlook/trunk/debian/patches/series
===================================================================
--- kde-extras/kde-style-klearlook/trunk/debian/patches/series	2006-12-24 14:14:37 UTC (rev 5187)
+++ kde-extras/kde-style-klearlook/trunk/debian/patches/series	2006-12-28 12:09:11 UTC (rev 5188)
@@ -0,0 +1,2 @@
+01_fix_makefile.am.diff
+97_update_admin.diff

Modified: kde-extras/kde-style-klearlook/trunk/debian/rules
===================================================================
--- kde-extras/kde-style-klearlook/trunk/debian/rules	2006-12-24 14:14:37 UTC (rev 5187)
+++ kde-extras/kde-style-klearlook/trunk/debian/rules	2006-12-28 12:09:11 UTC (rev 5188)
@@ -1,70 +1,111 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
-# tweaked by Stephen Kulow and Ivan Moore for use with KDE
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-BUILDDIR = ./build
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-build: build-stamp
 
-export kde_prefix=`kde-config --prefix`
-export kde_bindir=`kde-config --expandvars --exec-prefix`
-export QTDIR=/usr/lib/qt3
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --libexecdir=$(kde_bindir) --with-qt-dir=$(QTDIR)
 
-build-stamp:
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+configure: clean-stamp
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/libtool/libtool.m4 admin/libtool.m4.in
+	cp -f /usr/share/misc/config.sub admin/config.sub
+	cp -f /usr/share/misc/config.guess admin/config.guess
+	echo "#define VERSION \"$(shell cat VERSION)\"" > kde/version.h
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
+	chmod 0775 admin/detect-autoconf.pl
+
+	make -f admin/Makefile.common
+
+config.status: configure
 	dh_testdir
+
+	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	if test ! -f configure; then \
-	  $(MAKE) -f admin/Makefile.common ;\
-	fi
-	./configure $(configkde)
-	make
-	touch build-stamp
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --disable-rpath
 
-clean: debian-clean
-	dh_clean
-	rm -f `pwd`/kde/version.h
-	rm -f `pwd`/debian/*~
-	rm -rf `pwd`/debian/kde-style-klearlook
 
-debian-clean:
+build: build-stamp
+
+build-stamp:  config.status
 	dh_testdir
-	-rm -f build-stamp
-	if test -d CVS; then \
-	  make -f admin/Makefile.common cvs-clean ;\
-	fi
-	-make distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	rm -f config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	rm -f config.guess
-endif
 
-binary-indep: build
-	dh_testroot
+	# Add here commands to compile the package.
+	$(MAKE)
+	#docbook-to-man debian/kde-style-klearlook.sgml > kde-style-klearlook.1
+
+	touch build-stamp
+
+clean: clean-stamp
+	rm -f clean-stamp
+
+
+
+
+clean-stamp:
 	dh_testdir
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
+	rm -f build-stamp  config.guess config.sub config.log clean-stamp
 
-binary-arch: build
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+
+	find . -name 'Makefile.in' -exec rm {} \;
+	rm -f configure acinclude.m4 aclocal.m4 configure.in config.h.in
+	rm -f admin/ltmain.sh admin/libtool.m4.in
+	rm -f admin/config.guess admin/config.sub
+	rm -f subdirs kde/version.h
+
+	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
+	dh_clean
+	touch clean-stamp
+
+install: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	make install DESTDIR=`pwd`/debian/kde-style-klearlook/
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/kde-style-klearlook.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/kde-style-klearlook
 	install -m 644 debian/Clearlooks.kcsrc \
 		`pwd`/debian/kde-style-klearlook/usr/share/apps/kdisplay/color-schemes/
-	dh_install
+
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+	rm -f clean-stamp #FIXME: ugly
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installchangelogs
+	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -72,10 +113,7 @@
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb       	
+	dh_builddeb
 
-# Below here is fairly generic really
-
-binary:		binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 




More information about the pkg-kde-commits mailing list