Author: arekm Date: Wed Nov 25 09:57:53 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; branch diff updated
---- Files affected: packages/kde4-kdepimlibs: kde4-kdepimlibs-branch.diff (1.15 -> 1.16) , kde4-kdepimlibs.spec (1.97 -> 1.98) ---- Diffs: ================================================================ Index: packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff diff -u packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.15 packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.16 --- packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.15 Wed Aug 19 21:51:19 2009 +++ packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff Wed Nov 25 10:57:47 2009 @@ -1,478 +1,246 @@ -Index: kpimutils/linklocator.cpp +Index: qgpgme/dataprovider.cpp =================================================================== ---- kpimutils/linklocator.cpp (.../tags/KDE/4.3.0/kdepimlibs) (wersja 1013409) -+++ kpimutils/linklocator.cpp (.../branches/KDE/4.3/kdepimlibs) (wersja 1013409) -@@ -107,15 +107,19 @@ - { - QString url; - if ( atUrl() ) { -- // handle cases like this: <link>http://foobar.org/</link> -+ // for reference: rfc1738: -+ // Thus, only alphanumerics, the special characters "$-_.+!*'(),", and -+ // reserved characters used for their reserved purposes may be used -+ // unencoded within a URL. -+ // NOTE: this implementation is not RFC conforming - int start = mPos; - while ( mPos < (int)mText.length() && - mText[mPos] > ' ' && mText[mPos] != '"' && -- QString( "<>()[]" ).indexOf( mText[mPos] ) == -1 ) { -+ QString( "<>[]" ).indexOf( mText[mPos] ) == -1 ) { - ++mPos; - } - -- /* some URLs really end with: # / & - _ */ -+ // some URLs really end with: # / & - _ - const QString allowedSpecialChars = QString( "#/&-_" ); - while ( mPos > start && mText[mPos-1].isPunct() && - allowedSpecialChars.indexOf( mText[mPos-1] ) == -1 ) { -@@ -268,20 +272,38 @@ - ch = locator.mText[locator.mPos]; - if ( flags & PreserveSpaces ) { - if ( ch == ' ' ) { -+ if ( locator.mPos + 1 < locator.mText.length() ) { -+ if ( locator.mText[locator.mPos + 1] != ' ' ) { -+ -+ // A single space, make it breaking if not at the start or end of the line -+ const bool endOfLine = locator.mText[locator.mPos + 1] == '\n'; -+ if ( !startOfLine && !endOfLine ) -+ result += ' '; -+ else -+ result += " "; -+ } -+ else { -+ -+ // Whitespace of more than one space, make it all non-breaking -+ while( locator.mPos < locator.mText.length() && locator.mText[locator.mPos] == ' ' ) { -+ result += " "; -+ locator.mPos++; -+ x++; -+ } -+ -+ // We incremented once to often, undo that -+ locator.mPos--; -+ x--; -+ } -+ } -+ else { -+ // Last space in the text, it is non-breaking -+ result += " "; -+ } -+ - if ( startOfLine ) { -- result += " "; -- locator.mPos++, x++; - startOfLine = false; - } -- while ( locator.mText[locator.mPos] == ' ' ) { -- result += ' '; -- locator.mPos++, x++; -- if ( locator.mText[locator.mPos] == ' ' ) { -- result += " "; -- locator.mPos++, x++; -- } -- } -- locator.mPos--, x--; - continue; - } else if ( ch == '\t' ) { - do -Index: kpimutils/tests/testlinklocator.cpp -=================================================================== ---- kpimutils/tests/testlinklocator.cpp (.../tags/KDE/4.3.0/kdepimlibs) (wersja 1013409) -+++ kpimutils/tests/testlinklocator.cpp (.../branches/KDE/4.3/kdepimlibs) (wersja 1013409) -@@ -19,6 +19,7 @@ - Boston, MA 02110-1301, USA. - */ - #include <qtest_kde.h> -+#include <kdebug.h> - - #include "testlinklocator.h" - #include "testlinklocator.moc" -@@ -104,3 +105,126 @@ - QVERIFY( llq.getEmailAddress() == "f...@bar-bar.baz" ); +--- qgpgme/dataprovider.cpp (.../tags/KDE/4.3.3/kdepimlibs) (wersja 1053997) ++++ qgpgme/dataprovider.cpp (.../branches/KDE/4.3/kdepimlibs) (wersja 1053997) +@@ -23,6 +23,7 @@ + #include <qgpgme/dataprovider.h> + + #include <QIODevice> ++#include <QProcess> + + #include <stdio.h> + #include <string.h> +@@ -159,9 +160,25 @@ + }; } -+void LinkLocatorTest::testGetUrl() -+{ -+ QStringList brackets; -+ brackets << "" << ""; // no brackets -+ brackets << "(" << ")"; -+ brackets << "<" << ">"; -+ brackets << "[" << "]"; -+ brackets << "<link>" << "</link>"; -+ -+ for (int i = 0; i < brackets.count(); i += 2) -+ testGetUrl2(brackets[i], brackets[i+1]); -+} -+ -+void LinkLocatorTest::testGetUrl2(const QString &left, const QString &right) -+{ -+ QStringList schemas; -+ schemas << "http://"; -+ schemas << "https://"; -+ schemas << "vnc://"; -+ schemas << "fish://"; -+ schemas << "ftp://"; -+ schemas << "ftps://"; -+ schemas << "sftp://"; -+ schemas << "smb://"; -+ schemas << "file://"; -+ -+ QStringList urls; -+ urls << "www.kde.org"; -+ urls << "u...@www.kde.org"; -+ urls << "user:p...@www.kde.org"; -+ urls << "user:p...@www.kde.org:1234"; -+ urls << "user:p...@www.kde.org:1234/sub/path"; -+ urls << "user:p...@www.kde.org:1234/sub/path?a=1"; -+ urls << "user:p...@www.kde.org:1234/sub/path?a=1#anchor"; -+ urls << "user:p...@www.kde.org:1234/sub/path/special(123)?a=1#anchor"; -+ urls << "user:p...@www.kde.org:1234/sub/path:with:colon/special(123)?a=1#anchor"; -+ -+ foreach (QString schema, schemas) -+ { -+ foreach (QString url, urls) -+ { -+ QString test(left + schema + url + right); -+ LinkLocator ll(test, left.length()); -+ QString gotUrl = ll.getUrl(); -+ -+ bool ok = ( gotUrl == (schema + url) ); -+ //qDebug() << "check:" << (ok ? "OK" : "NOK") << test << "=>" << (schema + url); -+ QVERIFY2( ok, qPrintable(test) ); -+ } -+ } -+ -+ QStringList urlsWithoutSchema; -+ urlsWithoutSchema << ".kde.org"; -+ urlsWithoutSchema << ".kde.org:1234/sub/path"; -+ urlsWithoutSchema << ".kde.org:1234/sub/path?a=1"; -+ urlsWithoutSchema << ".kde.org:1234/sub/path?a=1#anchor"; -+ urlsWithoutSchema << ".kde.org:1234/sub/path/special(123)?a=1#anchor"; -+ urlsWithoutSchema << ".kde.org:1234/sub/path:with:colon/special(123)?a=1#anchor"; -+ -+ QStringList starts; -+ starts << "www" << "ftp" << "news:www"; -+ -+ foreach (QString start, starts) -+ { -+ foreach (QString url, urlsWithoutSchema) -+ { -+ QString test(left + start + url + right); -+ LinkLocator ll(test, left.length()); -+ QString gotUrl = ll.getUrl(); -+ -+ bool ok = ( gotUrl == (start + url) ); -+ //qDebug() << "check:" << (ok ? "OK" : "NOK") << test << "=>" << (start + url); -+ QVERIFY2( ok, qPrintable(test) ); -+ } -+ } -+ -+ // mailto -+ { -+ QString addr = "mailto:t...@kde.org"; -+ QString test(left + addr + right); -+ LinkLocator ll(test, left.length()); -+ -+ QString gotUrl = ll.getUrl(); -+ -+ bool ok = ( gotUrl == addr ); -+ //qDebug() << "check:" << (ok ? "OK" : "NOK") << test << "=>" << addr; -+ QVERIFY2( ok, qPrintable(test) ); -+ } -+} -+ -+void LinkLocatorTest::testHtmlConvert_data() -+{ -+ QTest::addColumn<QString>("plainText"); -+ QTest::addColumn<int>("flags"); -+ QTest::addColumn<QString>("htmlText"); -+ -+ //QTest::newRow( "" ) << "foo" << 0 << "foo"; -+ //QTest::newRow( "" ) << " foo " << 0 << " foo "; -+ // Linker error when using PreserveSpaces, therefore the hardcoded 0x01 -+ QTest::newRow( "" ) << " foo" << 0x01 << " foo"; -+ QTest::newRow( "" ) << " foo" << 0x01 << " foo"; -+ QTest::newRow( "" ) << " foo " << 0x01 << " foo "; -+ QTest::newRow( "" ) << " foo " << 0x01 << " foo "; -+ QTest::newRow( "" ) << "bla bla bla bla bla" << 0x01 << "bla bla bla bla bla"; -+ QTest::newRow( "" ) << "bla bla bla \n bla bla bla " << 0x01 -+ << "bla bla bla <br />\n bla bla bla "; -+ QTest::newRow( "" ) << "bla bla bla" << 0x01 -+ << "bla bla bla"; -+ QTest::newRow( "" ) << " bla bla \n bla bla a\n bla bla " << 0x01 -+ << " bla bla <br />\n bla bla a<br />\n bla bla "; -+} -+ -+void LinkLocatorTest::testHtmlConvert() -+{ -+ QFETCH(QString, plainText); -+ QFETCH(int, flags); -+ QFETCH(QString, htmlText); ++static qint64 blocking_read( const boost::shared_ptr<QIODevice> & io, char * buffer, qint64 maxSize ) { ++ while ( !io->bytesAvailable() ) ++ if ( !io->waitForReadyRead( -1 ) ) ++ if ( const QProcess * const p = qobject_cast<QProcess*>( io.get() ) ) ++ if ( p->error() == QProcess::UnknownError && ++ p->exitStatus() == QProcess::NormalExit && ++ p->exitCode() == 0 ) ++ return 0; ++ else ++ return errno = EIO, -1; ++ else ++ return 0; // assume EOF (loses error cases :/ ) + -+ QString actualHtml = LinkLocator::convertToHtml( plainText, flags ); -+ QCOMPARE( actualHtml, htmlText ); ++ return io->read( buffer, maxSize ); +} + -+ -Index: kpimutils/tests/testlinklocator.h -=================================================================== ---- kpimutils/tests/testlinklocator.h (.../tags/KDE/4.3.0/kdepimlibs) (wersja 1013409) -+++ kpimutils/tests/testlinklocator.h (.../branches/KDE/4.3/kdepimlibs) (wersja 1013409) -@@ -29,6 +29,12 @@ - Q_OBJECT - private Q_SLOTS: - void testGetEmailAddress(); -+ void testGetUrl(); -+ void testHtmlConvert(); -+ void testHtmlConvert_data(); -+ -+ private: -+ void testGetUrl2(const QString &left, const QString &right); - }; - + ssize_t QIODeviceDataProvider::read( void * buffer, size_t bufSize ) { + #ifndef NDEBUG +- //qDebug( "QIODeviceDataProvider::read( %p, %d )", buffer, bufSize ); ++ //qDebug( "QIODeviceDataProvider::read( %p, %lu )", buffer, bufSize ); #endif -Index: kcal/icalformat_p.cpp -=================================================================== ---- kcal/icalformat_p.cpp (.../tags/KDE/4.3.0/kdepimlibs) (wersja 1013409) -+++ kcal/icalformat_p.cpp (.../branches/KDE/4.3/kdepimlibs) (wersja 1013409) -@@ -629,7 +629,7 @@ - if ( !c.key().startsWith( "X-KDE" ) && //krazy:exclude=strings - !c.key().startsWith( "X-LibKCal" ) && //krazy:exclude=strings - !c.key().startsWith( "X-MICROSOFT" ) && //krazy:exclude=strings -- !c.key().startsWith( "X-MOZILLA" ) && //krazy:exclude=strings -+ !c.key().startsWith( "X-MOZ" ) && //krazy:exclude=strings - !c.key().startsWith( "X-PILOT" ) ) { //krazy:exclude=strings - // use text values for the typical X-FOO property. - // except for vendor specific X-FOO properties. -Index: kcal/incidenceformatter.cpp -=================================================================== ---- kcal/incidenceformatter.cpp (.../tags/KDE/4.3.0/kdepimlibs) (wersja 1013409) -+++ kcal/incidenceformatter.cpp (.../branches/KDE/4.3/kdepimlibs) (wersja 1013409) -@@ -1541,11 +1541,13 @@ - { - if ( incidence && incidence->revision() > 0 && ( existingIncidence || !helper->calendar() ) ) { - html += tdOpen; -- if ( incBase->type() == "Todo" ) { -- //TODO: 4.4, remove the [] -- html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) ); -- } else { -- html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) ); -+ if ( incBase ) { -+ if ( incBase->type() == "Todo" ) { -+ //TODO: 4.4, remove the [] -+ html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) ); -+ } else { -+ html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) ); -+ } - } - html += tdClose; - } -@@ -1589,7 +1591,7 @@ - html += tdClose; - - // Check in calendar -- if ( incBase->type() == "Event" ) { -+ if ( incBase && incBase->type() == "Event" ) { - html += tdOpen; - //TODO: 4.4, remove the [] - //TODO: 4.4, change to "Check calendar" -@@ -1613,10 +1615,12 @@ - html += tdOpen; - //TODO: 4.4, remove the [] - //TODO: 4.4, change string to "Enter this response into my..." -- if ( incBase->type() == "Todo" ) { -- html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) ); -- } else { -- html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) ); -+ if ( incBase ) { -+ if ( incBase->type() == "Todo" ) { -+ html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) ); -+ } else { -+ html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) ); -+ } - } - html += tdClose; - break; -@@ -2228,7 +2232,7 @@ - "Recurs every <numid>%1</numid> months on the %2 %3 until %4", - recur->frequency(), - dayList[rule.pos() + 31], -- calSys->weekDayName( rule.day(),KCalendarSystem::LongDayName ), -+ calSys->weekDayName( rule.day(), KCalendarSystem::LongDayName ), - recurEnd( incidence ) ); - if ( recur->duration() > 0 ) { - txt += i18nc( "number of occurrences", -@@ -2270,20 +2274,22 @@ - case Recurrence::rYearlyMonth: - { - if ( recur->duration() != -1 ) { -- txt = i18ncp( "Recurs Every N years on month-name [1st|2nd|...]" -- " until end-date", -- "Recurs yearly on %2 %3 until %4", -- "Recurs every %1 years on %2 %3 until %4", -- recur->frequency(), -- calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ), -- dayList[ recur->yearDates()[0] + 31 ], -- recurEnd( incidence ) ); -- if ( recur->duration() > 0 ) { -- txt += i18nc( "number of occurrences", -- " (<numid>%1</numid> occurrences)", -- recur->duration() ); -+ if ( !recur->yearDates().isEmpty() ) { -+ txt = i18ncp( "Recurs Every N years on month-name [1st|2nd|...]" -+ " until end-date", -+ "Recurs yearly on %2 %3 until %4", -+ "Recurs every %1 years on %2 %3 until %4", -+ recur->frequency(), -+ calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ), -+ dayList[ recur->yearDates()[0] + 31 ], -+ recurEnd( incidence ) ); -+ if ( recur->duration() > 0 ) { -+ txt += i18nc( "number of occurrences", -+ " (<numid>%1</numid> occurrences)", -+ recur->duration() ); -+ } -+ return txt; + if ( bufSize == 0 ) + return 0; +@@ -172,7 +189,7 @@ + //workaround: some QIODevices (known example: QProcess) might not return 0 (EOF), but immediately -1 when finished. If no + //errno is set, gpgme doesn't detect the error and loops forever. So return 0 on the very first -1 in case errno is 0 + +- const qint64 numRead = mIO->read( static_cast<char*>(buffer), bufSize ); ++ const qint64 numRead = blocking_read( mIO, static_cast<char*>(buffer), bufSize ); + + Enabler en( numRead < 0 ? &mErrorOccurred : 0 ); + if ( numRead < 0 && errno == 0 ) { +@@ -186,7 +203,7 @@ + + ssize_t QIODeviceDataProvider::write( const void * buffer, size_t bufSize ) { + #ifndef NDEBUG +- qDebug( "QIODeviceDataProvider::write( %p, %lu )", buffer, static_cast<unsigned long>( bufSize ) ); ++ //qDebug( "QIODeviceDataProvider::write( %p, %lu )", buffer, static_cast<unsigned long>( bufSize ) ); + #endif + if ( bufSize == 0 ) + return 0; +Index: kresources/kresources.desktop +=================================================================== +--- kresources/kresources.desktop (.../tags/KDE/4.3.3/kdepimlibs) (wersja 1053997) ++++ kresources/kresources.desktop (.../branches/KDE/4.3/kdepimlibs) (wersja 1053997) +@@ -91,7 +91,7 @@ + Comment[sv]=Anpassa KDE-resurser + Comment[th]=ปรับแต่งทรัพยากร KDE + Comment[tr]=KDE Kaynaklarını Yapılandır +-Comment[uk]=Налаштувати ресурси KDE ++Comment[uk]=Налаштування ресурсів даних KDE + Comment[x-test]=xxConfigure KDE Resourcesxx + Comment[zh_CN]=配置 KDE 资源 + Comment[zh_TW]=設定 KDE 資源 +Index: kimap/capabilitiesjob.cpp +=================================================================== +--- kimap/capabilitiesjob.cpp (.../tags/KDE/4.3.3/kdepimlibs) (wersja 1053997) ++++ kimap/capabilitiesjob.cpp (.../branches/KDE/4.3/kdepimlibs) (wersja 1053997) +@@ -68,7 +68,7 @@ + if ( response.content.size() >= 2 + && response.content[1].toString()=="CAPABILITY" ) { + for (int i=2; i<response.content.size(); ++i) { +- d->capabilities << response.content[i].toString(); ++ d->capabilities << response.content[i].toString().toUpper(); } -- return txt; + emit capabilitiesReceived(d->capabilities); } - if ( !recur->yearDates().isEmpty() ) { - return i18ncp( "Recurs Every N years on month-name [1st|2nd|...]", -Index: kcal/attendee.cpp -=================================================================== ---- kcal/attendee.cpp (.../tags/KDE/4.3.0/kdepimlibs) (wersja 1013409) -+++ kcal/attendee.cpp (.../branches/KDE/4.3/kdepimlibs) (wersja 1013409) -@@ -153,6 +153,9 @@ - case InProcess: - return i18nc( "@item to-do in process of being completed", "In Process" ); - break; -+ case None: -+ return i18nc( "@item event or to-do status unknown", "Unknown" ); -+ break; - } - } - -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (.../tags/KDE/4.3.0/kdepimlibs) (wersja 1013409) -+++ CMakeLists.txt (.../branches/KDE/4.3/kdepimlibs) (wersja 1013409) -@@ -42,8 +42,8 @@ - - if (NOT KDEPIM_ONLY_KLEO) - #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that. -- find_package(Akonadi 1.1.91 QUIET NO_MODULE) -- macro_log_feature(Akonadi_FOUND "Akonadi" "Akonadi server (from kdesupport)" "http://pim.kde.org/akonadi" TRUE "1.1.95" "Akonadi is required to build KdepimLibs.") -+ find_package(Akonadi 1.2.0 QUIET NO_MODULE) -+ macro_log_feature(Akonadi_FOUND "Akonadi" "Akonadi server (from kdesupport)" "http://pim.kde.org/akonadi" TRUE "1.2.0" "Akonadi is required to build KdepimLibs.") - - find_package(Sasl2) - macro_log_feature(SASL2_FOUND "cyrus-sasl" "Cyrus SASL API" "http://asg.web.cmu.edu/sasl/sasl-library.html" TRUE "" "Required to support authentication of logins in the IMAP and Sieve kioslaves.") -Index: kioslave/pop3/pop3.cpp +Index: kcal/local.desktop =================================================================== ---- kioslave/pop3/pop3.cpp (.../tags/KDE/4.3.0/kdepimlibs) (wersja 1013409) -+++ kioslave/pop3/pop3.cpp (.../branches/KDE/4.3/kdepimlibs) (wersja 1013409) -@@ -470,7 +470,7 @@ - myReadLine(buf, sizeof(buf) - 1); - - // HACK: This assumes fread stops at the first \n and not \r -- if (strcmp(buf, ".\r\n") == 0) { -+ if ( (buf[0] == 0) || (strcmp(buf, ".\r\n") == 0) ) { - break; // End of data - } - // sanders, changed -2 to -1 below -@@ -831,7 +831,7 @@ - myReadLine(buf, sizeof(buf) - 1); - - // HACK: This assumes fread stops at the first \n and not \r -- if (strcmp(buf, ".\r\n") == 0) { -+ if ( (buf[0] == 0) || (strcmp(buf, ".\r\n") == 0) ) { - break; // End of data - } - // sanders, changed -2 to -1 below -Index: kholidays/holidays/holiday_cn -=================================================================== ---- kholidays/holidays/holiday_cn (.../tags/KDE/4.3.0/kdepimlibs) (wersja 0) -+++ kholidays/holidays/holiday_cn (.../branches/KDE/4.3/kdepimlibs) (wersja 1013409) -@@ -0,0 +1,40 @@ -+: This file is UTF-8 encoded -+: Holiday file for P.R. China -+: Data from http://en.wikipedia.org/w/index.php?title=Public_holidays_in_the_People%27s_Republic_of_China&oldid=297123230 -+: Author: Patrick Nagel <m...@patrick-nagel.net> +--- kcal/local.desktop (.../tags/KDE/4.3.3/kdepimlibs) (wersja 1053997) ++++ kcal/local.desktop (.../branches/KDE/4.3/kdepimlibs) (wersja 1053997) +@@ -46,7 +46,7 @@ + Comment[ca]=Proporciona l'accés a un calendari emmagatzemat en un fitxer local individual + Comment[cs]=Poskytuje přístup ke kalendáři uloženém v jednom lokálním souboru + Comment[da]=Giver adgang til en kalender lagret i en enkelt lokal fil +-Comment[de]=Ermöglicht Zugriff auf einen Kalender, der in einer einzigen Dateien lokal gespeichert ist ++Comment[de]=Ermöglicht Zugriff auf einen Kalender, der in einer einzigen Datei lokal gespeichert ist + Comment[el]=Προσφέρει πρόσβαση σε ένα ημερολόγιο αποθηκευμένο σε ένα τοπικό αρχείο + Comment[en_GB]=Provides access to a calendar stored in a single local file + Comment[es]=Provee acceso a un calendario almacenado en un único archivo local +Index: gpgme++/ConfigureChecks.cmake +=================================================================== +--- gpgme++/ConfigureChecks.cmake (.../tags/KDE/4.3.3/kdepimlibs) (wersja 1053997) ++++ gpgme++/ConfigureChecks.cmake (.../branches/KDE/4.3/kdepimlibs) (wersja 1053997) +@@ -4,6 +4,7 @@ + if ( GPGME_FOUND ) + + set(CMAKE_REQUIRED_INCLUDES ${GPGME_INCLUDES}) ++set(CMAKE_REQUIRED_DEFINITIONS ${KDE4_DEFINITIONS}) + set(CMAKE_REQUIRED_LIBRARIES) + foreach( _FLAVOUR VANILLA PTHREAD QT PTH GLIB ) + if ( NOT CMAKE_REQUIRED_LIBRARIES ) +Index: kholidays/holidays/holiday_luLuxembourgish +=================================================================== +--- kholidays/holidays/holiday_luLuxembourgish (.../tags/KDE/4.3.3/kdepimlibs) (wersja 0) ++++ kholidays/holidays/holiday_luLuxembourgish (.../branches/KDE/4.3/kdepimlibs) (wersja 1053997) +@@ -0,0 +1,18 @@ +: -+"元旦 (New Year)" weekend on 1 january -+magenta "国际妇女节 (International Women's Day)" on 8 march -+black "植树节 (Arbor Day)" on 12 march -+"劳动节 (Labor Day)" weekend on 1 may -+blue "青年节 (Youth Day)" on 4 may -+cyan "六一儿童节 (Children's Day)" on 1 june -+black "建党节 (CPC Founding Day)" on 1 july -+green "建军节 (Army Day)" on 1 august -+"国庆节 (National Day)" weekend on 1 october length 3 days ++: Luxembourg holiday file. Copy to ~/.holiday +: -+: Lunar calendar based holidays -+: and special free (on weekdays) / work (on weekends) arrangements for 2009 -+: yellow for free days, red for working days -+: Data from http://cnreviews.com/life/living-in-china/china_public_holiday_2009_20081210.html -+: and various en.wikipedia.org pages ++: Author: Georges Toth, <gt...@trypill.org> ++: Adapted from Belgium (French) holiday by Guido van Rossum, CWI, Amsterdam <guido.van.ros...@cwi.nl> +: -+yellow "节假日 (day off)" weekend on 2 january 2009 -+red "工作日 (working day)" on 4 january 2009 -+red "工作日 (working day)" on 24 january 2009 -+"春节 (Chinese New Year / Spring Festival)" weekend on 25 january 2009 length 3 days -+yellow "节假日 (day off)" weekend on 28 january 2009 length 3 days -+red "工作日 (working day)" on 1 february 2009 -+black "元宵节 (Lantern Festival)" on 9 february 2009 -+"清明节 (Qing Ming Festival / Tomb Sweeping Day)" weekend on 4 april 2009 -+yellow "节假日 (day off)" weekend on 6 april 2009 -+"端午节 (Dragon Boat Festival)" weekend on 28 may 2009 -+yellow "节假日 (day off)" weekend on 29 may 2009 -+red "工作日 (working day)" on 31 may 2009 -+black "七夕节 Lover's Day" on 26 august 2009 -+: black "中元节 Ghost Festival" on 3 september 2009 -+red "工作日 (working day)" on 27 september 2009 -+"中秋节 (Mid-Autumn Festival)" weekend on 3 october 2009 -+yellow "节假日 (day off)" weekend on 5 october 2009 length 4 days -+red "工作日 (working day)" on 10 october 2009 -+black "重阳节 (Double Ninth Day / Elders' Day)" on 26 october 2009 ++small "Neijoerschdag" weekend on 1.1 ++small "Ouschteren" weekend on easter ++small "Ouschterméindeg" weekend on easter plus 1 day ++small "Éischte Mee" weekend on 1.5 ++small "Christihimmelfahrt" weekend on easter plus 39 days ++small "Péngschten" weekend on easter plus 49 days ++small "Päischtméindeg" weekend on easter plus 50 days ++small "Nationale Feierdag" weekend on 23.6 ++small "Maria Himmelfahrt" weekend on 15.8 ++small "Allerhellegen" weekend on 1.11 ++small "Chrëschtdag" weekend on 25.12 ++small "Stiefesdag" weekend on 26.12 +Index: kholidays/holidays/holiday_co +=================================================================== +--- kholidays/holidays/holiday_co (.../tags/KDE/4.3.3/kdepimlibs) (wersja 1053997) ++++ kholidays/holidays/holiday_co (.../branches/KDE/4.3/kdepimlibs) (wersja 1053997) +@@ -1,27 +1,38 @@ + : +-: Archivo holiday_colombia. Cópialo a ~/.holiday +-: Modifica este archivo borrando y añadiendo lo que te parezca. ++: Colombia holiday file + : +-: Festivos +-: +-red "Año nuevo" red on january 1 +-red "Reyes magos" red on monday after january 6 +-red "San José" red on march 24 +-red "Día del Trabajo" red on may 1 +-red "Dia de la ascención" red on june 2 +-red "Día del Corpus" red on monday after june 23 +-red "San Pedro y San Pablo" red on monday after june 30 +-red "Sagrado Corazón" red on monday after june 30 +-red "Día de la Independencia" red on july 20 +-red "Fiesta de la Batalla de Boyaca" red on august 7 +-red "Asunción" red on monday after august 18 +-red "Día de la Raza" red on october 13 +-red "Todos los Santos" red on monday after november 3 +-red "Independencia de Cartagena" red on november 17 +-red "La Inmaculada" red on december 8 +-red "Día de Navidad" red on december 25 ++: See more ++: http://es.wikipedia.org/wiki/Fiestas_de_Colombia + : +-: Relacionados con la pascua + : +-small "Jueves Santo" weekend on easter minus 3 days +-small "Viernes Santo" weekend on easter minus 2 days ++: Author: Xavier Corredor Llano <xavier.corredor.llano <a> gmail.com> ++ <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff?r1=1.15&r2=1.16&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs.spec?r1=1.97&r2=1.98&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit