Hello community,

here is the log from the commit of package kdesdk3 for openSUSE:Factory
checked in at Mon Sep 12 10:41:43 CEST 2011.



--------
New Changes file:

--- /dev/null   2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdesdk3/kdesdk3.changes        2010-05-11 
13:25:47.000000000 +0200
@@ -0,0 +1,945 @@
+-------------------------------------------------------------------
+Tue May 11 11:25:06 UTC 2010 - [email protected]
+
+- Fixed build and clean up spec file
+
+-------------------------------------------------------------------
+Mon Jun 22 07:05:59 CEST 2009 - [email protected]
+
+- remove ancient obsoletes (kcachegrind, umbrello, cervisia)
+
+-------------------------------------------------------------------
+Wed Apr 29 10:05:51 CEST 2009 - [email protected]
+
+- update 3.5 branch diff to fix compilation with gcc 4.4
+
+-------------------------------------------------------------------
+Fri Feb 13 13:56:34 CET 2009 - [email protected]
+
+- remove the dependency on kdepim3-devel, kbugbuster stopped working
+  with new bugs.kde.org anyway
+
+-------------------------------------------------------------------
+Wed Aug 20 18:33:07 CEST 2008 - [email protected]
+
+- update to KDE 3.5.10
+  * translation update
+
+-------------------------------------------------------------------
+Fri Apr 25 17:06:41 CEST 2008 - [email protected]
+
+- 3_5_BRANCH.diff update:
+  * translation update
+
+-------------------------------------------------------------------
+Tue Apr 15 13:35:09 CEST 2008 - [email protected]
+
+- Use autoreconf.
+
+-------------------------------------------------------------------
+Mon Feb 18 17:33:07 CET 2008 - [email protected]
+
+- update to 3.5.9
+
+-------------------------------------------------------------------
+Tue Oct  9 16:07:00 CEST 2007 - [email protected]
+
+- update to 3.5.8: 
+   * Umbrello: added code generator for D language
+   * bugfixes in Cervisia and Umbrello
+
+-------------------------------------------------------------------
+Wed Sep 12 13:39:52 CEST 2007 - [email protected]
+
+- l10n-kde3 fix
+
+-------------------------------------------------------------------
+Sat Aug  4 19:25:46 CEST 2007 - [email protected]
+
+- update 3_BRANCH.diff
+
+-------------------------------------------------------------------
+Sun Jul 22 13:57:04 CEST 2007 - [email protected]
+
+- add 3_5_BRANCH.diff for various bug fixes
+
+-------------------------------------------------------------------
+Thu Jun 21 14:28:58 CEST 2007 - [email protected]
+
+- fix invalid .desktop files
+
+-------------------------------------------------------------------
+Fri Jun  1 13:23:31 CEST 2007 - [email protected]
+
+- fix file list
+
+-------------------------------------------------------------------
+Tue May 29 11:51:23 CEST 2007 - [email protected]
+
+- build kcachegrind on all archs
+
+-------------------------------------------------------------------
+Wed May 23 11:54:52 CEST 2007 - [email protected]
+
+- use %fdupes
+
+-------------------------------------------------------------------
+Mon May 14 23:35:58 CEST 2007 - [email protected]
+
+- update to 3.5.7:
+   * Cervisia: Improve layouting of the CVS log dialog.
+   * Umbrello:
+      - C# Code Generation and export.
+      - Java interface inheritance, abstract classes and generics
+        in code generation.
+      - Operations of the Interface are implemented in the class
+        automatically.
+      - Java 5 generics support.
+      - several bugfixes
+   * Bugfixes in KBabel and KCachegrind
+
+-------------------------------------------------------------------
+Sat Apr 14 23:53:11 CEST 2007 - [email protected]
+
+- update buildrequires
+
+-------------------------------------------------------------------
+Fri Mar 30 11:40:24 CEST 2007 - [email protected]
+
+- update buildrequires 
+
+-------------------------------------------------------------------
+Fri Jan 26 10:05:06 CET 2007 - [email protected]
+
+- don't build kdesdk3-profile on 9.3 x86_64 where no valgrind exists
+
+-------------------------------------------------------------------
+Tue Jan 16 15:55:23 CET 2007 - [email protected]
+
+- update to 3.5.6 release:
+   * KBabel: subversion 1.4 support for catalog manager, bugfixes
+   * Umbrello: 
+      - stereotype selection list for parameter properties dialog.
+      - countless bugfixes: crashes, export, printing, ...
+
+-------------------------------------------------------------------
+Sat Dec 16 10:49:15 CET 2006 - [email protected]
+
+- move kbugbuster and kbabel documentation into subpackages
+
+-------------------------------------------------------------------
+Wed Nov  8 16:58:42 CET 2006 - [email protected]
+
+- remove historic "Provides:" (#218798)
+
+-------------------------------------------------------------------
+Tue Oct 31 16:48:37 CET 2006 - [email protected]
+
+- add 3_5_BRANCH.diff (umbrello fixes)
+
+-------------------------------------------------------------------
+Tue Oct  3 10:43:08 CEST 2006 - [email protected]
+
+- update to 3.5.5 release tarball
+
+-------------------------------------------------------------------
+Thu Aug 31 12:03:50 CEST 2006 - [email protected]
+
+- move kuiviewer to "GUI Designer" menu (#115167)
+- update 3.5 branch diff to fix Umbrello build on old distros
+
+-------------------------------------------------------------------
+Wed Aug 23 09:42:52 CEST 2006 - [email protected]
+
+- update to 3.5 branch to fix parallel build in kbabel
+
+-------------------------------------------------------------------
+Mon Jul 24 08:05:36 CEST 2006 - [email protected]
+
+- update to KDE 3.5.4:
+   * several bugfixes within Umbrello and KBabel
+
+-------------------------------------------------------------------
+Tue Jun 20 15:20:08 CEST 2006 - [email protected]
+
+- build parallel 
+
+-------------------------------------------------------------------
+Tue May 30 16:29:07 CEST 2006 - [email protected]
+
+- fix BuildRequires 
+
+-------------------------------------------------------------------
+Wed May 24 10:30:48 CEST 2006 - [email protected]
+
+- update to 3.5.3
+  * several fixes to Cachegrind and Umbrello
+
+-------------------------------------------------------------------
+Mon May 22 16:28:43 CEST 2006 - [email protected]
+
+- move svn related scripts from -translate to main kdesdk3 package
+
+-------------------------------------------------------------------
+Mon Mar 20 15:31:42 CET 2006 - [email protected]
+
+- update to 3.5.2
+   * KBabel 
+     - Improve loading of Gettext PO files, especially in case of 
+       recoverable or unrecoverable errors. (bugs #117968, #120200,
+       #121236) 
+     - Settings of the SVN/CVS dialogs are now project-releated
+       (and not global anymore). 
+     - Improve sending PO file(s) as email.
+   * Umbrello 
+     - Use horizontal and vertical lines when drawing association
+     - Import Rose model files (no diagrams yet, #81364)
+     - Automatically fill useful info into the Perl writer heading
++++ 748 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/kdesdk3/kdesdk3.changes

calling whatdependson for head-i586


New:
----
  3_5_BRANCH.diff
  gettext-0.10.35.diff
  gettext-0.10.35.tar.bz2
  kdesdk-3.5.10.tar.bz2
  kdesdk3.changes
  kdesdk3.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdesdk3.spec ++++++
#
# spec file for package kdesdk3
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild


Name:           kdesdk3
BuildRequires:  db-devel flex kdebase3-devel
%ifarch %ix86 ppc x86_64 ppc64
BuildRequires:  valgrind-devel
%endif
BuildRequires:  fdupes
License:        GPL v2 or later
Group:          System/GUI/KDE
Summary:        The KDE Software Development Kit
Version:        3.5.10
Release:        16
Url:            http://www.kde.org/
AutoReqProv:    on
Requires:       kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' 
kdelibs3`)
Requires:       cvs
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
Source0:        kdesdk-%{version}.tar.bz2
Source1:        gettext-0.10.35.tar.bz2
Patch0:         3_5_BRANCH.diff
Patch1:         gettext-0.10.35.diff

%description
This is a collection of applications and tools used by KDE developers.
Important applications are:

* cervisia: for browsing CVS repositories

* kompare: visualizing changes between two versions of a file

* umbrello: UML modeller



Authors:
--------
    The KDE Team <[email protected]>

%package kdecvs
License:        GPL v2 or later
# usesubdirs kbugbuster
Summary:        KBugBuster
Group:          Development/Tools/Version Control
AutoReqProv:    on

%description kdecvs
KBugBuster can be used by people with a KDE CVS account to handle bug
reports.



Authors:
--------
    The KDE Team <[email protected]>

%package profile
License:        GPL v2 or later
# usesubdirs kcachegrind
Summary:        Profiling Tools
Group:          Development/Tools/Other
AutoReqProv:    on
Requires:       valgrind >= 3.0.0

%description profile
This package contains KCachegrind and the needed Calltree skin for
Valgrind. You can profile your application with Valgrind using Calltree
skin and display the result in KCachegrind to easily find bottlenecks.



Authors:
--------
    The KDE Team <[email protected]>

%package translate
License:        GPL v2 or later
# usesubdirs kbabel poxml
Summary:        Tools to Handle Translations
Group:          System/GUI/KDE
AutoReqProv:    on
Requires:       gettext

%description translate
KBabel: for easy handling of PO files. PO files are used to store
translations for glibc-based applications.

poxml: translate DocBook files using translated PO files.



Authors:
--------
    The KDE Team <[email protected]>

%package devel
License:        GPL v2 or later
Requires:       kdesdk3 kdelibs3-devel
Summary:        Include Files and Libraries mandatory for Development
Group:          Development/Libraries/C and C++
AutoReqProv:    on

%description devel
This package contains all necessary include files and libraries needed
to develop applications that require these.



Authors:
--------
    The KDE Team <[email protected]>

%prep
%setup -q -n kdesdk-%{version} -b 1
%patch0
# kmtrace does not work with glibc 2.3 anymore and valgrind is way better
rm -rf kmtrace
. /etc/opt/kde3/common_options
update_admin
cd ../gettext-0.10.35
chmod 0644 src/*
%patch1
patch -p0 < ../kdesdk-%version/scripts/gettext.patch

%build
. /etc/opt/kde3/common_options
./configure $configkde
do_make %{?jobs:-j %jobs}
cd ../gettext-0.10.35
rm -f missing mkinstalldirs ltconfig install-sh ltmain.sh libtool
autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure
make -C intl
make -C lib
make -C src xgettext

%install
. /etc/opt/kde3/common_options
make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
chmod 0755 
%{buildroot}/opt/kde3/share/apps/kapptemplate/include/kapptemplate.common
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/do_make
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/config.sub
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/install-sh
chmod 0755 %{buildroot}/opt/kde3/share/apps/umbrello/headings/heading.py
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/am_edit
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/nmcheck
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/config.pl
chmod 0755 %{buildroot}/opt/kde3/share/apps/umbrello/headings/heading.rb
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/debianrules
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/ylwrap
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/compile
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/config.guess
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/bcheck.pl
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/mkinstalldirs
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/depcomp
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/missing
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/conf.change.pl
chmod 0755 
%{buildroot}/opt/kde3/share/apps/kapptemplate/admin/detect-autoconf.pl
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/cvs.sh
chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/doxygen.sh

install -m 755 ../gettext-0.10.35/src/xgettext 
$RPM_BUILD_ROOT/opt/kde3/bin/kde-xgettext
%suse_update_desktop_file    kuiviewer      Development GUIDesigner
%suse_update_desktop_file    umbrello       Development Design
%suse_update_desktop_file    kbugbuster     Development Debugger
%suse_update_desktop_file -u catalogmanager Development Translation
%suse_update_desktop_file    kbabel         Development Translation
%suse_update_desktop_file -u kbabeldict     Development Translation
%suse_update_desktop_file    cervisia       Development RevisionControl
%suse_update_desktop_file    kompare        Development RevisionControl
%suse_update_desktop_file    kcachegrind    Development Profiling
kde_post_install
%fdupes -s $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post translate -p /sbin/ldconfig

%postun translate -p /sbin/ldconfig

%files
%defattr(-,root,root)
%dir /opt/kde3/share/icons/hicolor/16x16/mimetypes
%dir /opt/kde3/share/icons/hicolor/32x32/mimetypes
%dir /opt/kde3/share/icons/hicolor/16x16
%dir /opt/kde3/share/icons/hicolor/16x16/apps
%dir /opt/kde3/share/icons/hicolor/32x32
%dir /opt/kde3/share/icons/hicolor/32x32/apps
%dir /opt/kde3/share/icons/hicolor/48x48
%dir /opt/kde3/share/icons/hicolor/48x48/apps
/opt/kde3/bin/adddebug
/opt/kde3/bin/build-progress.sh
/opt/kde3/bin/cervisia
/opt/kde3/bin/cheatmake
/opt/kde3/bin/create_*
/opt/kde3/bin/cvs*
/opt/kde3/bin/cxxmetric
/opt/kde3/bin/ext*
/opt/kde3/bin/fixkdeincludes
/opt/kde3/bin/findmissingcrystal
/opt/kde3/bin/includemocs
/opt/kde3/bin/kapptemplate
/opt/kde3/bin/kde-build
/opt/kde3/bin/kdedoc
/opt/kde3/bin/kdekillall
/opt/kde3/bin/kdelnk2desktop.py
/opt/kde3/bin/kompare
/opt/kde3/bin/licensecheck
/opt/kde3/bin/makeobj
/opt/kde3/bin/noncvslist
/opt/kde3/bin/pruneemptydirs
/opt/kde3/bin/qtdoc
/opt/kde3/bin/umbrello
/opt/kde3/bin/umbodoc
/opt/kde3/bin/zonetab2pot.py
/opt/kde3/bin/kuiviewer
/opt/kde3/bin/fixuifiles
/opt/kde3/bin/kdemangen.pl
/opt/kde3/bin/package_crystalsvg
/opt/kde3/bin/png2mng.pl
/opt/kde3/bin/svn*
/opt/kde3/%_lib/kde3/kabcformat_kdeaccounts.*
/opt/kde3/%_lib/kde3/kfile_cpp.*
/opt/kde3/%_lib/kde3/kfile_diff.*
/opt/kde3/%_lib/kde3/kfile_ts.*
/opt/kde3/%_lib/kde3/lib*
/opt/kde3/%_lib/kde3/plugins*/styles/scheck.*
/opt/kde3/%_lib/libc*
/opt/kde3/%_lib/kde3/cervisia.*
/opt/kde3/%_lib/kde3/cvsservice.*
/opt/kde3/%_lib/kde3/cvsaskpass.*
/opt/kde3/%_lib/libkdeinit_cervisia.*
/opt/kde3/%_lib/libkdeinit_cvs*
/opt/kde3/%_lib/libkompareinterface.*
/opt/kde3/%_lib/libkspy.*
/opt/kde3/%_lib/kde3/quithumbnail.*
/opt/kde3/share/applications/kde/cervisia.desktop
/opt/kde3/share/applications/kde/kompare.desktop
/opt/kde3/share/applications/kde/umbrello.desktop
/opt/kde3/share/applications/kde/kuiviewer.desktop
/opt/kde3/share/apps/cervisia*
/opt/kde3/share/apps/kabc/formats/kdeaccountsplugin.desktop
/opt/kde3/share/apps/kapptemplate
/opt/kde3/share/apps/kconf_update/*
/opt/kde3/share/apps/kompare*
/opt/kde3/share/apps/kstyle/themes/scheck.themerc
/opt/kde3/share/apps/umbrello
/opt/kde3/share/apps/kuiviewer*
/opt/kde3/share/config.kcfg/cervisiapart.kcfg
%doc %lang(en) /opt/kde3/share/doc/HTML/en/cervisia
%doc %lang(en) /opt/kde3/share/doc/HTML/en/umbrello
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kompare
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kdesvn-build
/opt/kde3/share/icons/*/*/*/vcs_*
/opt/kde3/share/icons/*/*/*/cervisia.png
/opt/kde3/share/icons/*/*/*/kompare.*
/opt/kde3/share/icons/*/*/*/umbrello*
/opt/kde3/share/icons/*/*/*/kuiviewer.png
/opt/kde3/share/mimelnk/application/x-umbrello.desktop
/opt/kde3/share/services/cvsservice.desktop
/opt/kde3/share/services/kfile_cpp.desktop
/opt/kde3/share/services/kfile_diff.desktop
/opt/kde3/share/services/kfile_h.desktop
/opt/kde3/share/services/kfile_ts.desktop
/opt/kde3/share/services/designerthumbnail.desktop
/opt/kde3/share/services/kuiviewer_part.desktop
/opt/kde3/share/services/kompare*
/opt/kde3/share/servicetypes/kompare*
/opt/kde3/bin/colorsvn
/opt/kde3/bin/kdesvn-build
/opt/kde3/bin/nonsvnlist
/opt/kde3/bin/kunittest*
/opt/kde3/include/kunittest/runnergui.h
/opt/kde3/%_lib/libkunittestgui.la
/opt/kde3/%_lib/libkunittestgui.so*
/opt/kde3/share/apps/katepart/syntax/kdesvn-buildrc.xml
%_mandir/*/*

%files kdecvs
%defattr(-,root,root)
/opt/kde3/bin/kbugbuster
/opt/kde3/share/applications/kde/kbugbuster.desktop
/opt/kde3/share/apps/kbugbuster
/opt/kde3/share/icons/*/*x*/*/kbugbuster.png
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kbugbuster

%files profile
%defattr(-,root,root)
%dir /opt/kde3/share/icons/hicolor/48x48
%dir /opt/kde3/share/icons/hicolor/48x48/apps
/opt/kde3/bin/dprof2calltree
/opt/kde3/bin/hotshot2calltree
/opt/kde3/bin/memprof2calltree
/opt/kde3/bin/op2calltree
/opt/kde3/bin/pprof2calltree
/opt/kde3/bin/kcachegrind
/opt/kde3/share/applications/kde/kcachegrind.desktop
/opt/kde3/share/apps/kcachegrind
/opt/kde3/share/icons/*/*x*/*/kcachegrind.png
/opt/kde3/share/mimelnk/application/x-kcachegrind.desktop
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kcachegrind

%files translate
%defattr(-,root,root)
/opt/kde3/bin/kde-xgettext
/opt/kde3/bin/catalogmanager
/opt/kde3/bin/kbabel*
/opt/kde3/bin/po2xml
/opt/kde3/bin/split2po
/opt/kde3/bin/swappo
/opt/kde3/bin/transxx
/opt/kde3/bin/xml2pot
/opt/kde3/%_lib/kde3/kbabel*
/opt/kde3/%_lib/kde3/kfile_po.*
/opt/kde3/%_lib/kde3/pothumbnail.*
/opt/kde3/%_lib/libkbabel*
/opt/kde3/share/applications/kde/catalogmanager.desktop
/opt/kde3/share/applications/kde/kbabel*
/opt/kde3/share/apps/catalogmanager
/opt/kde3/share/apps/kbabel
/opt/kde3/share/config.kcfg/kbabel.kcfg
/opt/kde3/share/config.kcfg/kbprojectsettings.kcfg
/opt/kde3/share/icons/*/*x*/*/catalogmanager.png
/opt/kde3/share/icons/*/*x*/*/kbabel.png
/opt/kde3/share/icons/*/*x*/*/kbabeldict.png
/opt/kde3/share/services/dbsearchengine.desktop
/opt/kde3/share/services/kbabel_*
/opt/kde3/share/services/kfile_po.desktop
/opt/kde3/share/services/po*
/opt/kde3/share/services/tmxcompendium.desktop
/opt/kde3/share/servicetypes/kbabel*
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kbabel

%files devel
%defattr(-,root,root)
/opt/kde3/include/cvs*
/opt/kde3/include/kbabel
/opt/kde3/include/kprofilemethod.h
/opt/kde3/include/kspy.h
/opt/kde3/include/repository_stub.h

%changelog
++++++ 3_5_BRANCH.diff ++++++
package: kdesdk-3.5.10.tar.bz2
kdemod: kdesdk
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 957058
+svn di between //tags/KDE/3.5.10/kdesdk and //branches/KDE/3.5/kdesdk
--- poxml/antlr/antlr/CharScanner.hpp   
+++ poxml/antlr/antlr/CharScanner.hpp   
@@ -42,6 +42,7 @@
 #include "antlr/BitSet.hpp"
 #include "antlr/LexerSharedInputState.hpp"
 #include <map>
+#include <cstdio>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
--- kcachegrind/kcachegrind/callgraphview.cpp   
+++ kcachegrind/kcachegrind/callgraphview.cpp   
@@ -2073,13 +2073,12 @@
       continue;
     }
 
-    // artifical calls should be blue
-    bool isArtifical = false;
-    TraceFunction* caller = e->fromNode()->function();
-    TraceFunction* called = e->toNode()->function();
-    if (caller->cycle() == caller) isArtifical = true;
-    if (called->cycle() == called) isArtifical = true;
-    QColor arrowColor = isArtifical ? Qt::blue : Qt::black;
+    // calls into/out of cycles are special: make them blue
+    QColor arrowColor = Qt::black;
+    TraceFunction* caller = e->fromNode() ? e->fromNode()->function() : 0;
+    TraceFunction* called = e->toNode() ? e->toNode()->function() : 0;
+    if ( (caller && (caller->cycle() == caller)) ||
+         (called && (called->cycle() == called)) ) arrowColor = Qt::blue;
 
     sItem = new CanvasEdge(e, _canvas);
     e->setCanvasEdge(sItem);
--- cervisia/repositories.cpp   
+++ cervisia/repositories.cpp   
@@ -29,17 +29,29 @@
 #include "cervisiapart.h"
 
 
+static QString fileNameCvs()
+{
+    return QDir::homeDirPath() + "/.cvspass";
+}
+
+
+static QString fileNameCvsnt()
+{
+    return QDir::homeDirPath() + "/.cvs/cvspass";
+}
+
+
 // old .cvspass format:
 //    user@host:/path Acleartext_password
 //
 // new .cvspass format (since cvs 1.11.1):
 //    /1 user@host:port/path Aencoded_password
 //
-QStringList Repositories::readCvsPassFile()
+static QStringList readCvsPassFile()
 {
     QStringList list;
-    
-    QFile f(QDir::homeDirPath() + "/.cvspass");
+
+    QFile f(fileNameCvs());
     if (f.open(IO_ReadOnly))
         {
             QTextStream stream(&f);
@@ -55,13 +67,46 @@
                            list.append(line.section(' ', 1, 1));
                    }
                }
-            f.close();
        }
 
     return list;
 }
 
 
+// .cvs/cvspass format
+//    user@host:port/path=Aencoded_password
+//
+static QStringList readCvsntPassFile()
+{
+    QStringList list;
+
+    QFile file(fileNameCvsnt());
+    if (file.open(IO_ReadOnly))
+    {
+        QTextStream stream(&file);
+        while (!stream.atEnd())
+        {
+            const QString line(stream.readLine());
+
+            const int pos(line.find("=A"));
+            if (pos >= 0)
+                list.append(line.left(pos));
+        }
+    }
+
+    return list;
+}
+
+
+QStringList Repositories::readCvsPassFile()
+{
+    return (QFileInfo(fileNameCvs()).lastModified()
+            < QFileInfo(fileNameCvsnt()).lastModified())
+        ? readCvsntPassFile()
+        : ::readCvsPassFile();
+}
+
+
 QStringList Repositories::readConfigFile()
 {
     QStringList list;
--- cervisia/ChangeLog  
+++ cervisia/ChangeLog  
@@ -1,3 +1,8 @@
+2008-08-15  André Wöbbeking  <[email protected]>
+
+       * Fix BR #162523:
+         Allow cvsnt users to login to repositories.
+
 2008-06-18  André Wöbbeking  <[email protected]>
 
        * Fix BR #164216:
--- cervisia/cvsservice/cvsloginjob.cpp 
+++ cervisia/cvsservice/cvsloginjob.cpp 
@@ -104,7 +104,8 @@
         }
 
         // process asks for the password
-        if( line.contains(PASS_PHRASE) )
+        // search case insensitive as cvs and cvsnt use different 
capitalization
+        if( line.contains(PASS_PHRASE, false) )
         {
             kdDebug(8051) << "process waits for the password." << endl;
 

Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
   + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin


++++++ gettext-0.10.35.diff ++++++
--- configure.in
+++ configure.in        2004/03/27 11:39:01
@@ -26,7 +26,6 @@
 AC_C_INLINE
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
-AM_TYPE_PTRDIFF_T
 
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
@@ -38,15 +37,7 @@
   AC_CHECK_FUNCS(getdelim)
 fi
 
-AC_CHECK_FUNC(parse_printf_format, gt_cv_func_parse_printf_format=yes,
-  gt_cv_func_parse_printf_format=no)
-if test $gt_cv_func_parse_printf_format = yes; then
-  AC_DEFINE(HAVE_PARSE_PRINTF_FORMAT)
-else
-  LIBOBJS="$LIBOBJS printf-prs.o"
-fi
-
-AM_FUNC_ERROR_AT_LINE
+AC_DEFINE(HAVE_PARSE_PRINTF_FORMAT)
 
 dnl These are the only lines required to internationalize the package.
 dnl (OK, not quite, the AC_OUTPUT has also some parts.)
--- src/xgettext.c
+++ src/xgettext.c      2004/03/27 11:39:11
@@ -48,7 +48,6 @@
 #include "dir-list.h"
 #include "error.h"
 #include "hash.h"
-#include "getline.h"
 #include "system.h"
 #include "po.h"
 #include "message.h"

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to