May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit kdelibs3
by root＠suse.de 21 May '06

21 May '06

Hello community, here is the log from the commit of package kdelibs3 checked in at Sun May 21 02:03:07 CEST 2006. -------- --- KDE/kdelibs3/kdelibs3.changes 2006-05-19 10:57:13.000000000 +0200 +++ kdelibs3/kdelibs3.changes 2006-05-20 15:11:35.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 20 15:11:26 CEST 2006 - adrian(a)suse.de + +- do not require libdrm-devel for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.l4FoFv/_old 2006-05-21 02:02:41.000000000 +0200 +++ /var/tmp/diff_new_pack.l4FoFv/_new 2006-05-21 02:02:41.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.2 -Release: 6 +Release: 7 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.l4FoFv/_old 2006-05-21 02:02:41.000000000 +0200 +++ /var/tmp/diff_new_pack.l4FoFv/_new 2006-05-21 02:02:41.000000000 +0200 @@ -11,14 +11,17 @@ # norootforbuild Name: kdelibs3 -BuildRequires: OpenEXR-devel arts-devel aspell-devel cups-devel db-devel fam-devel flac-devel krb5-devel libacl-devel libart_lgpl-devel libdrm-devel libidn-devel libjasper libsndfile libtiff-devel libxslt-devel mDNSResponder-devel openldap2-devel pcre-devel qt3-devel sgml-skel unsermake update-desktop-files utempter +BuildRequires: OpenEXR-devel arts-devel aspell-devel cups-devel db-devel fam-devel flac-devel krb5-devel libacl-devel libart_lgpl-devel libidn-devel libjasper libsndfile libtiff-devel libxslt-devel mDNSResponder-devel openldap2-devel pcre-devel qt3-devel sgml-skel unsermake update-desktop-files utempter +%if %suse_version > 1000 +BuildRequires: libdrm-devel +%endif URL: http://www.kde.org License: GPL, LGPL Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.2 -Release: 6 +Release: 7 %define kdelibs_patch_level a Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons @@ -723,6 +726,8 @@ /opt/kde3/%_lib/libkwalletclient.so %changelog -n kdelibs3 +* Sat May 20 2006 - adrian(a)suse.de +- do not require libdrm-devel for < 10.1 * Fri May 19 2006 - stbinner(a)suse.de - make khtml smooth scrolling acceptable (#175741) * Wed May 17 2006 - dmueller(a)suse.de ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.l4FoFv/_old 2006-05-21 02:02:41.000000000 +0200 +++ /var/tmp/diff_new_pack.l4FoFv/_new 2006-05-21 02:02:41.000000000 +0200 @@ -16,7 +16,7 @@ License: Other License(s), see package, BSD Group: System/GUI/KDE Version: 3.5.2 -Release: 6 +Release: 7 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kdegraphics3
by root＠suse.de 21 May '06

21 May '06

Hello community, here is the log from the commit of package kdegraphics3 checked in at Sun May 21 02:02:20 CEST 2006. -------- --- KDE/kdegraphics3/kdegraphics3.changes 2006-05-16 15:51:35.000000000 +0200 +++ kdegraphics3/kdegraphics3.changes 2006-05-20 15:22:38.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 20 15:17:34 CEST 2006 - adrian(a)suse.de + +- do not BuildRequire agg-devel, it is not used +- do not require xpdf-tools for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics3.spec ++++++ --- /var/tmp/diff_new_pack.y6qiSc/_old 2006-05-21 02:01:56.000000000 +0200 +++ /var/tmp/diff_new_pack.y6qiSc/_new 2006-05-21 02:01:56.000000000 +0200 @@ -11,7 +11,10 @@ # norootforbuild Name: kdegraphics3 -BuildRequires: OpenEXR-devel agg-devel fribidi-devel giflib-devel imlib-config imlib-devel kdebase3 kdelibs3-devel kdelibs3-devel-doc libjasper net-snmp-devel poppler-devel poppler-qt qt3-devel-doc sane te_ams te_kpath te_latex xpdf-tools +BuildRequires: OpenEXR-devel fribidi-devel giflib-devel imlib-config imlib-devel kdebase3 kdelibs3-devel kdelibs3-devel-doc libjasper net-snmp-devel poppler-devel poppler-qt qt3-devel-doc sane te_ams te_kpath te_latex +%if %suse_version > 1000 +BuildRequires: xpdf-tools +%endif %ifarch %ix86 ia64 x86_64 BuildRequires: hp-officeJet %endif @@ -23,7 +26,7 @@ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Summary: Base Libraries for KDE Graphics Applications Version: 3.5.2 -Release: 2 +Release: 4 Source0: kdegraphics-%{version}.tar.bz2 Patch0: 3_5_BRANCH.diff Patch1: prefer-kpdf.diff @@ -629,6 +632,9 @@ /opt/kde3/include/*.h %changelog -n kdegraphics3 +* Sat May 20 2006 - adrian(a)suse.de +- do not BuildRequire agg-devel, it is not used +- do not require xpdf-tools for < 10.1 * Mon May 15 2006 - stbinner(a)suse.de - update to KDE 3.5.2 and 3_5_BRANCH.diff * KDVI ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ifolder3
by root＠suse.de 21 May '06

21 May '06

Hello community, here is the log from the commit of package ifolder3 checked in at Sun May 21 02:01:38 CEST 2006. -------- --- arch/i386/ifolder3/ifolder3.changes 2006-05-19 02:52:45.000000000 +0200 +++ ifolder3/ifolder3.changes 2006-05-20 13:46:09.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 20 13:20:21 CEST 2006 - meissner(a)suse.de + +- Make it build on every platform by compiling the helper + tools. + +------------------------------------------------------------------- New: ---- ifolder3-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ifolder3.spec ++++++ --- /var/tmp/diff_new_pack.M8APhv/_old 2006-05-21 01:57:08.000000000 +0200 +++ /var/tmp/diff_new_pack.M8APhv/_new 2006-05-21 01:57:08.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: ifolder3 -BuildRequires: compat-libstdc++ dbus-1-mono gtk-sharp2-complete gtk2-devel log4net mDNSResponder-devel simias update-desktop-files +BuildRequires: compat-libstdc++ dbus-1-mono gcc-c++ gtk-sharp2-complete gtk2-devel libstdc++-devel log4net mDNSResponder-devel simias update-desktop-files %define buildnum 6128 URL: http://www.ifolder.com %define prefix /opt/novell/ifolder3 @@ -26,9 +26,10 @@ Requires: gnome-sharp2 Obsoletes: %{name} < %{version} Version: 3.4.6128.1 -Release: 4 +Release: 5 Summary: File Sharing and Collaboration Tool Source: ifolder3-3.4.%{buildnum}.1.tar.gz +Patch0: ifolder3-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #============================================================================= @@ -42,6 +43,7 @@ %prep export BUILDNUM=%{buildnum} %setup -n %{name}-%{version} +%patch0 -p1 #============================================================================= %build @@ -49,6 +51,16 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./autogen.sh --prefix=%{prefix} +pushd tools/gsoap/linux-2.7 + cd src + make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + cp soapcpp2 .. + cd .. + cp -a ../macos*/wsdl . + cd wsdl + make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + cd .. +popd make make dist #============================================================================= @@ -97,6 +109,9 @@ /usr/share/applications/ifolder.desktop %changelog -n ifolder3 +* Sat May 20 2006 - meissner(a)suse.de +- Make it build on every platform by compiling the helper + tools. * Fri May 19 2006 - sreeves(a)suse.de - Fix for 176373 - Poor application categories * Mon May 08 2006 - jhargadon(a)novell.com ++++++ ifolder3-fixes.patch ++++++ --- simias-1.4.6128.1/tools/gsoap/linux-2.7/src/init2.c.xx 2006-05-18 16:06:22.000000000 +0200 +++ simias-1.4.6128.1/tools/gsoap/linux-2.7/src/init2.c 2006-05-18 16:06:29.000000000 +0200 @@ -176,6 +176,7 @@ /* init - initialize symbol table with predefined keywords */ +void init() { struct Keyword *k; for (k = keywords; k->s; k++) --- simias-1.4.6128.1/tools/gsoap/linux-2.7/src/error2.c.xx 2006-05-18 16:12:03.000000000 +0200 +++ simias-1.4.6128.1/tools/gsoap/linux-2.7/src/error2.c 2006-05-18 16:08:44.000000000 +0200 @@ -58,6 +58,7 @@ /* yyerror - called by parser from an error production with nonterminal `error' */ +void yyerror(char *s) { fprintf(stderr, "%s(%d): %s\n", filename, yylineno, s); } @@ -65,6 +66,7 @@ /* lexerror - called by lexical analyzer upon failure to recognize a token */ +void lexerror(const char *s) { fprintf(stderr, "%s(%d): %s: %s\n", filename, yylineno, s, yytext); if (lexerrno++ >= MAXERR) @@ -74,6 +76,7 @@ /* synerror - called by a semantic action in the yacc grammar */ +void synerror(const char *s) { fprintf(stderr, "%s(%d): Syntax error: %s\n", filename, yylineno-1, s); if (synerrno++ >= MAXERR) @@ -83,6 +86,7 @@ /* semerror - report semantic error from static checking */ +void semerror(const char *s) { fprintf(stderr, "\n%s(%d): **ERROR**: %s\n\n", filename, yylineno, s); if (semerrno++ >= MAXERR) @@ -92,6 +96,7 @@ /* semwarn - report semantic warning from static checking */ +void semwarn(const char *s) { fprintf(stderr, "\n**WARNING**: %s (detected at line %d in %s)\n\n", s, yylineno, filename); semwarno++; @@ -100,6 +105,7 @@ /* compliancewarn - report compliance warning */ +void compliancewarn(const char *s) { fprintf(stderr, "Compliance warning: %s\n", s); } @@ -107,6 +113,7 @@ /* typerror - report type error (a semantic error) */ +void typerror(const char *s) { fprintf(stderr, "%s(%d): Type error: %s\n", filename, yylineno, s); if (semerrno++ >= MAXERR) @@ -116,6 +123,7 @@ /* execerror - print error message and terminate execution */ +void execerror(const char *s) { fprintf(stderr, "Critical error: %s\n", s); exit(1); @@ -124,6 +132,7 @@ /* progerror - called when check(expr) failed, i.e. upon programming error */ +void progerror(const char *s, const char *f, int l) { fprintf(stderr, "Program failure: %s in file %s line %d\n", s, f, l); exit(1); --- simias-1.4.6128.1/tools/gsoap/linux-2.7/src/error2.h.xx 2006-05-18 16:07:25.000000000 +0200 +++ simias-1.4.6128.1/tools/gsoap/linux-2.7/src/error2.h 2006-05-18 16:08:51.000000000 +0200 @@ -44,17 +44,17 @@ extern char errbuf[]; #ifdef WIN32 -extern soapcpp2error(char*); +extern void soapcpp2error(char*); #else -extern yyerror(char*); +extern void yyerror(char*); #endif -extern lexerror(const char*); -extern synerror(const char *); -extern semerror(const char *); -extern semwarn(const char *); -extern compliancewarn(const char *); -extern typerror(const char*); -extern execerror(const char*); -extern progerror(const char*, const char*, int); -extern errstat(); +extern void lexerror(const char*); +extern void synerror(const char *); +extern void semerror(const char *); +extern void semwarn(const char *); +extern void compliancewarn(const char *); +extern void typerror(const char*); +extern void execerror(const char*); +extern void progerror(const char*, const char*, int); +extern int errstat(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit icecream
by root＠suse.de 20 May '06

20 May '06

Hello community, here is the log from the commit of package icecream checked in at Sun May 21 01:57:02 CEST 2006. -------- --- KDE/icecream/icecream.changes 2006-03-03 15:05:15.000000000 +0100 +++ icecream/icecream.changes 2006-05-19 17:41:45.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 19 17:41:00 CEST 2006 - coolo(a)suse.de + +- update from SVN to adapt to the new location +- some fixes for catching out of memory situations better +- package man pages + +------------------------------------------------------------------- Old: ---- icecream-0.6.3.tar.bz2 make-log-writeable.diff New: ---- icecream-0.6.4.tar.bz2 icecream-manpages.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecream-monitor.spec ++++++ --- /var/tmp/diff_new_pack.UwuCVu/_old 2006-05-21 01:56:52.000000000 +0200 +++ /var/tmp/diff_new_pack.UwuCVu/_new 2006-05-21 01:56:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package icecream-monitor (Version 0.6.3) +# spec file for package icecream-monitor (Version 0.6.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ License: GPL Group: Development/Tools/Building Summary: Monitor Program for the icecream Compile Farm -Version: 0.6.3 -Release: 5 +Version: 0.6.4 +Release: 1 Source0: icecream-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ icecream.spec ++++++ --- /var/tmp/diff_new_pack.UwuCVu/_old 2006-05-21 01:56:52.000000000 +0200 +++ /var/tmp/diff_new_pack.UwuCVu/_new 2006-05-21 01:56:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package icecream (Version 0.6.3) +# spec file for package icecream (Version 0.6.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,12 +20,11 @@ PreReq: %fillup_prereq Prereq: /usr/sbin/useradd /usr/sbin/groupadd Requires: gcc-c++ -Version: 0.6.3 -Release: 5 +Version: 0.6.4 +Release: 1 Source0: ftp://ftp.suse.com/pub/projects/icecream/%name-%{version}.tar.bz2 +Source1: %name-manpages.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch: make-log-writeable.diff -# don't use icecc to avoid bootstrap problems %description icecream is the next generation distcc. @@ -41,8 +40,7 @@ Frerich Raabe <raabe(a)kde.org> %prep -%setup -q -n %name -%patch +%setup -q -n %name -a 1 rm -r mon %build @@ -70,6 +68,10 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 suse/sysconfig.icecream $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.icecream mkdir -p $RPM_BUILD_ROOT/var/cache/icecream +mkdir -p $RPM_BUILD_ROOT%_mandir/man{1,7} +for i in mans/*.1 mans/*.7; do + install -m 644 $i $RPM_BUILD_ROOT%_mandir/man`echo $i | sed -e 's,.*$.$$,\1,'`/`basename $i` +done %preun %stop_on_removal icecream @@ -99,11 +101,16 @@ %_sbindir/iceccd %_sbindir/rcicecream +%_mandir/man*/* /opt/icecream /var/adm/fillup-templates/sysconfig.icecream %attr(-,icecream,icecream) /var/cache/icecream %changelog -n icecream +* Fri May 19 2006 - coolo(a)suse.de +- update from SVN to adapt to the new location +- some fixes for catching out of memory situations better +- package man pages * Fri Mar 03 2006 - stbinner(a)suse.de - make sure that log file exists and is writeable by icecream user (#141534) ++++++ icecream-0.6.3.tar.bz2 -> icecream-0.6.4.tar.bz2 ++++++ ++++ 1751 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/COPYING new/icecream/COPYING --- old/icecream/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/icecream/COPYING 2006-05-02 00:32:00.000000000 +0200 @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/Makefile.cvs new/icecream/Makefile.cvs --- old/icecream/Makefile.cvs 2005-09-19 23:41:00.000000000 +0200 +++ new/icecream/Makefile.cvs 2006-03-17 15:00:03.000000000 +0100 @@ -1,15 +1,15 @@ all: - if test -d ../../admin; then \ - rm -rf admin ;\ - cp -pRL ../../admin . ;\ + @echo "This Makefile is only for the SVN repository" + @echo "" + @if test ! -d admin; then \ + echo "Please recheckout this module!" ;\ + echo "for cvs: use checkout once and after that update again" ;\ + echo "for cvsup: checkout kde-common from cvsup and" ;\ + echo " link kde-common/admin to ./admin" ;\ + exit 1 ;\ fi - - if ! test -d admin; then \ - echo "Need admin in ." ;\ - exit ;\ - fi - - rm -f configure.in.in - ln -s configure.in.cvs configure.in.in $(MAKE) -f admin/Makefile.common cvs + +.SILENT: +.PHONY: all diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/README new/icecream/README --- old/icecream/README 2004-08-11 20:48:35.000000000 +0200 +++ new/icecream/README 2006-03-17 15:19:47.000000000 +0100 @@ -1,3 +1,8 @@ +NOTE: Although icecream will compile on some non-Linux systems, +it depends critically on Linux' /proc/ structures and will fail +at runtime until somebody figures out how to emulate the "ticks" +form of process accounting in there. + How to install icecream ======================= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/admin/acinclude.m4.in new/icecream/admin/acinclude.m4.in --- old/icecream/admin/acinclude.m4.in 2005-12-19 13:04:12.000000000 +0100 +++ new/icecream/admin/acinclude.m4.in 2006-04-05 23:58:30.000000000 +0200 @@ -784,7 +784,7 @@ # CoreAudio framework AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) - FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio" + FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" ]) AC_CHECK_RES_INIT @@ -3015,6 +3015,35 @@ ]) + +AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH], +[ + AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline], + kde_cv_opt_noinline_match, + [ + kde_cv_opt_noinline_match=irrelevant + dnl if we don't use both -O2 and -fno-inline, this check is moot + if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ + && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then + + ac_cflags_save="$CFLAGS" + CFLAGS="$CFLAGS -D_USE_GNU" + + AC_TRY_LINK([ + #include <string.h> +], [ const char *pt, *et; + et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ; +], + kde_cv_opt_noinline_match=yes, + kde_cv_opt_noinline_match=no + ) + + CFLAGS="$ac_cflags_save" + fi + ]) +]) + + dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given AC_DEFUN([AC_VALIDIFY_CXXFLAGS], [dnl @@ -3099,7 +3128,7 @@ if test $kde_use_debug_code = "full"; then CFLAGS="-g3 -fno-inline $CFLAGS" else - CFLAGS="-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline $CFLAGS" + CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS" fi else CFLAGS="-O2 $CFLAGS" @@ -3134,7 +3163,7 @@ if test "$kde_use_debug_code" = "full"; then CXXFLAGS="-g3 -fno-inline $CXXFLAGS" else - CXXFLAGS="-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline $CXXFLAGS" + CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS" fi fi KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) @@ -3194,6 +3223,14 @@ AC_SUBST([HAVE_GCC_VISIBILITY]) if test "$GXX" = "yes"; then + gcc_no_reorder_blocks=NO + KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES]) + if test $kde_use_debug_code != "no" && \ + test $kde_use_debug_code != "full" && \ + test "YES" = "$gcc_no_reorder_blocks" ; then + CXXFLAGS="$CXXFLAGS -fno-reorder-blocks" + CFLAGS="$CFLAGS -fno-reorder-blocks" + fi KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) @@ -3222,6 +3259,11 @@ fi rm -f conftest.h conftest.h.gch fi + + KDE_CHECK_FOR_OPT_NOINLINE_MATCH + if test "x$kde_cv_opt_noinline_match" = "xno" ; then + CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" + fi fi AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") if test "$CXX" = "KCC"; then @@ -3459,15 +3501,29 @@ [ kdelibsuff="$kde_libs_suffix" if test -z "$kdelibsuff"; then - kdelibsuff=no + kdelibsuff="no" fi AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], - [/lib directory suffix (64,32,none[=default])]), + [/lib directory suffix (64,32,none,auto[=default])]), kdelibsuff=$enableval) - # TODO: add an auto case that compiles a little C app to check - # where the glibc is - if test "$kdelibsuff" = "no"; then + + if test "$kdelibsuff" = "auto"; then + +cat > conftest.c << EOF +#include <stdio.h> +int main() { + return 0; +} +EOF + kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + s,.*/lib$[[^\/]]*$/.*,\1, + p +}'` + rm -rf conftest.* + fi + + if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then kdelibsuff= fi if test -z "$kdelibsuff"; then @@ -4945,7 +5001,7 @@ ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` - kde_libs_suffix=`$KDECONFIG --libsuffix` + kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then @@ -5321,7 +5377,7 @@ JAVAC=$kde_java_bindir/javac JAVAH=$kde_java_bindir/javah JAR=$kde_java_bindir/jar - JVMLIBS="-Xlinker -framework -Xlinker JavaVM" + JVMLIBS="-Wl,-framework,JavaVM" AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_MSG_RESULT([Apple Java Framework]) @@ -5869,7 +5925,7 @@ PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH - PKG_CHECK_MODULES($1,$2,$3,$4) + PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) ]) @@ -5882,7 +5938,7 @@ AC_LANG_CPLUSPLUS safe_CXXFLAGS=$CXXFLAGS safe_LDFLAGS=$LDFLAGS - CXXFLAGS="$CXXFLAGS -fpie" + CXXFLAGS="$CXXFLAGS -fPIE" LDFLAGS="$LDFLAGS -pie" AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) @@ -5892,7 +5948,7 @@ AC_LANG_RESTORE ]) - AC_MSG_CHECKING(if enabling -pie/fpie support) + AC_MSG_CHECKING(if enabling -pie/fPIE support) AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), @@ -5912,7 +5968,7 @@ AC_SUBST([KDE_USE_PIE]) if test "$kde_has_pie_support" = "yes"; then - KDE_USE_FPIE="-fpie" + KDE_USE_FPIE="-fPIE" KDE_USE_PIE="-pie" fi ]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/admin/cvs.sh new/icecream/admin/cvs.sh --- old/icecream/admin/cvs.sh 2005-11-15 10:32:43.000000000 +0100 +++ new/icecream/admin/cvs.sh 2006-03-17 22:30:20.000000000 +0100 @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.0\"" + VERSION="\"3.5.2\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/admin/doxygen.sh new/icecream/admin/doxygen.sh --- old/icecream/admin/doxygen.sh 2005-08-26 00:17:55.000000000 +0200 +++ new/icecream/admin/doxygen.sh 2006-02-14 00:37:42.000000000 +0100 @@ -63,15 +63,18 @@ echo "Usage: doxygen.sh <top_srcdir>" exit 1 fi -if ! test -d "$top_srcdir" ; then +if test ! -d "$top_srcdir" ; then echo "top_srcdir ($top_srcdir) is not a directory." exit 1 fi ### Normalize top_srcdir so it is an absolute path. -if ! expr "x$top_srcdir" : "x/" > /dev/null ; then +if expr "x$top_srcdir" : "x/" > /dev/null ; then + # top_srcdir is absolute already + : +else top_srcdir=`cd "$top_srcdir" 2> /dev/null && pwd` - if ! test -d "$top_srcdir" ; then + if test ! -d "$top_srcdir" ; then echo "top_srcdir ($top_srcdir) is not a directory." exit 1 fi @@ -95,7 +98,7 @@ done fi fi -if test -z "$QTDOCDIR" || test \! -d "$QTDOCDIR" ; then +if test -z "$QTDOCDIR" || test ! -d "$QTDOCDIR" ; then if test -z "$QTDOCDIR" ; then echo "* QTDOCDIR could not be guessed." else @@ -137,7 +140,7 @@ DOXDATA="$top_srcdir/doc/common" fi -if ! test -d "$DOXDATA" ; then +if test ! -d "$DOXDATA" ; then echo "* \$DOXDATA does not name a directory ( or is unset ), tried \"$DOXDATA\"" exit 1 fi @@ -155,7 +158,7 @@ { eval `grep 'VERSION="' "$top_srcdir/admin/cvs.sh"` echo "PROJECT_NUMBER = $VERSION" > Doxyfile.in - grep ^KDE_INIT_DOXYGEN "$top_srcdir/configure.in.in" | \ + grep '^KDE_INIT_DOXYGEN' "$top_srcdir/configure.in.in" | \ sed -e 's+[^[]*\[$[^]]*$+PROJECT_NAME = "\1"+' \ -e 's+].*++' >> Doxyfile.in } @@ -167,13 +170,13 @@ ### for the apidox and initialize it. Otherwise, just use the ### structure assumed to be there. if test -z "$subdir" ; then - if ! test -d "$apidoxdir" ; then + if test ! -d "$apidoxdir" ; then mkdir "$apidoxdir" > /dev/null 2>&1 fi - if ! cd "$apidoxdir" > /dev/null 2>&1 ; then + cd "$apidoxdir" > /dev/null 2>&1 || { echo "Cannot create and cd into $apidoxdir" exit 1 - fi + } test -f "Doxyfile.in" || create_doxyfile_in @@ -192,15 +195,15 @@ srcdir="$1" subdir="." else - if ! cd "$apidoxdir" > /dev/null 2>&1 ; then + cd "$apidoxdir" > /dev/null 2>&1 || { echo "Cannot cd into $apidoxdir -- maybe you need to" echo "build the top-level dox first." exit 1 - fi + } if test "x1" = "x$recurse" ; then # OK, so --recurse was requested - if ! test -f "subdirs.top" ; then + if test ! -f "subdirs.top" ; then echo "* No subdirs.top available in the $apidoxdir." echo "* The --recurse option will be ignored." recurse=0 @@ -389,7 +392,10 @@ test -f "$subdir/classmap.inc" && \ CMENU=`grep '=>' "$subdir/classmap.inc" | sed -e 's+"$[^"]*$" => "'"$subdir/html/"'$[^"]*$"+<option value="\2">\1<\/option>+' | tr -d '\n'` - if ! test -f "$subdir/classmap.inc" || ! grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then + if test -f "$subdir/classmap.inc" && grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then + # Keep the menu, it's useful + : + else CMENUBEGIN="" fi @@ -467,7 +473,7 @@ doxygen Doxyfile - ( cd "$top_srcdir" && grep -l ^include.*Doxyfile.am `find . -name Makefile.am` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in + ( cd "$top_srcdir" && grep -l '^include.*Doxyfile.am' `find . -name Makefile.am` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in for i in `cat subdirs.in` do test "x." = "x$i" && continue; @@ -500,7 +506,7 @@ echo "*** Creating apidox in $subdir" echo "*" rm -f "$subdir/Doxyfile" - if ! test -d "$top_srcdir/$subdir" ; then + if test ! -d "$top_srcdir/$subdir" ; then echo "* No source (sub)directory $subdir" return fi @@ -623,7 +629,12 @@ apidox_local - if ! grep '^DOXYGEN_EMPTY' "$srcdir/Makefile.am" > /dev/null 2>&1 ; then + if grep '^DOXYGEN_EMPTY' "$srcdir/Makefile.am" > /dev/null 2>&1 ; then + # This directory is empty, so don't process it, but + # *do* handle subdirs that might have dox. + : + else + # Regular processing doxygen "$subdir/Doxyfile" doxyndex fi @@ -636,7 +647,7 @@ srcdir="$top_srcdir/$subdir" subdirname=`basename "$subdir"` mkdir -p "$subdir" 2> /dev/null - if ! test -d "$subdir" ; then + if test ! -d "$subdir" ; then echo "Can't create dox subdirectory $subdir" return fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/admin/missing new/icecream/admin/missing --- old/icecream/admin/missing 2005-07-06 23:21:25.000000000 +0200 +++ new/icecream/admin/missing 2006-02-27 10:56:01.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2004-09-07.08 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,12 +87,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to <bug-automake(a)gnu.org>." - exit $? + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit $? + exit 0 ;; -*) @@ -288,18 +288,11 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 + file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` + fi touch $file ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/client/arg.cpp new/icecream/client/arg.cpp --- old/icecream/client/arg.cpp 2005-01-25 15:33:28.000000000 +0100 +++ new/icecream/client/arg.cpp 2006-03-17 15:24:29.000000000 +0100 @@ -86,7 +86,7 @@ if (!strcmp(a, "-E")) { always_local = true; args.append(a, Arg_Local); - } else if (!strcmp(a, "-MD") || !strcmp(a, "-MMD")) { + } else if (!strcmp(a, "-MD") || !strcmp(a, "-MMD") || !strncmp(a, "-fdump", 6)) { args.append(a, Arg_Local); /* These two generate dependencies as a side effect. They * should work with the way we call cpp. */ @@ -158,7 +158,8 @@ } else if (str_startswith("-o", a)) { if (!strcmp(a, "-o")) { /* Whatever follows must be the output */ - ofile = argv[++i]; + if ( argv[i+1] ) + ofile = argv[++i]; } else { a += 2; ofile = a; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/configure.in.cvs new/icecream/configure.in.cvs --- old/icecream/configure.in.cvs 2004-10-10 13:02:31.000000000 +0200 +++ new/icecream/configure.in.cvs 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -# quite some macros are taken from distcc - -AC_PREREQ(2.53) - -AC_INIT(client/main.cpp) - -dnl This is so we can use kde-common -AC_CONFIG_AUX_DIR(admin) - -AM_INIT_AUTOMAKE(icecream, "0.1") -AM_CONFIG_HEADER(config.h) -AC_CANONICAL_HOST - -dnl Checks for programs -CFLAGS=-g -CXXFLAGS=-g -AC_PROG_CC -AC_PROG_CXX -if test "$GCC" = yes -then - CFLAGS="-W -Wall -Wimplicit \ --Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings \ --Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \ --Wnested-externs $CFLAGS" - CXXFLAGS="-W -Wall -Wimplicit -Wpointer-arith -Wcast-align -Wwrite-strings $CXXFLAGS" - AC_MSG_NOTICE([Adding gcc options: $CFLAGS]) -fi - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -AC_C_INLINE -AC_ENABLE_STATIC([no]) -AC_PROG_LIBTOOL - -######################################################################## -### Checks for header files - -# Some of these are needed by popt (or other libraries included in the future). - -AC_CHECK_HEADERS([unistd.h stdint.h sys/types.h sys/sendfile.h sys/signal.h ifaddrs.h]) -AC_CHECK_HEADERS([ctype.h sys/resource.h sys/socket.h sys/select.h]) -AC_CHECK_HEADERS([netinet/in.h], [], [], -[#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -]) -AC_CHECK_HEADERS([arpa/nameser.h], [], [], -[#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -]) -AC_CHECK_HEADERS([resolv.h], [], [], -[#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#if HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#if HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -]) - -AC_CHECK_HEADERS([float.h mcheck.h alloca.h sys/mman.h]) - -###################################################################### -dnl Checks for types - -AC_CHECK_TYPES([sa_family_t, socklen_t, in_port_t, in_addr_t], , , - [ -#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#if HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#if HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#if HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -]) - - - -######################################################################## -### Checks for libraries. - -# The following test taken from the cvs sources via Samba: -# If we can't find connect, try looking in -lsocket, -lnsl, and -linet. -# The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has -# libsocket.so which has a bad implementation of gethostbyname (it -# only looks in /etc/hosts), so we only look for -lsocket if we need -# it. -AC_CHECK_FUNCS(connect) -if test x"$ac_cv_func_connect" = x"no"; then - case "$LIBS" in - *-lnsl*) ;; - *) AC_CHECK_LIB(nsl_s, printf) ;; - esac - case "$LIBS" in - *-lnsl*) ;; - *) AC_CHECK_LIB(nsl, printf) ;; - esac - case "$LIBS" in - *-lsocket*) ;; - *) AC_CHECK_LIB(socket, connect) ;; - esac - case "$LIBS" in - *-linet*) ;; - *) AC_CHECK_LIB(inet, connect) ;; - esac - dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value - dnl has been cached. - if test x"$ac_cv_lib_socket_connect" = x"yes" || - test x"$ac_cv_lib_inet_connect" = x"yes"; then - # ac_cv_func_connect=yes - # don't! it would cause AC_CHECK_FUNC to succeed next time configure is run - AC_DEFINE(HAVE_CONNECT,1,[Whether the system has connect()]) - fi -fi - -AC_CHECK_LIB(resolv, hstrerror, , , [-lnsl -lsocket]) -AC_CHECK_LIB(resolv, inet_aton, , , [-lnsl -lsocket]) - -AC_CHECK_FUNCS([sendfile setsid flock lockf hstrerror strerror setuid setreuid]) -AC_CHECK_FUNCS([getuid geteuid mcheck wait4 wait3 waitpid setgroups getcwd]) -AC_CHECK_FUNCS([snprintf vsnprintf vasprintf asprintf getcwd getwd]) -AC_CHECK_FUNCS([getrusage strsignal gettimeofday]) -AC_CHECK_FUNCS([getaddrinfo getnameinfo inet_ntop inet_ntoa]) -AC_CHECK_FUNCS([strndup mmap strlcpy]) - -AC_CHECK_DECLS([snprintf, vsnprintf, vasprintf, asprintf, strndup]) - -dnl === LZO -dnl Checks for typedefs and structures -AC_CHECK_TYPE(ptrdiff_t,long) -AC_TYPE_SIZE_T -AC_CHECK_SIZEOF(unsigned short) -AC_CHECK_SIZEOF(unsigned) -AC_CHECK_SIZEOF(unsigned long) -AC_CHECK_SIZEOF(char *) -AC_CHECK_SIZEOF(ptrdiff_t) -AC_CHECK_SIZEOF(size_t) - -dnl Checks for compiler characteristics -dnl AC_C_CONST - -dnl Checks for library functions -AC_CHECK_FUNCS(memcmp memcpy memmove memset) -dnl === END LZO - -UIC_NOT_NEEDED=1 -KDE_CHECK_FINAL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/configure.in.in new/icecream/configure.in.in --- old/icecream/configure.in.in 1970-01-01 01:00:00.000000000 +0100 +++ new/icecream/configure.in.in 2006-03-17 15:00:03.000000000 +0100 @@ -0,0 +1,155 @@ +# quite some macros are taken from distcc + +AC_PREREQ(2.53) + +AC_INIT(client/main.cpp) + +dnl This is so we can use kde-common +AC_CONFIG_AUX_DIR(admin) + +AM_INIT_AUTOMAKE(icecream, "0.1") +AM_CONFIG_HEADER(config.h) +AC_CANONICAL_HOST + +dnl Checks for programs +CFLAGS=-g +CXXFLAGS=-g +AC_PROG_CC +AC_PROG_CXX +if test "$GCC" = yes +then + CFLAGS="-W -Wall -Wimplicit \ +-Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings \ +-Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \ +-Wnested-externs $CFLAGS" + CXXFLAGS="-W -Wall -Wimplicit -Wpointer-arith -Wcast-align -Wwrite-strings $CXXFLAGS" + AC_MSG_NOTICE([Adding gcc options: $CFLAGS]) +fi + +AC_PROG_MAKE_SET +AC_PROG_INSTALL +AC_C_INLINE +AC_ENABLE_STATIC([no]) +AC_PROG_LIBTOOL + +######################################################################## +### Checks for header files + +# Some of these are needed by popt (or other libraries included in the future). + +AC_CHECK_HEADERS([unistd.h stdint.h sys/types.h sys/sendfile.h sys/signal.h ifaddrs.h]) +AC_CHECK_HEADERS([ctype.h sys/resource.h sys/socket.h sys/select.h]) +AC_CHECK_HEADERS([netinet/in.h], [], [], +[#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +]) +AC_CHECK_HEADERS([arpa/nameser.h], [], [], +[#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +]) +AC_CHECK_HEADERS([resolv.h], [], [], +[#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#if HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#if HAVE_ARPA_NAMESER_H +# include <arpa/nameser.h> +#endif +]) + +AC_CHECK_HEADERS([float.h mcheck.h alloca.h sys/mman.h]) + +###################################################################### +dnl Checks for types + +AC_CHECK_TYPES([sa_family_t, socklen_t, in_port_t, in_addr_t], , , + [ +#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#if HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif +#if HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#if HAVE_ARPA_NAMESER_H +# include <arpa/nameser.h> +#endif +]) + + + +######################################################################## +### Checks for libraries. + +# The following test taken from the cvs sources via Samba: +# If we can't find connect, try looking in -lsocket, -lnsl, and -linet. +# The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has +# libsocket.so which has a bad implementation of gethostbyname (it +# only looks in /etc/hosts), so we only look for -lsocket if we need +# it. +AC_CHECK_FUNCS(connect) +if test x"$ac_cv_func_connect" = x"no"; then + case "$LIBS" in + *-lnsl*) ;; + *) AC_CHECK_LIB(nsl_s, printf) ;; + esac + case "$LIBS" in + *-lnsl*) ;; + *) AC_CHECK_LIB(nsl, printf) ;; + esac + case "$LIBS" in + *-lsocket*) ;; + *) AC_CHECK_LIB(socket, connect) ;; + esac + case "$LIBS" in + *-linet*) ;; + *) AC_CHECK_LIB(inet, connect) ;; + esac + dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value + dnl has been cached. + if test x"$ac_cv_lib_socket_connect" = x"yes" || + test x"$ac_cv_lib_inet_connect" = x"yes"; then + # ac_cv_func_connect=yes + # don't! it would cause AC_CHECK_FUNC to succeed next time configure is run + AC_DEFINE(HAVE_CONNECT,1,[Whether the system has connect()]) + fi +fi + +AC_CHECK_LIB(resolv, hstrerror, , , [-lnsl -lsocket]) +AC_CHECK_LIB(resolv, inet_aton, , , [-lnsl -lsocket]) + +AC_CHECK_FUNCS([sendfile setsid flock lockf hstrerror strerror setuid setreuid]) +AC_CHECK_FUNCS([getuid geteuid mcheck wait4 wait3 waitpid setgroups getcwd]) +AC_CHECK_FUNCS([snprintf vsnprintf vasprintf asprintf getcwd getwd]) +AC_CHECK_FUNCS([getrusage strsignal gettimeofday]) +AC_CHECK_FUNCS([getaddrinfo getnameinfo inet_ntop inet_ntoa]) +AC_CHECK_FUNCS([strndup mmap strlcpy]) + +AC_CHECK_DECLS([snprintf, vsnprintf, vasprintf, asprintf, strndup]) + +dnl === LZO +dnl Checks for typedefs and structures +AC_CHECK_TYPE(ptrdiff_t,long) +AC_TYPE_SIZE_T +AC_CHECK_SIZEOF(unsigned short) +AC_CHECK_SIZEOF(unsigned) +AC_CHECK_SIZEOF(unsigned long) +AC_CHECK_SIZEOF(char *) +AC_CHECK_SIZEOF(ptrdiff_t) +AC_CHECK_SIZEOF(size_t) + +dnl Checks for compiler characteristics +dnl AC_C_CONST + +dnl Checks for library functions +AC_CHECK_FUNCS(memcmp memcpy memmove memset) +dnl === END LZO + +UIC_NOT_NEEDED=1 +KDE_CHECK_FINAL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/daemon/workit.cpp new/icecream/daemon/workit.cpp --- old/icecream/daemon/workit.cpp 2005-03-02 01:44:27.000000000 +0100 +++ new/icecream/daemon/workit.cpp 2006-01-26 14:56:30.000000000 +0100 @@ -308,7 +308,9 @@ if ( status ) { unsigned long int mem_used = ( ru.ru_minflt + ru.ru_majflt ) * getpagesize() / 1024; - if ( mem_used * 100 > 85 * mem_limit * 1024 ) { + if ( mem_used * 100 > 85 * mem_limit * 1024 || + str_err.find( "virtual memory exhausted: Cannot allocate memory" ) != string::npos ) + { // the relation between ulimit and memory used is pretty thin ;( return EXIT_OUT_OF_MEMORY; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/debian/changelog new/icecream/debian/changelog --- old/icecream/debian/changelog 2004-11-27 20:00:22.000000000 +0100 +++ new/icecream/debian/changelog 2006-04-29 20:46:47.000000000 +0200 @@ -1,3 +1,9 @@ +icecc (0.6.1-1) unstable; urgency=low + + * It still builds at the new location so just bump the version number. + + -- Andre Woebbeking <Woebbeking(a)web.de> Sat, 29 Apr 2006 20:36:15 +0200 + icecc (0.6-1) unstable; urgency=low * Initial Release. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/mon/hostlistview.cc new/icecream/mon/hostlistview.cc --- old/icecream/mon/hostlistview.cc 2004-11-24 13:13:27.000000000 +0100 +++ new/icecream/mon/hostlistview.cc 2006-02-27 12:03:10.000000000 +0100 @@ -183,6 +183,7 @@ this, SLOT( slotNodeActivated( QListViewItem* ) ) ); connect(this, SIGNAL( spacePressed( QListViewItem* ) ), this, SLOT( slotNodeActivated( QListViewItem* ) ) ); + connect( &mUpdateSortTimer, SIGNAL( timeout()), SLOT( updateSort())); } @@ -215,6 +216,7 @@ mItems[hostid] = new HostListViewItem( this, *info ); else ( *it )->updateText( *info ); + mUpdateSortTimer.start( 0, true ); } @@ -258,5 +260,10 @@ (*it)->setActiveNode( active ); } +void HostListView::updateSort() +{ + if( sortColumn() != 0 ) + sort(); +} #include "hostlistview.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/mon/hostlistview.h new/icecream/mon/hostlistview.h --- old/icecream/mon/hostlistview.h 2004-08-28 10:50:42.000000000 +0200 +++ new/icecream/mon/hostlistview.h 2006-02-27 12:03:10.000000000 +0100 @@ -25,6 +25,7 @@ #include "hostinfo.h" #include <klistview.h> +#include <qtimer.h> class HostListViewItem : public KListViewItem @@ -79,6 +80,8 @@ void slotNodeActivated( QListViewItem* item ); + void updateSort(); + private: void setActiveNode( unsigned int hostid, bool active ); @@ -89,6 +92,8 @@ typedef QMap<unsigned int, HostListViewItem*> ItemMap; ItemMap mItems; + + QTimer mUpdateSortTimer; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/mon/icemon.desktop new/icecream/mon/icemon.desktop --- old/icecream/mon/icemon.desktop 2006-01-01 12:19:41.000000000 +0100 +++ new/icecream/mon/icemon.desktop 2006-01-23 14:59:34.000000000 +0100 @@ -3,6 +3,7 @@ GenericName=Icecream Monitor GenericName[da]=Icecream overvåger GenericName[es]=Monitor de Icecream +GenericName[et]=Icecreami monitor GenericName[fr]=Surveillant Icecream GenericName[ga]=Monatóir Icecream GenericName[pt]=Monitor de Icecream @@ -14,6 +15,7 @@ Comment=A monitor for an Icecream compilation network Comment[da]=Overvågning af et Icecream-kompileringsnetværk Comment[es]=Un monitor para una red de compilación Icecream +Comment[et]=Icecreami kompileerimise võrgu monitor Comment[fr]=Un surveillant de réseau de compilation Icecream Comment[pt]=Um monitor para a rede de compilação Icecream Comment[pt_BR]=Um monitor para a rede de compilação Icecream diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/mon/icemonapplet.desktop new/icecream/mon/icemonapplet.desktop --- old/icecream/mon/icemonapplet.desktop 2006-01-01 12:19:41.000000000 +0100 +++ new/icecream/mon/icemonapplet.desktop 2006-01-23 14:59:34.000000000 +0100 @@ -3,6 +3,7 @@ Name=Icecream Monitor Name[da]=Icecream overvåger Name[es]=Monitor de Icecream +Name[et]=Icecreami monitor Name[fr]=Surveillant Icecream Name[ga]=Monatóir Icecream Name[pt]=Monitor de Icecream @@ -12,6 +13,7 @@ Comment=Monitor for an Icecream compilation network Comment[da]=Overvågning af Icecream-kompileringsnetværk Comment[es]=Monitor para una red de compilación Icecream +Comment[et]=Icecreami kompileerimise võrgu monitor Comment[fr]=Surveillance d'un réseau de compilation Icecream Comment[pt]=Monitor para a rede de compilação Icecream Comment[pt_BR]=Monitor para a rede de compilação Icecream diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/suse/icecream.spec new/icecream/suse/icecream.spec --- old/icecream/suse/icecream.spec 2005-10-13 11:13:42.000000000 +0200 +++ new/icecream/suse/icecream.spec 2006-05-19 18:12:22.000000000 +0200 @@ -1,30 +1,31 @@ # -# spec file for package icecream (Version 0.6) +# spec file for package icecream (Version 0.6.3) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# neededforbuild gcc-c++ libstdc++-devel +# don't use icecc to avoid bootstrap problems +# icecream 0 -BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libgcc libnscd libselinux libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel autoconf automake binutils gcc gcc-c++ gdbm gettext libstdc++-devel libtool perl rpm - -Name: icecream -License: GPL, LGPL -Group: Development/Tools/Building -Summary: For Distributed Compile in the Network -Requires: /bin/tar /usr/bin/bzip2 -PreReq: %fillup_prereq -Prereq: /usr/sbin/useradd /usr/sbin/groupadd -Requires: gcc-c++ -Version: 0.6.1 -Release: 1 -Source0: ftp://ftp.suse.com/pub/projects/icecream/%name-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Name: icecream +BuildRequires: gcc-c++ +License: GPL, LGPL +Group: Development/Tools/Building +Summary: For Distributed Compile in the Network +Requires: /bin/tar /usr/bin/bzip2 +PreReq: %fillup_prereq +Prereq: /usr/sbin/useradd /usr/sbin/groupadd +Requires: gcc-c++ +Version: 0.6.4 +Release: 5 +Source0: ftp://ftp.suse.com/pub/projects/icecream/%name-%{version}.tar.bz2 +Source1: %name-manpages.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description icecream is the next generation distcc. @@ -40,7 +41,8 @@ Frerich Raabe <raabe(a)kde.org> %prep -%setup -q -n %name +%setup -q -n %name -a 1 +rm -r mon %build export CFLAGS="$RPM_OPT_FLAGS" @@ -55,10 +57,10 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT KDEDIR=/opt/kde3 install mkdir -p $RPM_BUILD_ROOT/opt/icecream/bin -ln -s /usr/bin/icecc $RPM_BUILD_ROOT/opt/icecream/bin/g++ -ln -s /usr/bin/icecc $RPM_BUILD_ROOT/opt/icecream/bin/gcc -ln -s /usr/bin/icecc $RPM_BUILD_ROOT/opt/icecream/bin/cc -ln -s /usr/bin/icecc $RPM_BUILD_ROOT/opt/icecream/bin/c++ +for i in g++ gcc cc c++; do + ln -s /usr/bin/icecc $RPM_BUILD_ROOT/opt/icecream/bin/$i + rm -f $RPM_BUILD_ROOT/usr/bin/$i +done # # Install icecream init script mkdir -p $RPM_BUILD_ROOT/etc/init.d/ @@ -67,6 +69,10 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 suse/sysconfig.icecream $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.icecream mkdir -p $RPM_BUILD_ROOT/var/cache/icecream +mkdir -p $RPM_BUILD_ROOT%_mandir/man{1,7} +for i in mans/*.1 mans/*.7; do + install -m 644 $i $RPM_BUILD_ROOT%_mandir/man`echo $i | sed -e 's,.*$.$$,\1,'`/`basename $i` +done %preun %stop_on_removal icecream @@ -93,116 +99,9 @@ %_bindir/create-env %_sbindir/iceccd %_sbindir/rcicecream +%_mandir/man*/* /opt/icecream /var/adm/fillup-templates/sysconfig.icecream %attr(-,icecream,icecream) /var/cache/icecream %changelog -n icecream -* Fri Sep 02 2005 - schwab(a)suse.de -- Require gcc-c++. -* Wed Apr 13 2005 - coolo(a)suse.de -- some changes to the daemon to keep the cache size below 100MB -* Wed Apr 13 2005 - coolo(a)suse.de -- update tarball -* Mon Feb 21 2005 - schwab(a)suse.de -- create-env: try to find generic versions of libraries. Remove - LD_ASSUME_KERNEL hack. -* Sat Feb 05 2005 - schwab(a)suse.de -- Don't set LD_ASSUME_KERNEL in BETA. -* Fri Jan 21 2005 - coolo(a)suse.de -- some fixes from CVS -* Mon Jan 17 2005 - schwab(a)suse.de -- create-env: Add specs only if it exists as file. -* Wed Nov 17 2004 - coolo(a)suse.de -- fixing dead loop -* Sun Nov 14 2004 - schwab(a)suse.de -- Don't use icecc during build. -* Tue Nov 02 2004 - coolo(a)suse.de -- ignore duplicated platforms to avoid confusion between native - compiler and cross compiler -* Wed Oct 13 2004 - coolo(a)suse.de -- several improvements in the communication layer -- the daemon kills compiler jobs when the client exists before - awaiting the result (gcc4 feature :) -* Tue Sep 28 2004 - od(a)suse.de -- in create-env, use LD_ASSUME_KERNEL=2.4.21 on ppc64 -* Fri Sep 10 2004 - schwab(a)suse.de -- Workaround cfg bug in gcc. -* Mon Sep 06 2004 - coolo(a)suse.de -- handle being called without _any_ environment variables correctly - (blender's use of scons) -* Mon Sep 06 2004 - coolo(a)suse.de -- correctly calculating output filename for -S jobs (grub's configure) -* Sun Sep 05 2004 - coolo(a)suse.de -- several improvements in the network code to make things more - robust on general network slowness -- speed up configure runs -* Tue Aug 31 2004 - coolo(a)suse.de -- do calculate the load a bit more fair for those machines that got - other niced jobs -- add time information to the log output -- track a bit more carefully the child pids -* Mon Aug 30 2004 - coolo(a)suse.de -- do not crash when the network goes down (again) -- some cleanup -* Sun Aug 29 2004 - coolo(a)suse.de -- finding quite some scheduler troubles while watching a network - with half the computers using WLAN (KDE conference) -- run everything the daemon does with client data as specific user -- changed the spec file to create that user and move the cache - dir to /var/cache/icecream -- more options for the sysconfig -* Wed Aug 18 2004 - coolo(a)suse.de -- avoid crashes when the connection between client and daemon - goes down (as happend at night) -* Tue Aug 17 2004 - coolo(a)suse.de -- fix handling of unknown paramters (failed/gsl) -* Sun Aug 15 2004 - coolo(a)suse.de -- bugfixes and more flag statistics -* Thu Aug 12 2004 - coolo(a)suse.de -- transfer debug and optimization flags to the scheduler for better - speed calculation -* Thu Aug 12 2004 - coolo(a)suse.de -- fixing ugly regression in the daemon. Increased protocol version - to avoid problems with these old daemons -* Wed Aug 11 2004 - coolo(a)suse.de -- Fixing grave performance problem and several scheduler crashes -* Wed Aug 04 2004 - coolo(a)suse.de -- update for new automake, let the daemon set a ulimit for memory usage -* Fri Jul 30 2004 - coolo(a)suse.de -- don't stress the scheduler while compiling jobs three times -- also use icecream for .c files -- fix for the init script -* Tue Jun 29 2004 - coolo(a)suse.de -- fixing bugs reported by prague office and ro -* Fri Jun 11 2004 - coolo(a)suse.de -- major update (including fix for gcc build) -* Tue May 11 2004 - coolo(a)suse.de -- really fixing build with several input files -* Tue May 04 2004 - coolo(a)suse.de -- fix build with several input files (ltp package) -* Mon May 03 2004 - coolo(a)suse.de -- support cross compiling -* Wed Apr 28 2004 - coolo(a)suse.de -- support multiple architectures in the scheduler -* Mon Apr 26 2004 - coolo(a)suse.de -- filter out more errors as info message trying to get binutils's - testsuite to work -* Sun Apr 25 2004 - coolo(a)suse.de -- adding -frandom-seed to the compilation for the jobs that compile - thee times on several hosts -* Fri Apr 23 2004 - coolo(a)suse.de -- fixing grave bug in the setup of the protocol version which caused - lookups -* Thu Apr 22 2004 - coolo(a)suse.de -- several fixes in the transport layer and the client now compiles - every 5th job three times to test the farm -* Sat Apr 17 2004 - coolo(a)suse.de -- splitting monitor into an extra source to simplify build - requirements for the client -* Fri Apr 16 2004 - coolo(a)suse.de -- new protocol version for fancier monitors -* Fri Apr 16 2004 - coolo(a)suse.de -- new version with revised monitor and new init script name -* Tue Apr 13 2004 - coolo(a)suse.de -- initial package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/suse/init.icecream new/icecream/suse/init.icecream --- old/icecream/suse/init.icecream 2004-12-23 17:38:30.000000000 +0100 +++ new/icecream/suse/init.icecream 2006-05-19 17:38:24.000000000 +0200 @@ -46,7 +46,12 @@ fi logfile="" if test -n "$ICECREAM_LOG_FILE"; then + touch $ICECREAM_LOG_FILE + chown icecream:icecream $ICECREAM_LOG_FILE logfile="-l $ICECREAM_LOG_FILE" + else + touch /var/log/iceccd + chown icecream:icecream /var/log/iceccd fi nice= if test -n "$ICECREAM_NICE_LEVEL"; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/icecream/suse/update_rpm new/icecream/suse/update_rpm --- old/icecream/suse/update_rpm 1970-01-01 01:00:00.000000000 +0100 +++ new/icecream/suse/update_rpm 2006-05-19 17:58:01.000000000 +0200 @@ -0,0 +1,23 @@ +#! /bin/sh + +export PATH=/opt/kde3/bin:$PATH +opwd=$PWD +tdir=`mktemp -d` +cd $tdir || exit 1 +svn export svn+ssh://svn.kde.org/home/kde/trunk/icecream +rm suse/update_rpm +version=`grep ^Version: icecream/suse/icecream.spec | cut -d: -f2- | sed -e "s, *,,"` +tar -cvj -f $opwd/icecream-$version.tar.bz2 icecream +cp icecream/suse/icecream.spec $opwd/ +mkdir mans +omans=$PWD/mans +cd icecream/doc +for i in *.docbook; do + output=${i/man-/} + output=${output/.docbook/} + meinproc --stylesheet /opt/kde3/share/apps/ksgmltools2/customization/kde-man.xsl $i && mv manpage.troff $omans/$output +done +cd ../.. +tar cvjf $opwd/icecream-manpages.tar.bz2 mans +cd / +rm -rf $tdir ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit heartbeat
by root＠suse.de 20 May '06

20 May '06

Hello community, here is the log from the commit of package heartbeat checked in at Sun May 21 01:56:37 CEST 2006. -------- --- heartbeat/heartbeat.changes 2006-05-08 17:52:35.000000000 +0200 +++ heartbeat/heartbeat.changes 2006-05-20 13:33:47.000000000 +0200 @@ -1,0 +2,45 @@ +Sat May 20 13:33:40 CEST 2006 - lmb(a)suse.de + +- Fix compilation on s390. + +------------------------------------------------------------------- +Fri May 19 19:44:29 CEST 2006 - lmb(a)suse.de + +- GUI enhancements: + - Icons updated and new ones added. + - Resources now default to "stopped". + - Allow GUI to configure resource_failure_stickiness. + - Various useability fixes (among them OSDL #1221). +- CIM provider: Don't overwrite directives it doesn't know (#170877) +- LRM: + - Overflow fixes (OSDL #1222). + - Be more tolerant for LSB script format. + - Enhance heartbeat resource class (#1229). +- CRM: + - Fixes to DTD and DTD validation, prevented some coded features to be + activated. + - Useage/help texts/log messages updated in various places. + - attrd: Make sure new value is always written to CIB. + - Support target_role for groups (instead of crashing) (OSDL #1248). + - Fix handling of defaults for target_role. + - Clones now default to one instance per node. + - Fix CIB update handling for replace (#174049, OSDL #1247). + - Probe newly added resources too (OSDL #1252). + - Avoid some unnecessary resource restarts. + - Fix attribute value inheritance (OSDL #1253). + - pingd: Fix retry handling when connecting to CIB (#176014). + - crm_resource: Allow deletion to be forced when cluster doesn't have + quorum. +- heartbeat core: + - Fix sending of compressed/binary fields over serial links. +- Resource Agents: + - OCFS2 integration fixed and merged with upstream (#174908, #175986). + - LVSSyncDaemon fixes to work with recent sed (OSDL #1249). + - STONITH: Provide correct metadata. + - apache: Fix metadata operation (OSDL #1254), monitor operation, and + enhance helptexts. +- Start heartbeat after Xen is finished with its networking changes + (#177134). +- Small Coverity fixes. + +------------------------------------------------------------------- Old: ---- heartbeat-Filesystem-ocfs2.diff heartbeat-post-2.0.5.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ heartbeat.spec ++++++ --- /var/tmp/diff_new_pack.IyJCHe/_old 2006-05-21 01:54:01.000000000 +0200 +++ /var/tmp/diff_new_pack.IyJCHe/_new 2006-05-21 01:54:01.000000000 +0200 @@ -19,7 +19,7 @@ %define sanity_check_aborts_build 0 Summary: The Heartbeat Subsystem for High-Availability Linux Version: 2.0.5 -Release: 6 +Release: 7 License: GPL, LGPL URL: http://linux-ha.org/ Group: Productivity/Clustering/HA @@ -30,11 +30,10 @@ PreReq: heartbeat-pils heartbeat-stonith Source1: heartbeat.suse.in Source2: heartbeat-permissions.d -Patch0: heartbeat-post-2.0.5.diff +# Patch0: heartbeat-post-2.0.5.diff Patch1: heartbeat-doc-directory.diff Patch2: heartbeat-cmi-indication-temporary-fix.diff -Patch3: heartbeat-Filesystem-ocfs2.diff -Patch4: heartbeat-compatibility-level.diff +Patch3: heartbeat-compatibility-level.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on %package ldirectord @@ -153,11 +152,10 @@ %prep ########################################################### %setup -n linux-ha -%patch0 -p0 +# %patch0 -p0 %patch1 -p0 %patch2 -p0 %patch3 -p0 -%patch4 -p0 cp $RPM_SOURCE_DIR/heartbeat.suse.in ./heartbeat/init.d/heartbeat.in %{?suse_update_config:%{suse_update_config -f}} ########################################################### @@ -186,7 +184,7 @@ --with-cimom=openwbem \ --with-cmpi-headers=/usr/include/openwbem \ --with-provider-dir=/usr/%{_lib}/openwbem/cmpiproviders \ - --enable-crm-dev + --enable-crm-dev --with-pkgversion=%{version} #export MAKE="make %{?jobs:-j%jobs}" #make %{?jobs:-j%jobs} make @@ -443,6 +441,45 @@ %{_libdir}/pils %changelog -n heartbeat +* Sat May 20 2006 - lmb(a)suse.de +- Fix compilation on s390. +* Fri May 19 2006 - lmb(a)suse.de +- GUI enhancements: +- Icons updated and new ones added. +- Resources now default to "stopped". +- Allow GUI to configure resource_failure_stickiness. +- Various useability fixes (among them OSDL #1221). +- CIM provider: Don't overwrite directives it doesn't know (#170877) +- LRM: +- Overflow fixes (OSDL #1222). +- Be more tolerant for LSB script format. +- Enhance heartbeat resource class (#1229). +- CRM: +- Fixes to DTD and DTD validation, prevented some coded features to be + activated. +- Useage/help texts/log messages updated in various places. +- attrd: Make sure new value is always written to CIB. +- Support target_role for groups (instead of crashing) (OSDL #1248). +- Fix handling of defaults for target_role. +- Clones now default to one instance per node. +- Fix CIB update handling for replace (#174049, OSDL #1247). +- Probe newly added resources too (OSDL #1252). +- Avoid some unnecessary resource restarts. +- Fix attribute value inheritance (OSDL #1253). +- pingd: Fix retry handling when connecting to CIB (#176014). +- crm_resource: Allow deletion to be forced when cluster doesn't have + quorum. +- heartbeat core: +- Fix sending of compressed/binary fields over serial links. +- Resource Agents: +- OCFS2 integration fixed and merged with upstream (#174908, #175986). +- LVSSyncDaemon fixes to work with recent sed (OSDL #1249). +- STONITH: Provide correct metadata. +- apache: Fix metadata operation (OSDL #1254), monitor operation, and + enhance helptexts. +- Start heartbeat after Xen is finished with its networking changes + (#177134). +- Small Coverity fixes. * Mon May 08 2006 - lmb(a)suse.de - GUI can now be invoked as "hb_gui" in the regular path. - ha_propagate added to allow YaST2 heartbeat module to succeed ++++++ heartbeat-2.0.5.tar.bz2 ++++++ ++++ 52412 lines of diff (skipped) ++++++ heartbeat.suse.in ++++++ --- heartbeat/heartbeat.suse.in 2006-04-07 14:29:06.000000000 +0200 +++ heartbeat/heartbeat.suse.in 2006-05-19 18:22:37.000000000 +0200 @@ -16,7 +16,7 @@ ### BEGIN INIT INFO # Provides: heartbeat # Required-Start: $network $syslog $named -# X-UnitedLinux-Should-Start: drbd sshd +# X-UnitedLinux-Should-Start: drbd sshd xendomains # Required-Stop: # Default-Start: 3 5 # Default-Stop: 0 1 2 6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gnome-vfs2
by root＠suse.de 20 May '06

20 May '06

Hello community, here is the log from the commit of package gnome-vfs2 checked in at Sun May 21 01:53:09 CEST 2006. -------- --- GNOME/gnome-vfs2/gnome-vfs2.changes 2006-05-05 19:29:16.000000000 +0200 +++ gnome-vfs2/gnome-vfs2.changes 2006-05-19 17:44:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 19 17:44:28 CEST 2006 - dave(a)suse.de + +- Work around a problem with samba servers not liking to return + > 64k bytes. + +------------------------------------------------------------------- New: ---- gnome-vfs2-smb-bufsize.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-vfs2.spec ++++++ --- /var/tmp/diff_new_pack.MBcTCX/_old 2006-05-21 01:52:08.000000000 +0200 +++ /var/tmp/diff_new_pack.MBcTCX/_new 2006-05-21 01:52:08.000000000 +0200 @@ -19,7 +19,7 @@ Requires: gnome-mime-data Autoreqprov: on Version: 2.12.2 -Release: 57 +Release: 59 Summary: The GNOME 2.x Desktop Virtual File System Libraries URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +49,7 @@ Patch30: gnome-vfs2-155010-media-check-user-visible-drives.diff Patch31: gnome-vfs2-171156-ftp-large-files.diff Patch32: gnome-vfs2-149355-novfs-is-not-local.diff +Patch33: gnome-vfs2-smb-bufsize.patch Obsoletes: gnome-vfs-extras Provides: gnome-vfs-extras @@ -157,6 +158,7 @@ %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 gnome-patch-translation-update # These patches have it's own translation management: %patch20 @@ -264,6 +266,9 @@ %{prefix}/share/gtk-doc/html/gnome-vfs-2.0 %changelog -n gnome-vfs2 +* Fri May 19 2006 - dave(a)suse.de +- Work around a problem with samba servers not liking to return + > 64k bytes. * Fri May 05 2006 - federico(a)novell.com - Added gnome-vfs2-149355-novfs-is-not-local.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=149355. This adds ++++++ gnome-vfs2-smb-bufsize.patch ++++++ diff -urN gnome-vfs-2.12.2/modules/smb-method.c gnome-vfs-patched/modules/smb-method.c --- gnome-vfs-2.12.2/modules/smb-method.c 2005-10-20 18:04:54.000000000 +0200 +++ gnome-vfs-patched/modules/smb-method.c 2006-05-19 01:16:18.464837819 +0200 @@ -1539,7 +1539,7 @@ /* Important: perform_authentication leaves and re-enters the lock! */ while (perform_authentication (&actx) > 0) { - n = smb_context->read (smb_context, handle->file, buffer, num_bytes); + n = smb_context->read (smb_context, handle->file, buffer, MIN (USHRT_MAX, num_bytes)); actx.res = (n >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno (); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-trans-zh_TW
by root＠suse.de 20 May '06

20 May '06

Hello community, here is the log from the commit of package yast2-trans-zh_TW checked in at Sun May 21 01:53:08 CEST 2006. -------- --- yast2-trans-zh_TW/yast2-trans-zh_TW.changes 2006-04-21 13:36:18.000000000 +0200 +++ yast2-trans-zh_TW/yast2-trans-zh_TW.changes 2006-05-19 19:25:16.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 19 19:24:48 2006 - ke(a)suse.de + +- Update to version 2.13.12. + +------------------------------------------------------------------------ Old: ---- yast2-trans-zh_TW-2.13.11.tar.bz2 New: ---- yast2-trans-zh_TW-2.13.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-zh_TW.spec ++++++ --- /var/tmp/diff_new_pack.QYydlf/_old 2006-05-21 01:52:08.000000000 +0200 +++ /var/tmp/diff_new_pack.QYydlf/_new 2006-05-21 01:52:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-zh_TW (Version 2.13.11) +# spec file for package yast2-trans-zh_TW (Version 2.13.12) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-zh_TW -Version: 2.13.11 -Release: 2 +Version: 2.13.12 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-zh_TW-2.13.11.tar.bz2 +Source0: yast2-trans-zh_TW-2.13.12.tar.bz2 prefix: /usr Provides: locale(yast2:zh_TW) BuildRequires: pkgconfig yast2-devtools @@ -31,7 +31,7 @@ YaST2 - Traditional Chinese Translations %prep -%setup -n yast2-trans-zh_TW-2.13.11 +%setup -n yast2-trans-zh_TW-2.13.12 %build autoreconf --force --install @@ -63,6 +63,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-zh_TW +* Fri May 19 2006 - ke(a)suse.de +- Update to version 2.13.12. * Fri Apr 21 2006 - ke(a)suse.de - Update to version 2.13.11. * Wed Apr 12 2006 - ke(a)suse.de ++++++ yast2-trans-zh_TW-2.13.11.tar.bz2 -> yast2-trans-zh_TW-2.13.12.tar.bz2 ++++++ ++++ 28057 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-trans-zh_CN
by root＠suse.de 20 May '06

20 May '06

Hello community, here is the log from the commit of package yast2-trans-zh_CN checked in at Sun May 21 01:52:03 CEST 2006. -------- --- yast2-trans-zh_CN/yast2-trans-zh_CN.changes 2006-04-12 12:19:23.000000000 +0200 +++ yast2-trans-zh_CN/yast2-trans-zh_CN.changes 2006-05-19 19:22:46.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 19 19:22:17 2006 - ke(a)suse.de + +- Update to version 2.13.12. + +------------------------------------------------------------------------ Old: ---- yast2-trans-zh_CN-2.13.11.tar.bz2 New: ---- yast2-trans-zh_CN-2.13.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-zh_CN.spec ++++++ --- /var/tmp/diff_new_pack.tLsSsB/_old 2006-05-21 01:51:38.000000000 +0200 +++ /var/tmp/diff_new_pack.tLsSsB/_new 2006-05-21 01:51:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-zh_CN (Version 2.13.11) +# spec file for package yast2-trans-zh_CN (Version 2.13.12) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-zh_CN -Version: 2.13.11 +Version: 2.13.12 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-zh_CN-2.13.11.tar.bz2 +Source0: yast2-trans-zh_CN-2.13.12.tar.bz2 prefix: /usr Provides: locale(yast2:zh_CN) BuildRequires: pkgconfig yast2-devtools @@ -31,7 +31,7 @@ YaST2 - Simplified Chinese Translations %prep -%setup -n yast2-trans-zh_CN-2.13.11 +%setup -n yast2-trans-zh_CN-2.13.12 %build autoreconf --force --install @@ -63,6 +63,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-zh_CN +* Fri May 19 2006 - ke(a)suse.de +- Update to version 2.13.12. * Wed Apr 12 2006 - ke(a)suse.de - Update to version 2.13.11. * Mon Apr 10 2006 - ke(a)suse.de ++++++ yast2-trans-zh_CN-2.13.11.tar.bz2 -> yast2-trans-zh_CN-2.13.12.tar.bz2 ++++++ ++++ 31097 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit f-spot
by root＠suse.de 20 May '06

20 May '06

Hello community, here is the log from the commit of package f-spot checked in at Sun May 21 01:52:01 CEST 2006. -------- --- GNOME/f-spot/f-spot.changes 2006-05-18 23:03:01.000000000 +0200 +++ f-spot/f-spot.changes 2006-05-19 18:31:38.000000000 +0200 @@ -1,0 +2,11 @@ +Fri May 19 18:31:21 CEST 2006 - gekker(a)suse.de + +- Update translations for cs, hu, and fi + +------------------------------------------------------------------- +Fri May 19 18:10:27 CEST 2006 - lewing(a)suse.de + +- Make the screensaver setup logic also handle the mode. Fixes 174901. +- Improve error handling in fix for 173681. + +------------------------------------------------------------------- New: ---- f-spot-po.tar.bz2 f-spot-screensaverprefs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.QagJrN/_old 2006-05-21 01:51:40.000000000 +0200 +++ /var/tmp/diff_new_pack.QagJrN/_new 2006-05-21 01:51:40.000000000 +0200 @@ -19,11 +19,12 @@ Autoreqprov: on Suggests: dcraw Version: 0.1.11 -Release: 21 +Release: 22 Summary: GNOME Photo Management Application URL: http://www.gnome.org/projects/f-spot/ Source: %{name}-%{version}.tar.bz2 Source1: f-spot-import +Source2: f-spot-po.tar.bz2 Patch: %{name}-64bit-warn.patch Patch1: %{name}-libexif-so.patch Patch2: filechooser.diff @@ -41,6 +42,7 @@ Patch14: %{name}-syncmetadata.patch Patch15: %{name}-idleimport.patch Patch16: %{name}-missingfile.patch +Patch17: %{name}-screensaverprefs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core nautilus-cd-burner dbus-1-x11 @@ -61,7 +63,11 @@ Lutz Müller <lutz(a)users.sourceforge.net> Federico Mena Quintero <federico(a)ximian.com> -%prep +%prep -a2 +if %version != 0.1.11 ; then +echo "Please remove Source2 and verify, that translations work." +exit 1 +fi %setup %patch -p1 %patch1 -p1 @@ -79,6 +85,7 @@ %patch14 %patch15 %patch16 +%patch17 %build rename no nb po/no.* @@ -137,6 +144,11 @@ %endif %changelog -n f-spot +* Fri May 19 2006 - gekker(a)suse.de +- Update translations for cs, hu, and fi +* Fri May 19 2006 - lewing(a)suse.de +- Make the screensaver setup logic also handle the mode. Fixes 174901. +- Improve error handling in fix for 173681. * Thu May 18 2006 - lewing(a)suse.de - Improve missing file handlin to fix 173606. * Wed May 17 2006 - lewing(a)suse.de ++++++ f-spot-missingfile.patch ++++++ --- /var/tmp/diff_new_pack.QagJrN/_old 2006-05-21 01:51:41.000000000 +0200 +++ /var/tmp/diff_new_pack.QagJrN/_new 2006-05-21 01:51:41.000000000 +0200 @@ -68,25 +68,6 @@ } private const double e = 0.0; -Index: src/CDExport.cs -=================================================================== -RCS file: /cvs/gnome/f-spot/src/CDExport.cs,v -retrieving revision 1.7 -diff -u -p -r1.7 CDExport.cs ---- src/CDExport.cs 19 Oct 2005 05:30:45 -0000 1.7 -+++ src/CDExport.cs 18 May 2006 21:09:36 -0000 -@@ -83,6 +83,11 @@ namespace FSpot { - progress_dialog.Message = e.ToString (); - progress_dialog.ProgressText = Mono.Posix.Catalog.GetString ("Error Transferring"); - } -+ Gtk.Application.Invoke (this.Destroy); -+ } -+ -+ private void Destroy (object sender, System.EventArgs args) -+ { - progress_dialog.Destroy (); - } - Index: src/InfoDisplay.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/InfoDisplay.cs,v @@ -216,3 +197,98 @@ HigMessageDialog md = new HigMessageDialog (this.Dialog, DialogFlags.DestroyWithParent, +Index: src/CDExport.cs +=================================================================== +RCS file: /cvs/gnome/f-spot/src/CDExport.cs,v +retrieving revision 1.7 +diff -u -p -r1.7 CDExport.cs +--- src/CDExport.cs 19 Oct 2005 05:30:45 -0000 1.7 ++++ src/CDExport.cs 19 May 2006 15:55:31 -0000 +@@ -1,4 +1,5 @@ + using System.Runtime.InteropServices; ++using Mono.Unix; + + namespace FSpot { + public class CDExport : GladeDialog { +@@ -45,7 +46,6 @@ namespace FSpot { + + public void Transfer () { + try { +- Dialog.Destroy (); + Gnome.Vfs.Result result = Gnome.Vfs.Result.Ok; + + foreach (IBrowsableItem photo in selection.Items) { +@@ -54,9 +54,9 @@ namespace FSpot { + target = target.AppendFileName (source.ExtractShortName ()); + Gnome.Vfs.XferProgressCallback cb = new Gnome.Vfs.XferProgressCallback (Progress); + +- progress_dialog.Message = System.String.Format (Mono.Posix.Catalog.GetString ("Transferring picture \"{0}\" To CD"), photo.Name); ++ progress_dialog.Message = System.String.Format (Catalog.GetString ("Transferring picture \"{0}\" To CD"), photo.Name); + progress_dialog.Fraction = photo_index / (double) selection.Count; +- progress_dialog.ProgressText = System.String.Format (Mono.Posix.Catalog.GetString ("{0} of {1}"), ++ progress_dialog.ProgressText = System.String.Format (Catalog.GetString ("{0} of {1}"), + photo_index, selection.Count); + result = Gnome.Vfs.Xfer.XferUri (source, target, + Gnome.Vfs.XferOptions.Default, +@@ -67,22 +67,31 @@ namespace FSpot { + photo_index++; + } + ++ // FIXME the error dialog here is ugly and needs improvement when strings are not frozen. + if (result == Gnome.Vfs.Result.Ok) { +- progress_dialog.Message = Mono.Posix.Catalog.GetString ("Done Sending Photos"); ++ progress_dialog.Message = Catalog.GetString ("Done Sending Photos"); + progress_dialog.Fraction = 1.0; +- progress_dialog.ProgressText = Mono.Posix.Catalog.GetString ("Transfer Complete"); ++ progress_dialog.ProgressText = Catalog.GetString ("Transfer Complete"); + progress_dialog.ButtonLabel = Gtk.Stock.Ok; + progress_dialog.Hide (); + system ("nautilus-cd-burner"); + } else { +- progress_dialog.ProgressText = result.ToString (); +- progress_dialog.Message = Mono.Posix.Catalog.GetString ("Error While Transferring"); ++ throw new System.Exception (System.String.Format ("{0}\n{1}\n{2}", ++ progress_dialog.Message, ++ Catalog.GetString ("Error While Transferring"), ++ result.ToString ())); + } + + } catch (System.Exception e) { + progress_dialog.Message = e.ToString (); +- progress_dialog.ProgressText = Mono.Posix.Catalog.GetString ("Error Transferring"); ++ progress_dialog.ProgressText = Catalog.GetString ("Error Transferring"); ++ return; + } ++ Gtk.Application.Invoke (this.Destroy); ++ } ++ ++ private void Destroy (object sender, System.EventArgs args) ++ { + progress_dialog.Destroy (); + } + +@@ -96,10 +105,10 @@ namespace FSpot { + + switch (info.Status) { + case Gnome.Vfs.XferProgressStatus.Vfserror: +- progress_dialog.Message = Mono.Posix.Catalog.GetString ("Error: Error while transferring; Aborting"); ++ progress_dialog.Message = Catalog.GetString ("Error: Error while transferring; Aborting"); + return (int)Gnome.Vfs.XferErrorAction.Abort; + case Gnome.Vfs.XferProgressStatus.Overwrite: +- progress_dialog.ProgressText = Mono.Posix.Catalog.GetString ("Error: File Already Exists; Aborting"); ++ progress_dialog.ProgressText = Catalog.GetString ("Error: File Already Exists; Aborting"); + return (int)Gnome.Vfs.XferOverwriteAction.Abort; + default: + return 1; +@@ -134,9 +143,10 @@ namespace FSpot { + } + + clean = remove_check.Active; ++ Dialog.Destroy (); + + command_thread = new System.Threading.Thread (new System.Threading.ThreadStart (Transfer)); +- command_thread.Name = Mono.Posix.Catalog.GetString ("Transferring Pictures"); ++ command_thread.Name = Catalog.GetString ("Transferring Pictures"); + + progress_dialog = new FSpot.ThreadProgressDialog (command_thread, selection.Count); + progress_dialog.Start (); ++++++ f-spot-screensaverprefs.patch ++++++ Index: src/PreferenceDialog.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/PreferenceDialog.cs,v retrieving revision 1.6 diff -u -p -r1.6 PreferenceDialog.cs --- src/PreferenceDialog.cs 20 Feb 2006 23:38:14 -0000 1.6 +++ src/PreferenceDialog.cs 19 May 2006 15:54:26 -0000 @@ -32,6 +32,7 @@ namespace FSpot { private static PreferenceDialog prefs = null; int screensaver_tag; private const string SaverCommand = "f-spot-screensaver"; + private const string SaverMode = "single"; public PreferenceDialog () : base ("main_preferences") { @@ -95,6 +96,10 @@ namespace FSpot { private void HandleUseFSpot (object sender, EventArgs args) { + // FIXME gnome-screensaver-prefences doesn't notice when only themode changes so we + // have to work around that. + Preferences.Set (Preferences.GNOME_SCREENSAVER_MODE, SaverMode); + Preferences.Set (Preferences.GNOME_SCREENSAVER_THEME, new string [] { "hack-to-make-gnome-screensaver-preference-happy" }); Preferences.Set (Preferences.GNOME_SCREENSAVER_THEME, new string [] { SaverCommand }); } @@ -127,13 +132,14 @@ namespace FSpot { } break; case Preferences.GNOME_SCREENSAVER_THEME: - if (val == null) { - set_saver_button.Sensitive = false; - return; - } + case Preferences.GNOME_SCREENSAVER_MODE: + string [] theme = (string []) Preferences.Get (Preferences.GNOME_SCREENSAVER_THEME); + string mode = (string) Preferences.Get (Preferences.GNOME_SCREENSAVER_MODE); + + bool sensitive = mode != SaverMode; + sensitive |= (theme == null || theme.Length != 1 || theme [0] != SaverCommand); - string [] names = (string []) val; - set_saver_button.Sensitive = (names.Length != 1 || names [0] != SaverCommand); + set_saver_button.Sensitive = sensitive; break; } } Index: src/Preferences.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/Preferences.cs,v retrieving revision 1.11 diff -u -p -r1.11 Preferences.cs --- src/Preferences.cs 20 Feb 2006 17:46:48 -0000 1.11 +++ src/Preferences.cs 19 May 2006 15:54:26 -0000 @@ -76,6 +76,7 @@ namespace FSpot public const string METADATA_EMBED_IN_IMAGE = "/apps/f-spot/metadata/embed_in_image"; public const string GNOME_SCREENSAVER_THEME = "/apps/gnome-screensaver/themes"; + public const string GNOME_SCREENSAVER_MODE = "/apps/gnome-screensaver/mode"; static GConf.Client client; static GConf.NotifyEventHandler changed_handler; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit evolution-data-server
by root＠suse.de 20 May '06

20 May '06

Hello community, here is the log from the commit of package evolution-data-server checked in at Sun May 21 01:51:33 CEST 2006. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2006-05-18 12:58:37.000000000 +0200 +++ evolution-data-server/evolution-data-server.changes 2006-05-19 17:44:32.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 19 17:43:26 CEST 2006 - fejj(a)suse.de + +- Added imap-locking.patch which fixes bug #171502 and bug #176277 + which are both deadlock conditions in the imap code. + +------------------------------------------------------------------- New: ---- imap-locking.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.7uUm5W/_old 2006-05-21 01:49:17.000000000 +0200 +++ /var/tmp/diff_new_pack.7uUm5W/_new 2006-05-21 01:49:17.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Evolution Data Server Version: 1.6.0 -Release: 46 +Release: 47 Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{v… #Patch3: evolution-data-server-gcc4.patch Patch5: evolution-data-server-configure.patch @@ -85,6 +85,7 @@ Patch64: bnc-169997-eds-infinite-loop.diff Patch65: bnc-173454.patch Patch66: gw-trash-fix.diff +Patch67: imap-locking.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libsoup >= 2.2.6 mozilla-nss @@ -181,6 +182,7 @@ %patch64 %patch65 %patch66 +%patch67 %build rename no nb po/no.* @@ -231,6 +233,9 @@ %{prefix}/share/gtk-doc/html/* %changelog -n evolution-data-server +* Fri May 19 2006 - fejj(a)suse.de +- Added imap-locking.patch which fixes bug #171502 and bug #176277 + which are both deadlock conditions in the imap code. * Thu May 18 2006 - sragavan(a)novell.com - gw-trash-fix.diff: Show trash folder contents to user. (Sankar) * Tue May 16 2006 - fejj(a)suse.de ++++++ imap-locking.patch ++++++ ++++ 720 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0