[Pkg-kde-commits] rev 989 - in branches/kde-3.4.0/packages/kdeadmin/debian: . patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Fri, 08 Apr 2005 00:39:41 +0000
Author: chrsmrtn-guest
Date: 2005-04-08 00:39:39 +0000 (Fri, 08 Apr 2005)
New Revision: 989
Added:
branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_2005-04-07.diff
Modified:
branches/kde-3.4.0/packages/kdeadmin/debian/changelog
branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff
Log:
Branch update for kdeadmin. Fixes the kuser RC bug.
Modified: branches/kde-3.4.0/packages/kdeadmin/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeadmin/debian/changelog 2005-04-07 23:46:03 UTC (rev 988)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/changelog 2005-04-08 00:39:39 UTC (rev 989)
@@ -1,4 +1,4 @@
-kdeadmin (4:3.4.0-0pre1) experimental; urgency=low
+kdeadmin (4:3.4.0-0pre2) experimental; urgency=low
* New upstream release.
@@ -30,7 +30,7 @@
versions of application handbooks, for users without Konqueror or
KHelpCenter.
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 31 Mar 2005 11:24:16 -0500
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 7 Apr 2005 20:20:24 -0400
kdeadmin (4:3.3.2-1) unstable; urgency=low
Added: branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_2005-04-07.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_2005-04-07.diff 2005-04-07 23:46:03 UTC (rev 988)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_2005-04-07.diff 2005-04-08 00:39:39 UTC (rev 989)
@@ -0,0 +1,366 @@
+diff -Nru kde.orig/admin/acinclude.m4.in kde.patched/admin/acinclude.m4.in
+--- kde.orig/admin/acinclude.m4.in 2005-02-09 17:21:09.000000000 -0500
++++ kde.patched/admin/acinclude.m4.in 2005-03-24 14:18:09.000000000 -0500
+@@ -1644,7 +1644,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 its the
++same Qt version, compiled with the same compiler and the same Qt
++configuration settings.
++])
+ fi
+ fi
+ ])
+@@ -3104,8 +3112,8 @@
+ 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")
+ 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,6 +3202,51 @@
+ ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
+ ])
+
++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 */
++ template<typename CharT>
++ struct VisTest
++ {
++ inline VisTest ();
++ };
++ template<typename CharT>
++ inline VisTest<CharT>::VisTest()
++ {}
++ extern template class VisTest<char>; // It works if we drop that line
++ int some_function( int do_something ) __attribute__ ((visibility("default")));
++ int some_function( int )
++ {
++ VisTest<char> a;
++ 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_CHECK_AND_ADD_HIDDEN_VISIBILITY],
+ [
+ if test "$GXX" = "yes"; then
+@@ -3202,7 +3255,9 @@
+ KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
+ KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+ [
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
++ 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])
+ ])
+diff -Nru kde.orig/admin/am_edit kde.patched/admin/am_edit
+--- kde.orig/admin/am_edit 2004-12-17 15:18:28.000000000 -0500
++++ kde.patched/admin/am_edit 2005-03-29 04:15:16.000000000 -0500
+@@ -483,6 +483,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 +635,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;
+ }
+ }
+@@ -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.412 $ '."\n";
++ my $progIdLine = "\# $progId - " . '$Revision: 1.412.6.3 $ '."\n";
+ if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+ warn "automake line not found in $makefile\n";
+ # Fallback: first line
+diff -Nru kde.orig/kcron/kcron.desktop kde.patched/kcron/kcron.desktop
+--- kde.orig/kcron/kcron.desktop 2005-02-04 23:17:07.000000000 -0500
++++ kde.patched/kcron/kcron.desktop 2005-03-07 09:19:45.000000000 -0500
+@@ -15,7 +15,6 @@
+ Name[ta]=கேக்ரொன்
+ Name[tg]=Kрон
+ Name[th]=ตารางงาน - K
+-Name[xx]=xxKCronxx
+ GenericName=Task Scheduler
+ GenericName[af]=Opdrag Skeduleerder
+ GenericName[ar]=مجدول المهام
+@@ -75,7 +74,6 @@
+ GenericName[ven]=Muvhekanyi wa Mushumo
+ GenericName[wa]=Tiestires C
+ GenericName[xh]=Umcwangcisi Womsebenzi
+-GenericName[xx]=xxTask Schedulerxx
+ GenericName[zh_CN]=任务调度程序
+ GenericName[zh_TW]=工作排程器
+ GenericName[zu]=Umgcini sikhathi Somsebenzi
+diff -Nru kde.orig/kdat/kdat.desktop kde.patched/kdat/kdat.desktop
+--- kde.orig/kdat/kdat.desktop 2005-02-04 23:17:08.000000000 -0500
++++ kde.patched/kdat/kdat.desktop 2005-03-07 09:19:46.000000000 -0500
+@@ -11,7 +11,6 @@
+ Name[ta]=கேடாட்
+ Name[tg]=KДат
+ Name[th]=เทปสำรองข้อมูล - K
+-Name[xx]=xxKDatxx
+ GenericName=Tape Backup Tool
+ GenericName[af]=Kaset Rugsteun Program
+ GenericName[ar]=أداة حفظ شريط البيانات الإحتياطي
+@@ -70,7 +69,6 @@
+ GenericName[ven]=Tshishumiswa tsha Theipi tshau Thusedza
+ GenericName[wa]=Usteye di copeyes di såvrité so bindes
+ GenericName[xh]=Isixhobo Sokuncedisa Iteyipu
+-GenericName[xx]=xxTape Backup Toolxx
+ GenericName[zh_CN]=磁带备份工具
+ GenericName[zh_TW]=磁帶備份工具
+ GenericName[zu]=Ithuluzi Yethephu Yokugcina umsebenzi uphephile
+diff -Nru kde.orig/kfile-plugins/deb/kfile_deb.desktop kde.patched/kfile-plugins/deb/kfile_deb.desktop
+--- kde.orig/kfile-plugins/deb/kfile_deb.desktop 2004-12-11 01:39:19.000000000 -0500
++++ kde.patched/kfile-plugins/deb/kfile_deb.desktop 2005-03-07 09:19:46.000000000 -0500
+@@ -52,7 +52,6 @@
+ Name[uk]=Дані DEB
+ Name[ven]=Mbalo dza DEB
+ Name[wa]=Sitatistikes DEB
+-Name[xx]=xxDEB Statsxx
+ Name[zh_CN]=DEB统计
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_deb
+diff -Nru kde.orig/kfile-plugins/rpm/kfile_rpm.desktop kde.patched/kfile-plugins/rpm/kfile_rpm.desktop
+--- kde.orig/kfile-plugins/rpm/kfile_rpm.desktop 2004-12-11 01:39:20.000000000 -0500
++++ kde.patched/kfile-plugins/rpm/kfile_rpm.desktop 2005-03-07 09:19:46.000000000 -0500
+@@ -53,7 +53,6 @@
+ Name[uk]=Дані RPM
+ Name[ven]=Mbalo dza RPM
+ Name[wa]=Sitatistikes RPM
+-Name[xx]=xxRPM Statsxx
+ Name[zh_CN]=RPM统计
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_rpm
+diff -Nru kde.orig/kpackage/kpackage.desktop kde.patched/kpackage/kpackage.desktop
+--- kde.orig/kpackage/kpackage.desktop 2005-02-04 23:17:08.000000000 -0500
++++ kde.patched/kpackage/kpackage.desktop 2005-03-07 09:19:47.000000000 -0500
+@@ -16,7 +16,6 @@
+ Name[th]=จัดการแพ็คเกจ
+ Name[ven]=Tshiputo tsha K
+ Name[xh]=UdibanisolweK
+-Name[xx]=xxKPackagexx
+ Name[zu]=kphakethe
+ GenericName=Package Manager
+ GenericName[af]=Paket Bestuurder
+@@ -77,7 +76,6 @@
+ GenericName[ven]=Phakhedzhi ya Murangaphanda
+ GenericName[wa]=Manaedjeu di pacaedjes
+ GenericName[xh]=Umphathi Wokudityaniswe kunye
+-GenericName[xx]=xxPackage Managerxx
+ GenericName[zh_CN]=软件包管理器
+ GenericName[zh_TW]=套件管理程式
+ GenericName[zu]=Umphathi Wokusongwayo
+diff -Nru kde.orig/kpackage/mimetypes/x-debian-package.desktop kde.patched/kpackage/mimetypes/x-debian-package.desktop
+--- kde.orig/kpackage/mimetypes/x-debian-package.desktop 2005-02-04 23:17:08.000000000 -0500
++++ kde.patched/kpackage/mimetypes/x-debian-package.desktop 2005-03-07 09:19:47.000000000 -0500
+@@ -62,7 +62,6 @@
+ Comment[ven]=Phakhedzhi ya Debian
+ Comment[wa]=Pacaedje Debian
+ Comment[xh]=Udityaniso kunye lwe Debian
+-Comment[xx]=xxDebian Packagexx
+ Comment[zh_CN]=Debian 软件包
+ Comment[zh_TW]=Debian 軟體套件
+ Comment[zu]=Ukusongwa kwe Debian
+diff -Nru kde.orig/ksysv/ksysv.desktop kde.patched/ksysv/ksysv.desktop
+--- kde.orig/ksysv/ksysv.desktop 2005-02-23 00:06:40.000000000 -0500
++++ kde.patched/ksysv/ksysv.desktop 2005-03-30 01:48:24.000000000 -0500
+@@ -2,15 +2,17 @@
+ Encoding=UTF-8
+ Name=KSysV
+ Name[pt_BR]=KSysV
+-Name[xx]=xxKSysVxx
+ GenericName=SysV-Init Editor
+ GenericName[bg]=Редактор на SysV-Init
+ GenericName[br]=Aozer deraouiñ SysV
++GenericName[bs]=SysV Init Editor
+ GenericName[ca]=Editor de l'init SysV
+ GenericName[cs]=SysV-Init editor
+ GenericName[cy]=Golygydd SysV-Init
++GenericName[el]=Διορθωτής SysV-Init
+ GenericName[es]= Editor de inicio SysV
+ GenericName[et]=SysV-Init redaktor
++GenericName[eu]=SysV Init editorea
+ GenericName[fi]=SysV-Init -asetusmuokkain
+ GenericName[fr]=Éditeur de l'initialisation SysV
+ GenericName[ga]=Eagarthóir SysV-Init
+@@ -24,10 +26,12 @@
+ GenericName[pt]=Editor de SysV-Init
+ GenericName[pt_BR]=Editor do SysV-Init
+ GenericName[ru]=Редактор сценариев SysV
++GenericName[sk]=SysV-Init editor
+ GenericName[sl]=Urejevalnik začetnih nastavitev SysV
++GenericName[sr]=Уређивач SysV-init-а
++GenericName[sr@Latn]=Uređivač SysV-init-a
+ GenericName[sv]=Sys V-starteditor
+ GenericName[uk]=Редактора KSysV-Init
+-GenericName[xx]=xxSysV-Init Editorxx
+ GenericName[zh_CN]=SysV Init 编辑器
+ MimeType=
+ Exec=ksysv -caption "%c" %i %m
+diff -Nru kde.orig/ksysv/x-ksysv-log.desktop kde.patched/ksysv/x-ksysv-log.desktop
+--- kde.orig/ksysv/x-ksysv-log.desktop 2005-02-04 23:17:08.000000000 -0500
++++ kde.patched/ksysv/x-ksysv-log.desktop 2005-03-07 09:19:47.000000000 -0500
+@@ -47,7 +47,6 @@
+ Comment[tr]=SysV-Inıt Düzenleyici Günlük Dosyası
+ Comment[uk]=Файл журналу редактора SysV-Init
+ Comment[wa]=Fitchî djournå di l' aspougneu po SysV-Init
+-Comment[xx]=xxSysV-Init Editor Log Filexx
+ Comment[zh_CN]=SysV-Init 编辑器记录文件
+ Icon=ksysv
+ Type=MimeType
+diff -Nru kde.orig/ksysv/x-ksysv.desktop kde.patched/ksysv/x-ksysv.desktop
+--- kde.orig/ksysv/x-ksysv.desktop 2005-02-04 23:17:09.000000000 -0500
++++ kde.patched/ksysv/x-ksysv.desktop 2005-03-07 09:19:47.000000000 -0500
+@@ -60,7 +60,6 @@
+ Comment[ven]=Khonofiguresheni yo vhulungelwaho khayo
+ Comment[wa]=Apontiaedje d' enondaedje schapé
+ Comment[xh]=Uqwalaselo olugciniweyo lwe Init
+-Comment[xx]=xxSaved Init Configurationxx
+ Comment[zh_CN]=已保存的 Init 配置
+ Comment[zh_TW]=已儲存起始設定
+ Comment[zu]=Uhlanganiselo olugciniwe lwe Init
+diff -Nru kde.orig/kuser/kuser.desktop kde.patched/kuser/kuser.desktop
+--- kde.orig/kuser/kuser.desktop 2005-02-04 23:17:09.000000000 -0500
++++ kde.patched/kuser/kuser.desktop 2005-03-07 09:19:48.000000000 -0500
+@@ -19,7 +19,6 @@
+ Name[tg]=KИстифодакунанда
+ Name[th]=จัดการบัญชีผู้ใช้ - K
+ Name[uz]=Фойдаланувчилар
+-Name[xx]=xxKUserxx
+ GenericName=User Manager
+ GenericName[af]=Gebruiker Bestuurder
+ GenericName[ar]=مدير المستخدمين
+@@ -80,7 +79,6 @@
+ GenericName[ven]=Murangaphanda wa Mushumisi
+ GenericName[wa]=Manaedjeu d' uzeus
+ GenericName[xh]=Umphathi We Calendar
+-GenericName[xx]=xxUser Managerxx
+ GenericName[zh_CN]=用户管理程序
+ GenericName[zh_TW]=使用者管理程式
+ GenericName[zu]=Umphathi we Calendar
+diff -Nru kde.orig/kuser/propdlg.cpp kde.patched/kuser/propdlg.cpp
+--- kde.orig/kuser/propdlg.cpp 2004-11-28 19:03:48.000000000 -0500
++++ kde.patched/kuser/propdlg.cpp 2005-04-07 10:33:39.000000000 -0400
+@@ -210,6 +210,8 @@
+ connect(cbposix, SIGNAL(stateChanged(int)), this, SLOT(changed()));
+ connect(cbposix, SIGNAL(stateChanged(int)), this, SLOT(cbposixChanged()));
+ addRow(frame, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
++ } else {
++ cbposix = 0;
+ }
+ frontrow = row;
+ }
+@@ -706,7 +708,8 @@
+ bool posix, samba = false;
+
+ newuser->copy( user );
+- if ( cbposix->state() != QButton::NoChange ) {
++
++ if ( kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX && cbposix->state() != QButton::NoChange ) {
+ if ( cbposix->isChecked() )
+ newuser->setCaps( newuser->getCaps() & ~KUser::Cap_POSIX );
+ else
+@@ -873,7 +876,7 @@
+ bool propdlg::check()
+ {
+ bool one = ( mUsers.getFirst() == mUsers.getLast() );
+- bool posix = !( cbposix->isChecked() );
++ bool posix = !( kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX ) || !( cbposix->isChecked() );
+
+ if ( one && posix && leid->text().isEmpty() ) {
+ KMessageBox::sorry( 0, i18n("You need to specify an UID.") );
+@@ -928,7 +931,8 @@
+
+ uid_t newuid = leid->text().toULong();
+
+- if ( one && !cbposix->isChecked() && olduid != newuid )
++ if ( one && ( !( kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX ) || !cbposix->isChecked() )
++ && olduid != newuid )
+ {
+ if (kug->getUsers().lookup(newuid)) {
+ KMessageBox::sorry( 0,
+diff -Nru kde.orig/lilo-config/kde/lilo.desktop kde.patched/lilo-config/kde/lilo.desktop
+--- kde.orig/lilo-config/kde/lilo.desktop 2005-02-04 23:17:09.000000000 -0500
++++ kde.patched/lilo-config/kde/lilo.desktop 2005-03-07 09:19:48.000000000 -0500
+@@ -66,7 +66,6 @@
+ Name[ven]=Muranga phanda wa Butu (LILO)
+ Name[wa]=Apontiaedje del enondrece (LILO)
+ Name[xh]=Umphathi wesiNgxobo (LILO)
+-Name[xx]=xxBoot Manager (LILO)xx
+ Name[zh_CN]=启动管理器(LILO)
+ Name[zh_TW]=開機啟動管理程式(LILO)
+ Name[zu]=Umphathi Wesingxobo (LILO)
+@@ -125,7 +124,6 @@
+ Comment[ven]=Dzudzanyani LILO (mulanguli wa boot ya Linux)
+ Comment[wa]=Chal vos ploz apontyî LILO (l' enondrece Linux)
+ Comment[xh]=Qwalalsela LILO (umphathi we boot ye Linux)
+-Comment[xx]=xxConfigure LILO (the Linux boot manager)xx
+ Comment[zh_CN]=配置 LILO (Linux 启动管理程序)
+
+ Keywords=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start
+@@ -177,7 +175,6 @@
+ Keywords[ven]=lilo,boot,bootup,boot manager,linux,Other Os,MBR,Mathomoni,Thoma
+ Keywords[wa]=LILO,boot,bootup,linux,Ôtes SO,MBR,startup,start,enondrece,enondaedje
+ Keywords[xh]=lilo,isingxobo,faka isingxobo, uphathi wesingxobo,linux,Ezinye OS,MBR,faka isiqalo,qala
+-Keywords[xx]=xxlilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,startxx
+ Keywords[zh_CN]=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start,启动,启动管理器,其它操作系统
+ Keywords[zu]=lilo,isingxobo,faka isingxobo umphathi wesingxobo,linux,Ezinye OS,MBR,faka isiqalo,qala
+
Modified: branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff 2005-04-07 23:46:03 UTC (rev 988)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff 2005-04-08 00:39:39 UTC (rev 989)
@@ -1,11 +1,12 @@
#DPATCHLEVEL=1
-diff -Nrua kdeadmin-3.4.0.orig/Makefile.in kdeadmin-3.4.0/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/Makefile.in kdeadmin-3.4.0/Makefile.in
--- kdeadmin-3.4.0.orig/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -114,10 +115,36 @@
#>+ 2
docs-am:
-diff -Nrua kdeadmin-3.4.0.orig/acinclude.m4 kdeadmin-3.4.0/acinclude.m4
+@@ -846,7 +861,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/acinclude.m4 kdeadmin-3.4.0/acinclude.m4
--- kdeadmin-3.4.0.orig/acinclude.m4 2005-03-04 07:08:59.000000000 -0500
-+++ kdeadmin-3.4.0/acinclude.m4 2005-03-04 23:08:14.000000000 -0500
-@@ -1682,15 +1682,6 @@
++++ kdeadmin-3.4.0/acinclude.m4 2005-04-07 20:22:28.000000000 -0400
+@@ -1644,7 +1644,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 its the
++same Qt version, compiled with the same compiler and the same Qt
++configuration settings.
++])
+ fi
+ fi
+ ])
+@@ -1682,15 +1690,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -133,7 +160,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2131,9 +2122,6 @@
+@@ -2131,9 +2130,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -143,7 +170,80 @@
AC_TRY_COMPILE([
$2
],
-@@ -5686,6 +5674,7 @@
+@@ -3104,8 +3100,8 @@
+ 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")
+ 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,6 +3190,51 @@
+ ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
+ ])
+
++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 */
++ template<typename CharT>
++ struct VisTest
++ {
++ inline VisTest ();
++ };
++ template<typename CharT>
++ inline VisTest<CharT>::VisTest()
++ {}
++ extern template class VisTest<char>; // It works if we drop that line
++ int some_function( int do_something ) __attribute__ ((visibility("default")));
++ int some_function( int )
++ {
++ VisTest<char> a;
++ 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_CHECK_AND_ADD_HIDDEN_VISIBILITY],
+ [
+ if test "$GXX" = "yes"; then
+@@ -3202,7 +3243,9 @@
+ KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
+ KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+ [
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
++ 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])
+ ])
+@@ -5686,6 +5729,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -151,7 +251,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5734,7 @@
+@@ -5745,7 +5789,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -160,7 +260,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6148,11 @@
+@@ -6159,12 +6203,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -174,7 +274,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6176,7 +6219,6 @@
esac
;;
*64-bit*)
@@ -182,7 +282,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6293,7 @@
+@@ -6306,7 +6348,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -191,7 +291,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6335,20 +6377,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -223,7 +323,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6498,7 +6491,7 @@
+@@ -6498,7 +6546,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -232,7 +332,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6580,6 @@
+@@ -6587,13 +6635,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -246,7 +346,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6617,8 +6603,11 @@
+@@ -6617,8 +6658,11 @@
fi
fi
chmod u+w .
@@ -260,7 +360,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6735,7 +6779,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -269,7 +369,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6737,7 @@
+@@ -6748,7 +6792,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -278,7 +378,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6747,20 @@
+@@ -6758,7 +6802,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -300,7 +400,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6825,7 @@
+@@ -6823,7 +6880,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -309,7 +409,7 @@
;;
beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6848,7 +6905,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -318,7 +418,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6915,7 @@
+@@ -6913,7 +6970,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -327,7 +427,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -6936,7 +6938,7 @@
+@@ -6936,7 +6993,7 @@
dynamic_linker=no
;;
@@ -336,7 +436,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +6998,7 @@
+@@ -6996,7 +7053,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -345,7 +445,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7013,7 @@
+@@ -7011,7 +7068,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -354,7 +454,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7022,7 +7024,7 @@
+@@ -7022,7 +7079,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -363,7 +463,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7084,22 +7086,19 @@
+@@ -7084,22 +7141,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -392,7 +492,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7109,6 +7108,30 @@
+@@ -7109,6 +7163,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -423,7 +523,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7141,7 @@
+@@ -7118,7 +7196,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -432,7 +532,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7170,7 @@
+@@ -7147,7 +7225,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -441,7 +541,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7167,7 +7190,7 @@
+@@ -7167,7 +7245,7 @@
os2*)
libname_spec='$name'
@@ -450,7 +550,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7781,23 @@
+@@ -7758,31 +7836,23 @@
;;
cygwin*)
@@ -491,7 +591,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7836,21 @@
+@@ -7821,42 +7891,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -541,7 +641,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -7885,9 +7879,6 @@
+@@ -7885,9 +7934,6 @@
;;
osf3* | osf4* | osf5*)
@@ -551,7 +651,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7888,6 @@
+@@ -7897,7 +7943,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -559,7 +659,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8153,7 @@
+@@ -8163,7 +8208,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -568,7 +668,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8213,7 +8203,7 @@
+@@ -8213,7 +8258,7 @@
fi
;;
@@ -577,7 +677,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8213,29 @@
+@@ -8223,29 +8268,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -621,7 +721,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8253,8 +8243,8 @@
+@@ -8253,8 +8298,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -632,7 +732,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8352,8 @@
+@@ -8362,8 +8407,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -643,7 +743,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8389,7 +8379,7 @@
+@@ -8389,7 +8434,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -652,7 +752,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8409,22 @@
+@@ -8419,8 +8464,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -677,7 +777,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8470,16 @@
+@@ -8466,15 +8525,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -698,7 +798,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8483,13 +8488,12 @@
+@@ -8483,13 +8543,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -714,7 +814,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8508,7 @@
+@@ -8504,7 +8563,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -723,7 +823,7 @@
fi
fi
;;
-@@ -8521,12 +8525,12 @@
+@@ -8521,12 +8580,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -738,7 +838,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8535,7 +8539,7 @@
+@@ -8535,7 +8594,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -747,7 +847,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8550,20 @@
+@@ -8546,20 +8605,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -778,7 +878,7 @@
fi
;;
esac
-@@ -8569,19 +8573,19 @@
+@@ -8569,19 +8628,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -804,7 +904,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8616,7 +8620,7 @@
+@@ -8616,7 +8675,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -813,7 +913,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8638,7 +8642,7 @@
+@@ -8638,7 +8697,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -822,7 +922,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8647,11 +8651,11 @@
+@@ -8647,11 +8706,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -836,7 +936,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8712,7 @@
+@@ -8708,7 +8767,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -845,7 +945,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8733,7 @@
+@@ -8729,7 +8788,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -854,7 +954,7 @@
;;
esac
fi
-@@ -8744,7 +8748,7 @@
+@@ -8744,7 +8803,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -863,7 +963,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8755,9 +8759,9 @@
+@@ -8755,9 +8814,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -875,7 +975,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8778,8 @@
+@@ -8774,8 +8833,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -886,7 +986,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8797,16 +8801,16 @@
+@@ -8797,16 +8856,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -907,7 +1007,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8848,7 @@
+@@ -8844,7 +8903,7 @@
;;
esac
;;
@@ -916,7 +1016,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -8863,7 +8867,7 @@
+@@ -8863,7 +8922,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -925,7 +1025,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8884,7 @@
+@@ -8880,7 +8939,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -934,7 +1034,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8902,7 @@
+@@ -8898,7 +8957,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -943,7 +1043,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8927,7 @@
+@@ -8923,7 +8982,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -952,7 +1052,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8943,10 @@
+@@ -8939,10 +8998,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -965,7 +1065,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +8965,7 @@
+@@ -8961,7 +9020,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -974,7 +1074,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9022,9 @@
+@@ -9018,9 +9077,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -986,7 +1086,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9058,7 @@
+@@ -9054,7 +9113,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -995,7 +1095,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9064,9 +9068,9 @@
+@@ -9064,9 +9123,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -1007,7 +1107,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9079,9 @@
+@@ -9075,9 +9134,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1019,7 +1119,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9249,7 @@
+@@ -9245,7 +9304,7 @@
fi
;;
@@ -1028,7 +1128,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9354,7 +9358,7 @@
+@@ -9354,7 +9413,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1037,7 +1137,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9500,12 @@
+@@ -9496,11 +9555,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1052,7 +1152,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9550,7 +9555,7 @@
+@@ -9550,7 +9610,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1061,7 +1161,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9681,7 +9686,7 @@
+@@ -9681,7 +9741,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1070,7 +1170,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9717,7 @@
+@@ -9712,7 +9772,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1079,7 +1179,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +9961,10 @@
+@@ -9956,7 +10016,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -1091,7 +1191,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10037,7 @@
+@@ -10029,7 +10092,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1100,7 +1200,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10055,7 @@
+@@ -10047,7 +10110,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1109,7 +1209,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10262,7 +10325,7 @@
;;
esac
;;
@@ -1118,7 +1218,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10321,7 @@
+@@ -10313,7 +10376,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1127,7 +1227,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10346,7 @@
+@@ -10338,7 +10401,7 @@
;;
esac
;;
@@ -1136,7 +1236,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10657,9 @@
+@@ -10649,6 +10712,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1146,7 +1246,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10684,7 @@
+@@ -10673,7 +10739,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1155,7 +1255,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10747,7 +10758,7 @@
+@@ -10747,7 +10813,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1164,7 +1264,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10768,13 @@
+@@ -10757,13 +10823,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1180,7 +1280,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10772,19 +10783,19 @@
+@@ -10772,19 +10838,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1204,7 +1304,7 @@
fi
;;
-@@ -10802,8 +10813,8 @@
+@@ -10802,8 +10868,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1215,7 +1315,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10827,36 @@
+@@ -10816,10 +10882,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1254,7 +1354,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10906,20 @@
+@@ -10869,9 +10961,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -1277,7 +1377,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +10965,29 @@
+@@ -10917,29 +11020,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1316,7 +1416,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11002,7 @@
+@@ -10954,7 +11057,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -1325,7 +1425,7 @@
fi
fi
;;
-@@ -10977,13 +11025,13 @@
+@@ -10977,13 +11080,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1342,7 +1442,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -10997,21 +11045,21 @@
+@@ -10997,21 +11100,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1377,7 +1477,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11068,26 @@
+@@ -11020,26 +11123,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1412,7 +1512,7 @@
;;
dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11072,8 +11175,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1423,7 +1523,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11081,7 +11129,7 @@
+@@ -11081,7 +11184,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1432,7 +1532,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11099,10 +11147,10 @@
+@@ -11099,10 +11202,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1445,7 +1545,7 @@
;;
esac
else
-@@ -11149,7 +11197,7 @@
+@@ -11149,7 +11252,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1454,7 +1554,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11159,7 +11207,7 @@
+@@ -11159,7 +11262,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1463,7 +1563,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11182,7 +11230,7 @@
+@@ -11182,7 +11285,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1472,7 +1572,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11192,7 +11240,7 @@
+@@ -11192,7 +11295,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1481,7 +1581,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11251,14 @@
+@@ -11203,14 +11306,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1498,7 +1598,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11222,7 +11270,7 @@
+@@ -11222,7 +11325,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1507,7 +1607,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11247,9 +11295,9 @@
+@@ -11247,9 +11350,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1519,7 +1619,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11269,7 +11317,7 @@
+@@ -11269,7 +11372,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -1528,7 +1628,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11377,9 @@
+@@ -11329,9 +11432,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1540,7 +1640,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11437,7 @@
+@@ -11389,7 +11492,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1549,7 +1649,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11596,8 @@
+@@ -11548,8 +11651,8 @@
fi
done
done
@@ -1559,9 +1659,9 @@
AC_MSG_RESULT([$SED])
])
-diff -Nrua kdeadmin-3.4.0.orig/aclocal.m4 kdeadmin-3.4.0/aclocal.m4
+diff -Nru kdeadmin-3.4.0.orig/aclocal.m4 kdeadmin-3.4.0/aclocal.m4
--- kdeadmin-3.4.0.orig/aclocal.m4 2005-03-04 07:09:08.000000000 -0500
-+++ kdeadmin-3.4.0/aclocal.m4 2005-03-04 23:08:32.000000000 -0500
++++ kdeadmin-3.4.0/aclocal.m4 2005-04-07 20:22:48.000000000 -0400
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
@@ -2151,9 +2251,9 @@
# _AM_PROG_TAR(FORMAT)
# --------------------
-diff -Nrua kdeadmin-3.4.0.orig/configure kdeadmin-3.4.0/configure
+diff -Nru kdeadmin-3.4.0.orig/configure kdeadmin-3.4.0/configure
--- kdeadmin-3.4.0.orig/configure 2005-03-04 07:09:31.000000000 -0500
-+++ kdeadmin-3.4.0/configure 2005-03-04 23:09:23.000000000 -0500
++++ kdeadmin-3.4.0/configure 2005-04-07 20:23:27.000000000 -0400
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -2433,6 +2533,22 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
+@@ -5369,6 +5374,7 @@
+ fi
+ rm -f conftest.h conftest.h.gch
+ fi
++ fi
+
+
+ if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then
+@@ -5379,7 +5385,6 @@
+ unsermake_enable_pch_FALSE=
+ fi
+
+- fi
+ if test "$CXX" = "KCC"; then
+
+ if test "$kde_use_pch" = "yes"; then
@@ -5428,8 +5433,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7162,16 +7278,43 @@
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32023,7 +31937,7 @@
+@@ -30680,8 +30594,24 @@
+ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+ echo "${ECHO_T}$kde_cv_uic_plugins" >&6
+ if test "$kde_cv_uic_plugins" != yes; then
+- { { echo "$as_me:$LINENO: error: you need to install kdelibs first." >&5
+-echo "$as_me: error: you need to install kdelibs first." >&2;}
++ { { echo "$as_me:$LINENO: 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 its the
++same Qt version, compiled with the same compiler and the same Qt
++configuration settings.
++" >&5
++echo "$as_me: 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 its the
++same Qt version, compiled with the same compiler and the same Qt
++configuration settings.
++" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+@@ -32023,7 +31953,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32026: $i/$j" >&5
-+ echo "configure: 31940: $i/$j" >&5
++ echo "configure: 31956: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32195,9 +32109,6 @@
+@@ -32195,9 +32125,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7181,7 +7324,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32228,8 +32139,7 @@
+@@ -32228,8 +32155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7191,7 +7334,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32330,8 +32240,7 @@
+@@ -32330,8 +32256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7201,7 +7344,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32410,9 +32319,6 @@
+@@ -32410,9 +32335,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7211,7 +7354,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32443,8 +32349,7 @@
+@@ -32443,8 +32365,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7221,7 +7364,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32545,8 +32450,7 @@
+@@ -32545,8 +32466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7231,7 +7374,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32641,8 +32545,7 @@
+@@ -32641,8 +32561,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7241,7 +7384,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32791,8 +32694,7 @@
+@@ -32791,8 +32710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7251,7 +7394,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32940,8 +32842,7 @@
+@@ -32940,8 +32858,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7261,7 +7404,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33019,8 +32920,7 @@
+@@ -33019,8 +32936,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7271,7 +7414,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33174,8 +33074,7 @@
+@@ -33174,8 +33090,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7281,7 +7424,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33279,8 +33178,7 @@
+@@ -33279,8 +33194,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7291,7 +7434,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33337,8 +33235,7 @@
+@@ -33337,8 +33251,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7301,7 +7444,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33477,8 +33374,7 @@
+@@ -33477,8 +33390,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7311,7 +7454,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33718,8 +33614,7 @@
+@@ -33718,8 +33630,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7321,7 +7464,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33787,8 +33682,7 @@
+@@ -33787,8 +33698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7331,7 +7474,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33883,8 +33777,7 @@
+@@ -33883,8 +33793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7341,7 +7484,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34012,8 +33905,7 @@
+@@ -34012,8 +33921,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7351,7 +7494,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34085,8 +33977,7 @@
+@@ -34085,8 +33993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7361,7 +7504,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34140,8 +34031,7 @@
+@@ -34140,8 +34047,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7371,7 +7514,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34212,8 +34102,7 @@
+@@ -34212,8 +34118,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7381,7 +7524,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34267,8 +34156,7 @@
+@@ -34267,8 +34172,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7391,7 +7534,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34335,8 +34223,7 @@
+@@ -34335,8 +34239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7401,7 +7544,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34521,8 +34408,7 @@
+@@ -34521,8 +34424,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7411,7 +7554,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34782,9 +34668,6 @@
+@@ -34782,9 +34684,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7421,7 +7564,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34813,8 +34696,7 @@
+@@ -34813,8 +34712,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7431,7 +7574,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34913,8 +34795,7 @@
+@@ -34913,8 +34811,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7441,7 +7584,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34991,9 +34872,6 @@
+@@ -34991,9 +34888,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7451,7 +7594,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35022,8 +34900,7 @@
+@@ -35022,8 +34916,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7461,7 +7604,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35122,8 +34999,7 @@
+@@ -35122,8 +35015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7471,7 +7614,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35200,9 +35076,6 @@
+@@ -35200,9 +35092,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7481,7 +7624,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35231,8 +35104,7 @@
+@@ -35231,8 +35120,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7491,7 +7634,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35331,8 +35203,7 @@
+@@ -35331,8 +35219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7501,7 +7644,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35426,8 +35297,7 @@
+@@ -35426,8 +35313,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7511,7 +7654,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35469,8 +35339,7 @@
+@@ -35469,8 +35355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7521,7 +7664,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35527,8 +35396,7 @@
+@@ -35527,8 +35412,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7531,7 +7674,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35988,6 +35856,13 @@
+@@ -35988,6 +35872,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -7545,7 +7688,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -36690,6 +36565,9 @@
+@@ -36690,6 +36581,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -7555,7 +7698,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -37053,11 +36931,6 @@
+@@ -37053,11 +36947,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -7567,7 +7710,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -37096,6 +36969,12 @@
+@@ -37096,6 +36985,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -7580,9 +7723,9 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nrua kdeadmin-3.4.0.orig/configure.in kdeadmin-3.4.0/configure.in
+diff -Nru kdeadmin-3.4.0.orig/configure.in kdeadmin-3.4.0/configure.in
--- kdeadmin-3.4.0.orig/configure.in 2005-03-04 07:08:59.000000000 -0500
-+++ kdeadmin-3.4.0/configure.in 2005-03-04 23:08:15.000000000 -0500
++++ kdeadmin-3.4.0/configure.in 2005-04-07 20:22:28.000000000 -0400
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdeadmin, "3.4.0") dnl searches for some needed programs
@@ -7592,13 +7735,14 @@
KDE_SET_PREFIX
dnl generate the config header
-diff -Nrua kdeadmin-3.4.0.orig/doc/Makefile.in kdeadmin-3.4.0/doc/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/doc/Makefile.in kdeadmin-3.4.0/doc/Makefile.in
--- kdeadmin-3.4.0.orig/doc/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/doc/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/doc/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -7693,13 +7837,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeadmin-3.4.0.orig/doc/kcron/Makefile.in kdeadmin-3.4.0/doc/kcron/Makefile.in
+@@ -686,7 +701,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/doc/kcron/Makefile.in kdeadmin-3.4.0/doc/kcron/Makefile.in
--- kdeadmin-3.4.0.orig/doc/kcron/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/doc/kcron/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/doc/kcron/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -7776,13 +7930,23 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nrua kdeadmin-3.4.0.orig/doc/kdat/Makefile.in kdeadmin-3.4.0/doc/kdat/Makefile.in
+@@ -579,7 +582,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/doc/kdat/Makefile.in kdeadmin-3.4.0/doc/kdat/Makefile.in
--- kdeadmin-3.4.0.orig/doc/kdat/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/doc/kdat/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/doc/kdat/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -7831,13 +7995,23 @@
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nrua kdeadmin-3.4.0.orig/doc/kpackage/Makefile.in kdeadmin-3.4.0/doc/kpackage/Makefile.in
+@@ -579,7 +582,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/doc/kpackage/Makefile.in kdeadmin-3.4.0/doc/kpackage/Makefile.in
--- kdeadmin-3.4.0.orig/doc/kpackage/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/doc/kpackage/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/doc/kpackage/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -7914,13 +8088,23 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nrua kdeadmin-3.4.0.orig/doc/ksysv/Makefile.in kdeadmin-3.4.0/doc/ksysv/Makefile.in
+@@ -579,7 +582,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/doc/ksysv/Makefile.in kdeadmin-3.4.0/doc/ksysv/Makefile.in
--- kdeadmin-3.4.0.orig/doc/ksysv/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/doc/ksysv/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/doc/ksysv/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -7960,13 +8144,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/doc/kuser/Makefile.in kdeadmin-3.4.0/doc/kuser/Makefile.in
+@@ -579,7 +582,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/doc/kuser/Makefile.in kdeadmin-3.4.0/doc/kuser/Makefile.in
--- kdeadmin-3.4.0.orig/doc/kuser/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/doc/kuser/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/doc/kuser/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -8039,13 +8233,23 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -Nrua kdeadmin-3.4.0.orig/kcron/Makefile.in kdeadmin-3.4.0/kcron/Makefile.in
+@@ -579,7 +582,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/kcron/Makefile.in kdeadmin-3.4.0/kcron/Makefile.in
--- kdeadmin-3.4.0.orig/kcron/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/kcron/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kcron/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -8169,13 +8373,14 @@
@echo 'creating kcron.all_cpp.cpp ...'; \
rm -f kcron.all_cpp.files kcron.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcron.all_cpp.final; \
-diff -Nrua kdeadmin-3.4.0.orig/kdat/Makefile.in kdeadmin-3.4.0/kdat/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/kdat/Makefile.in kdeadmin-3.4.0/kdat/Makefile.in
--- kdeadmin-3.4.0.orig/kdat/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/kdat/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kdat/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -8359,13 +8564,14 @@
@echo 'creating kdat.all_cpp.cpp ...'; \
rm -f kdat.all_cpp.files kdat.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kdat.all_cpp.final; \
-diff -Nrua kdeadmin-3.4.0.orig/kdat/pics/Makefile.in kdeadmin-3.4.0/kdat/pics/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/kdat/pics/Makefile.in kdeadmin-3.4.0/kdat/pics/Makefile.in
--- kdeadmin-3.4.0.orig/kdat/pics/Makefile.in 2005-03-04 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/kdat/pics/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kdat/pics/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -8550,13 +8756,23 @@
#>+ 15
force-reedit:
-diff -Nrua kdeadmin-3.4.0.orig/kfile-plugins/Makefile.in kdeadmin-3.4.0/kfile-plugins/Makefile.in
+@@ -617,7 +620,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/kfile-plugins/Makefile.in kdeadmin-3.4.0/kfile-plugins/Makefile.in
--- kdeadmin-3.4.0.orig/kfile-plugins/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kfile-plugins/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kfile-plugins/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -8644,13 +8860,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeadmin-3.4.0.orig/kfile-plugins/deb/Makefile.in kdeadmin-3.4.0/kfile-plugins/deb/Makefile.in
+@@ -682,7 +697,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/kfile-plugins/deb/Makefile.in kdeadmin-3.4.0/kfile-plugins/deb/Makefile.in
--- kdeadmin-3.4.0.orig/kfile-plugins/deb/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kfile-plugins/deb/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kfile-plugins/deb/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -8713,13 +8939,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeadmin-3.4.0.orig/kfile-plugins/rpm/Makefile.in kdeadmin-3.4.0/kfile-plugins/rpm/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/kfile-plugins/rpm/Makefile.in kdeadmin-3.4.0/kfile-plugins/rpm/Makefile.in
--- kdeadmin-3.4.0.orig/kfile-plugins/rpm/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kfile-plugins/rpm/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kfile-plugins/rpm/Makefile.in 2005-04-07 20:23:23.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -8782,13 +9009,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeadmin-3.4.0.orig/kpackage/Makefile.in kdeadmin-3.4.0/kpackage/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/kpackage/Makefile.in kdeadmin-3.4.0/kpackage/Makefile.in
--- kdeadmin-3.4.0.orig/kpackage/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kpackage/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -8971,13 +9199,14 @@
@echo 'creating kpackage.all_cpp.cpp ...'; \
rm -f kpackage.all_cpp.files kpackage.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kpackage.all_cpp.final; \
-diff -Nrua kdeadmin-3.4.0.orig/kpackage/icon/Makefile.in kdeadmin-3.4.0/kpackage/icon/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/kpackage/icon/Makefile.in kdeadmin-3.4.0/kpackage/icon/Makefile.in
--- kdeadmin-3.4.0.orig/kpackage/icon/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kpackage/icon/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/icon/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9046,13 +9275,23 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpackage.png
#>+ 15
-diff -Nrua kdeadmin-3.4.0.orig/kpackage/mimetypes/Makefile.in kdeadmin-3.4.0/kpackage/mimetypes/Makefile.in
+@@ -554,7 +557,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/kpackage/mimetypes/Makefile.in kdeadmin-3.4.0/kpackage/mimetypes/Makefile.in
--- kdeadmin-3.4.0.orig/kpackage/mimetypes/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kpackage/mimetypes/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/mimetypes/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9092,13 +9331,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/kpackage/pics/Makefile.in kdeadmin-3.4.0/kpackage/pics/Makefile.in
+@@ -561,7 +564,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/kpackage/pics/Makefile.in kdeadmin-3.4.0/kpackage/pics/Makefile.in
--- kdeadmin-3.4.0.orig/kpackage/pics/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kpackage/pics/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/pics/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9147,13 +9396,23 @@
#>+ 2
docs-am:
-diff -Nrua kdeadmin-3.4.0.orig/kpackage/toolbar/Makefile.in kdeadmin-3.4.0/kpackage/toolbar/Makefile.in
+@@ -565,7 +568,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/kpackage/toolbar/Makefile.in kdeadmin-3.4.0/kpackage/toolbar/Makefile.in
--- kdeadmin-3.4.0.orig/kpackage/toolbar/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kpackage/toolbar/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/toolbar/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9193,13 +9452,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/ksysv/Makefile.in kdeadmin-3.4.0/ksysv/Makefile.in
+@@ -561,7 +564,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/ksysv/Makefile.in kdeadmin-3.4.0/ksysv/Makefile.in
--- kdeadmin-3.4.0.orig/ksysv/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/ksysv/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/ksysv/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9429,13 +9698,14 @@
ksvlookandfeel.lo: ksvlookandfeel.moc
OldView.lo: OldView.moc
ksvdrag.lo: ksvdrag.moc
-diff -Nrua kdeadmin-3.4.0.orig/ksysv/pics/Makefile.in kdeadmin-3.4.0/ksysv/pics/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/ksysv/pics/Makefile.in kdeadmin-3.4.0/ksysv/pics/Makefile.in
--- kdeadmin-3.4.0.orig/ksysv/pics/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/ksysv/pics/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/ksysv/pics/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9475,13 +9745,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/ksysv/toolbar/Makefile.in kdeadmin-3.4.0/ksysv/toolbar/Makefile.in
+@@ -568,7 +571,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/ksysv/toolbar/Makefile.in kdeadmin-3.4.0/ksysv/toolbar/Makefile.in
--- kdeadmin-3.4.0.orig/ksysv/toolbar/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/ksysv/toolbar/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/ksysv/toolbar/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9521,13 +9801,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/kuser/Makefile.in kdeadmin-3.4.0/kuser/Makefile.in
+@@ -542,7 +545,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/kuser/Makefile.in kdeadmin-3.4.0/kuser/Makefile.in
--- kdeadmin-3.4.0.orig/kuser/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kuser/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kuser/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9726,13 +10016,14 @@
@echo 'creating kuser.all_cpp.cpp ...'; \
rm -f kuser.all_cpp.files kuser.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kuser.all_cpp.final; \
-diff -Nrua kdeadmin-3.4.0.orig/kuser/icon/Makefile.in kdeadmin-3.4.0/kuser/icon/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/kuser/icon/Makefile.in kdeadmin-3.4.0/kuser/icon/Makefile.in
--- kdeadmin-3.4.0.orig/kuser/icon/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kuser/icon/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kuser/icon/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9813,13 +10104,23 @@
#>+ 15
force-reedit:
-diff -Nrua kdeadmin-3.4.0.orig/kuser/pic/Makefile.in kdeadmin-3.4.0/kuser/pic/Makefile.in
+@@ -554,7 +557,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/kuser/pic/Makefile.in kdeadmin-3.4.0/kuser/pic/Makefile.in
--- kdeadmin-3.4.0.orig/kuser/pic/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kuser/pic/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kuser/pic/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9859,13 +10160,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/kuser/toolbar/Makefile.in kdeadmin-3.4.0/kuser/toolbar/Makefile.in
+@@ -567,7 +570,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/kuser/toolbar/Makefile.in kdeadmin-3.4.0/kuser/toolbar/Makefile.in
--- kdeadmin-3.4.0.orig/kuser/toolbar/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kuser/toolbar/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/kuser/toolbar/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9931,13 +10242,23 @@
-rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/edit_user.png
#>+ 15
-diff -Nrua kdeadmin-3.4.0.orig/lilo-config/Makefile.in kdeadmin-3.4.0/lilo-config/Makefile.in
+@@ -553,7 +556,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/lilo-config/Makefile.in kdeadmin-3.4.0/lilo-config/Makefile.in
--- kdeadmin-3.4.0.orig/lilo-config/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10025,13 +10346,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeadmin-3.4.0.orig/lilo-config/common/Makefile.in kdeadmin-3.4.0/lilo-config/common/Makefile.in
+@@ -686,7 +701,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nru kdeadmin-3.4.0.orig/lilo-config/common/Makefile.in kdeadmin-3.4.0/lilo-config/common/Makefile.in
--- kdeadmin-3.4.0.orig/lilo-config/common/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/common/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/common/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10094,13 +10425,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdeadmin-3.4.0.orig/lilo-config/common/tests/Makefile.in kdeadmin-3.4.0/lilo-config/common/tests/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/lilo-config/common/tests/Makefile.in kdeadmin-3.4.0/lilo-config/common/tests/Makefile.in
--- kdeadmin-3.4.0.orig/lilo-config/common/tests/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/common/tests/Makefile.in 2005-03-04 23:09:19.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/common/tests/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10163,13 +10495,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nrua kdeadmin-3.4.0.orig/lilo-config/kde/Makefile.in kdeadmin-3.4.0/lilo-config/kde/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/lilo-config/kde/Makefile.in kdeadmin-3.4.0/lilo-config/kde/Makefile.in
--- kdeadmin-3.4.0.orig/lilo-config/kde/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/kde/Makefile.in 2005-03-04 23:09:20.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/kde/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10232,13 +10565,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeadmin-3.4.0.orig/lilo-config/kde-qt-common/Makefile.in kdeadmin-3.4.0/lilo-config/kde-qt-common/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/lilo-config/kde-qt-common/Makefile.in kdeadmin-3.4.0/lilo-config/kde-qt-common/Makefile.in
--- kdeadmin-3.4.0.orig/lilo-config/kde-qt-common/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/kde-qt-common/Makefile.in 2005-03-04 23:09:20.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/kde-qt-common/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10344,13 +10678,14 @@
@echo 'creating libwidgets_la.all_cpp.cpp ...'; \
rm -f libwidgets_la.all_cpp.files libwidgets_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libwidgets_la.all_cpp.final; \
-diff -Nrua kdeadmin-3.4.0.orig/lilo-config/qt/Makefile.in kdeadmin-3.4.0/lilo-config/qt/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/lilo-config/qt/Makefile.in kdeadmin-3.4.0/lilo-config/qt/Makefile.in
--- kdeadmin-3.4.0.orig/lilo-config/qt/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/qt/Makefile.in 2005-03-04 23:09:20.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/qt/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10413,13 +10748,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdeadmin-3.4.0.orig/secpolicy/Makefile.in kdeadmin-3.4.0/secpolicy/Makefile.in
+diff -Nru kdeadmin-3.4.0.orig/secpolicy/Makefile.in kdeadmin-3.4.0/secpolicy/Makefile.in
--- kdeadmin-3.4.0.orig/secpolicy/Makefile.in 2005-03-04 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/secpolicy/Makefile.in 2005-03-04 23:09:20.000000000 -0500
++++ kdeadmin-3.4.0/secpolicy/Makefile.in 2005-04-07 20:23:24.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,