=== modified file 'debian/changelog' --- debian/changelog 2011-06-12 17:49:48 +0000 +++ debian/changelog 2011-06-15 07:41:47 +0000 @@ -1,3 +1,35 @@ +kdepim (4:4.6.0-0ubuntu0~ppa6) oneiric; urgency=low + + * New upstream release + - new dep: libqtwebkit-dev, dblatex, libgrantlee-dev + - added: + - libksieveui4, libkmanagesieve4 + - libtemplateparser4, libincidenceeditorsng4 + - libincidenceeditorsng4-mobile, libkdepimui-mobile + - libkdgantt2, libcalendarsupport4, libeventviews4 + - libmessagecomposer4, libmailcommon4 + - libkdepimdbusinterfaces4 + - added mobile: + - kaddressbook-mobile + - kmail-mobile + - knotes-mobile + - kontact-mobile + - korganizer-mobile + - tasks-mobile + - replaces added: + - kdepim-kresources + - kleopatra + - libmessagelist4 + - libmessageviewer0 + - droped + - libmime + - added missing , between pkg-config and kdelibs5-dev + - updated kubuntu_install_headers.diff + - droped displaying_only_unread_issue.diff + - droped kubuntu_kalarm_kstatusnotifier.diff + + -- Jonathan Kolberg Sun, 12 Jun 2011 20:44:57 +0200 + kdepim (4:4.4.11.1-0ubuntu1) UNRELEASED; urgency=low * Merge from debian, remaining changes === modified file 'debian/control' --- debian/control 2011-06-12 17:49:48 +0000 +++ debian/control 2011-06-15 07:41:47 +0000 @@ -7,14 +7,15 @@ Armin Berres , Modestas Vainius , Michael Meskes , José Manuel Santamaría Lema Build-Depends: kde-sc-dev-latest (>= 4:4.6.3), - cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), pkg-config + cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), pkg-config, kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), libphonon-dev (>= 4:4.6.0really4.3.80), libgpgme11-dev, libboost1.46-dev, libboost-graph1.46-dev, libsasl2-dev, xsltproc, libxss-dev, libqca2-dev (>= 2.0.0), libassuan-dev, libstreams-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3), libsearchclient-dev (>= 0.6.3), libstrigihtmlgui-dev (>= 0.6.3), libstrigiqtdbusclient-dev (>= 0.6.3), zlib1g-dev, libakonadi-dev (>= 1.3.0), libpisock-dev, shared-desktop-ontologies (>= 0.2), - libindicate-qt-dev (>= 0.2.5.91), libxml2-dev, sharutils + libindicate-qt-dev (>= 0.2.5.91), libxml2-dev, sharutils, libqt4-opengl-dev, libqtwebkit-dev, + dblatex, libgrantlee-dev Standards-Version: 3.9.2 Homepage: http://pim.kde.org/ Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git @@ -66,7 +67,7 @@ libmimelib4 (= ${binary:Version}) | libmessagecore4 (= ${binary:Version}) | libmessagelist4 (= ${binary:Version}) | - libmessageviewer0 (= ${binary:Version}) + libmessageviewer4 (= ${binary:Version}) Breaks: kdeutils-dbg (<< 4:4.0.80) Replaces: kdeutils-dbg (<< 4:4.0.80) Architecture: any @@ -130,6 +131,20 @@ . This package is part of the KDE PIM module. +Package: kaddressbook-mobile +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: kdepim-kresources +Replaces: kontact (<< 4:4.5.80) +Description: address book and contact data manager mobile version + KAddressBook enables you to manage your contacts efficiently and comfortably. + It can load and save your contacts to many different locations, including + the local file system, LDAP servers, and SQL databases. This is the mobile + version. + . + This package is part of the KDE PIM module. + Package: kalarm Section: kde Architecture: any @@ -156,8 +171,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: korganizer Suggests: knotes -Breaks: korganizer (<< 4:4.2.85) -Replaces: korganizer (<< 4:4.2.85) +Breaks: korganizer (<< 4:4.2.85), libkdepim4 (<< 4:4.5.80), kdepim-groupware (<< 4:4.5.96) +Replaces: korganizer (<< 4:4.2.85), libkdepim4 (<< 4:4.5.80), kdepim-groupware (<< 4:4.5.96) Description: KDE PIM resource plugins This package adds more resource plugins for KDE PIM applications such as blogging, tracking feature plans etc. @@ -211,6 +226,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt4 +Replaces: kdepim-doc (<< 4:4.4.60) Description: certificate Manager Kleopatra is a tool for managing X.509 certificates and pgp keys. . @@ -235,6 +251,25 @@ . This package is part of the KDE PIM module. +Package: kmail-mobile +Section: mail +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, kdepim-runtime +Recommends: gnupg2, gnupg, gnupg-agent, pinentry-qt4 +Suggests: kaddressbook-mobile, procmail, kleopatra, spamassassin | bogofilter | spambayes | bsfilter | crm114, clamav +Replaces: kontact (<< 4:4.5.80) +Provides: imap-client, mail-reader +Homepage: http://kontact.kde.org/kmail/ +Description: full featured graphical email client mobile version + KMail is a fully-featured email client that fits nicely into the KDE + desktop. It has features such as support for IMAP, POP3, multiple accounts, + mail filtering and sorting, PGP/GnuPG privacy, and inline attachments. + This is the mobile version of KMail. + . + This package also contains Nepomuk EMail Feeder Akonadi Agent. + . + This package is part of the KDE PIM module. + # Package: kmobiletools # Section: utils # Architecture: any @@ -279,6 +314,20 @@ . This package is part of the KDE PIM module. +Package: knotes-mobile +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, kdepim-runtime +Suggests: kdepim-kresources +Replaces: kontact (<< 4:4.5.80) +Description: sticky notes application mobile version + KNotes is a program that lets you write sticky notes. The notes are saved + automatically when you exit the program, and they display when you open the + program. The program supports printing and mailing your notes. This is the + mobile version of it. + . + This package is part of the KDE PIM module. + Package: konsolekalendar Section: kde Architecture: any @@ -307,6 +356,17 @@ . This package is part of the KDE PIM module. +Package: kontact-mobile +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, kdepim-runtime +Recommends: kmail-mobile, knotes-mobile, tasks-mobile, kaddressbook-mobile, korganizer-mobile +Homepage: http://kontact.kde.org/ +Description: metapackage for mobile kde pim stack + This is a metapackage for the mobile KDE Pim stack. + . + This package is part of the KDE PIM module. + Package: korganizer Section: kde Architecture: any @@ -326,6 +386,26 @@ . This package is part of the KDE PIM module. +Package: korganizer-mobile +Section: kde +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, + akonadi-server (>= 1.1.1 ), kdepim-runtime +Suggests: kdepim-kresources, kdepim-groupware +Homepage: http://kontact.kde.org/korganizer/ +Replaces: kontact (<< 4:4.5.80) +Description: calendar and personal organizer + This package contains a mobile version of KOrganizer, a calendar + and scheduling program. + . + KOrganizer aims to be a complete program for organizing appointments, + contacts, projects, etc. KOrganizer natively supports information interchange + with other calendar applications, through the industry standard vCalendar + personal data interchange file format. This eases the move from other + modern PIMs to KOrganizer. + . + This package is part of the KDE PIM module. + Package: ktimetracker Section: utils Architecture: any @@ -379,42 +459,151 @@ . This package is part of the KDE PIM module. -Package: libmimelib4 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: MIME library - This library is used by several applications from KDE PIM module to handle MIME - types. - . - This is the runtime package for programs that use the libmimelib library. - . - This package is part of KDE PIM module. +Package: libksieveui4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: mail/news message ui filtering library + This is the runtime package for programs that use the libksieveui library. + . + This package is part of the KDE PIM module. + +Package: libkmanagesieve4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: manageing mail/news message filtering library + This is the runtime package for programs that use the libkmanagesieve library. + . + This package is part of the KDE PIM module. + +Package: libmailcommon4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: common mail libary + This is the runtime package for programs that use the libmailcommon library. + . + This package is part of the KDE PIM module. + +Package: libkdepimdbusinterfaces4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.5.96) +Breaks: libkdepim4 (<< 4:4.5.96) +Description: kde pim dbusinterface libary + This is the runtime package for programs that use the dbusinterface library. + . + This package is part of the KDE PIM module. + +Package: libtemplateparser4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.5.80) +Description: template parser library + This package contains the template parser library. + . + This package is part of the KDE PIM module. + +Package: libincidenceeditorsng4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.5.80) +Description: incidenteditor library + This package contains libincidenceeditorsng. + . + This package is part of the KDE PIM module. + +Package: libincidenceeditorsng4-mobile +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.5.80) +Description: mobile version of incidenteditor library + This package contains the mobile version of libincidenceeditorsng. + . + This package is part of the KDE PIM module. + +Package: libkdepimui-mobile +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.5.80) +Description: kdepim mobile ui library + This package contains the mobile kdepim ui library. + . + This package is part of the KDE PIM module. + +Package: libkdgantt2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.5.80) +Description: kdgantt library + This package contains the kdgantt library. + . + This package is part of the KDE PIM module. + +Package: libcalendarsupport4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.5.80) +Description: calendar support library + This package contains the calendar support library. + . + This package is part of the KDE PIM module. + +Package: libeventviews4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.5.80) +Description: event view library + This package contains the event view library. + . + This package is part of the KDE PIM module. Package: libmessagecore4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.4.60) Description: message core library This package contains the message core library. It provides basic e-mail message handling facilities. . This package is part the KDE PIM module. +Package: libmessagecomposer4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.5.80) +Description: message composer library + This package contains the message composer library. FIXME: what does this lib? + . + This package is part of the KDE PIM module. + Package: libmessagelist4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.4.60) Description: message list library This package contains the message list library. It provides a widget for the e-mail message lists with extensive filtering, grouping and useful features. . This package is part of the KDE PIM module. -Package: libmessageviewer0 +Package: libmessageviewer4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libkdepim4 (<< 4:4.4.60), libmessageviewer0 Description: message viewer library This package contains the message viewer library which implements feature-rich and highly configurable widget for viewing e-mail messages. @@ -482,3 +671,12 @@ debugging but may also prove handy in other cases. . This package is part of the KDE PIM module. + +Package: tasks-mobile +Section: kde +Depends: ${shlibs:Depends}, ${misc:Depends}, kdepim-runtime +Replaces: kdepim-runtime (<< 4:4.5.80) +Description: task managment for mobile devices + This package provides an task management for mobile devices. + . + This package is part of the KDE PIM module. === modified file 'debian/docs' --- debian/docs 2008-12-04 07:42:36 +0000 +++ debian/docs 2011-06-15 07:41:47 +0000 @@ -1,3 +1,2 @@ README -README.Kolab -usability-quick-review.txt +README.packagers \ No newline at end of file === modified file 'debian/kalarm.install' --- debian/kalarm.install 2010-12-06 14:48:04 +0000 +++ debian/kalarm.install 2011-06-15 07:41:47 +0000 @@ -27,7 +27,6 @@ usr/share/kde4/apps/kalarm/icons/oxygen/22x22/actions/kalarm-disabled.png usr/share/kde4/apps/kalarm/icons/oxygen/22x22/actions/new-audio-alarm.png usr/share/kde4/apps/kalarm/icons/oxygen/22x22/actions/new-command-alarm.png -usr/share/kde4/apps/kalarm/icons/oxygen/22x22/emblems/partdisabled.png usr/share/kde4/apps/kalarm/kalarmui.rc usr/share/kde4/apps/kconf_update/kalarm-1.2.1-general.pl usr/share/kde4/apps/kconf_update/kalarm-1.9.5-defaults.pl === modified file 'debian/kdepim-dev.install' --- debian/kdepim-dev.install 2010-02-28 20:37:49 +0000 +++ debian/kdepim-dev.install 2011-06-15 07:41:47 +0000 @@ -2,56 +2,6 @@ # if there's need for these files one day, we can reconsider thid decision. # backed up upstream... -usr/include/kleo/abstractimportjob.h -usr/include/kleo/adduseridjob.h -usr/include/kleo/changeexpiryjob.h -usr/include/kleo/changeownertrustjob.h -usr/include/kleo/cryptobackend.h -usr/include/kleo/cryptobackendfactory.h -usr/include/kleo/cryptoconfig.h -usr/include/kleo/cryptplug.h -usr/include/kleo/cryptplugfactory.h -usr/include/kleo/cryptplugwrapper.h -usr/include/kleo/cryptplugwrapperlist.h -usr/include/kleo/decryptjob.h -usr/include/kleo/decryptverifyjob.h -usr/include/kleo/deletejob.h -usr/include/kleo/dn.h -usr/include/kleo/downloadjob.h -usr/include/kleo/encryptjob.h -usr/include/kleo/enum.h -usr/include/kleo/exportjob.h -usr/include/kleo/hierarchicalkeylistjob.h -usr/include/kleo/importfromkeyserverjob.h -usr/include/kleo/importjob.h -usr/include/kleo/job.h -usr/include/kleo/keyfilter.h -usr/include/kleo/keyfiltermanager.h -usr/include/kleo/keygenerationjob.h -usr/include/kleo/keylistjob.h -usr/include/kleo/kleo_export.h -usr/include/kleo/multideletejob.h -usr/include/kleo/oidmap.h -usr/include/kleo/refreshkeysjob.h -usr/include/kleo/signencryptjob.h -usr/include/kleo/signjob.h -usr/include/kleo/signkeyjob.h -usr/include/kleo/specialjob.h -usr/include/kleo/ui/backendconfigwidget.h -usr/include/kleo/ui/cryptoconfigdialog.h -usr/include/kleo/ui/cryptoconfigmodule.h -usr/include/kleo/ui/directoryserviceswidget.h -usr/include/kleo/ui/dnattributeorderconfigwidget.h -usr/include/kleo/ui/kdhorizontalline.h -usr/include/kleo/ui/keyapprovaldialog.h -usr/include/kleo/ui/keylistview.h -usr/include/kleo/ui/keyrequester.h -usr/include/kleo/ui/keyselectiondialog.h -usr/include/kleo/ui/messagebox.h -usr/include/kleo/ui/progressbar.h -usr/include/kleo/ui/progressdialog.h -usr/include/kleo/verifydetachedjob.h -usr/include/kleo/verifyopaquejob.h usr/include/kpgp/kpgp.h usr/include/kpgp/kpgpbase.h usr/include/kpgp/kpgpblock.h @@ -64,42 +14,28 @@ usr/include/libkleopatraclient/core/signencryptfilescommand.h usr/include/libkleopatraclient/gui/certificaterequester.h usr/include/libkleopatraclient/kleopatraclient_export.h -usr/lib/libakonadi-kcal_next.so usr/lib/libakonadi_next.so usr/lib/libakregatorinterfaces.so usr/lib/libgwsoap.so -usr/lib/libkabc_groupdav.so -usr/lib/libkabc_slox.so usr/lib/libkabcgroupwise.so -usr/lib/libkabckolab.so usr/lib/libkalarm_calendar.so -usr/lib/libkalarm_resources.so -usr/lib/libkcal_groupdav.so usr/lib/libkcal_resourceblog.so usr/lib/libkcal_resourceremote.so -usr/lib/libkcal_slox.so usr/lib/libkcalgroupwise.so -usr/lib/libkcalkolab.so usr/lib/libkdepim.so -usr/lib/libkgroupwarebase.so -usr/lib/libkgroupwaredav.so +usr/lib/libkdgantt2.so usr/lib/libkleo.so usr/lib/libkleopatraclientcore.so usr/lib/libkleopatraclientgui.so usr/lib/libknodecommon.so -usr/lib/libknoteskolab.so -usr/lib/libkorg_stdprinting.so -usr/lib/libkorganizer_calendar.so usr/lib/libkorganizer_core.so -usr/lib/libkorganizer_eventviewer.so usr/lib/libkorganizer_interfaces.so usr/lib/libkpgp.so usr/lib/libksieve.so -usr/lib/libkslox.so +usr/lib/libksieveui.so +usr/lib/libkmanagesieve.so usr/lib/libmessagecore.so usr/lib/libmessagelist.so -usr/lib/libmessageviewer.so -usr/lib/libmimelib.so usr/share/dbus-1/interfaces/org.kde.KNotes.xml usr/share/dbus-1/interfaces/org.kde.Korganizer.Calendar.xml usr/share/dbus-1/interfaces/org.kde.addressbook.service.xml @@ -107,7 +43,6 @@ usr/share/dbus-1/interfaces/org.kde.kalarm.kalarm.xml usr/share/dbus-1/interfaces/org.kde.kmail.kmail.xml usr/share/dbus-1/interfaces/org.kde.kmail.kmailpart.xml -usr/share/dbus-1/interfaces/org.kde.kmail.mailcomposer.xml usr/share/dbus-1/interfaces/org.kde.knode.xml usr/share/dbus-1/interfaces/org.kde.kontact.KNotes.xml usr/share/dbus-1/interfaces/org.kde.korganizer.KOrgac.xml === modified file 'debian/kdepim-doc.install' --- debian/kdepim-doc.install 2010-05-20 23:07:50 +0000 +++ debian/kdepim-doc.install 2011-06-15 07:41:47 +0000 @@ -49,6 +49,9 @@ usr/share/doc/kde/HTML/en/kjots/common usr/share/doc/kde/HTML/en/kjots/index.cache.bz2 usr/share/doc/kde/HTML/en/kjots/index.docbook +usr/share/doc/kde/HTML/en/kleopatra/common +usr/share/doc/kde/HTML/en/kleopatra/index.cache.bz2 +usr/share/doc/kde/HTML/en/kleopatra/index.docbook usr/share/doc/kde/HTML/en/kmail/common usr/share/doc/kde/HTML/en/kmail/configure.docbook usr/share/doc/kde/HTML/en/kmail/credits-and-licenses.docbook === modified file 'debian/kdepim-groupware.install' --- debian/kdepim-groupware.install 2010-11-25 01:24:12 +0000 +++ debian/kdepim-groupware.install 2011-06-15 07:41:47 +0000 @@ -1,53 +1,9 @@ -usr/lib/kde4/kabc_groupdav.so -usr/lib/kde4/kabc_groupwise.so -usr/lib/kde4/kabc_kolab.so -usr/lib/kde4/kabc_slox.so -usr/lib/kde4/kcal_groupdav.so -usr/lib/kde4/kcal_groupwise.so -usr/lib/kde4/kcal_kolab.so -usr/lib/kde4/kcal_slox.so usr/lib/kde4/kio_groupwise.so -usr/lib/kde4/knotes_kolab.so usr/lib/libgwsoap.so.4 usr/lib/libgwsoap.so.4.6.0 -usr/lib/libkabc_groupdav.so.4 -usr/lib/libkabc_groupdav.so.4.6.0 -usr/lib/libkabc_slox.so.4 -usr/lib/libkabc_slox.so.4.6.0 usr/lib/libkabcgroupwise.so.4 usr/lib/libkabcgroupwise.so.4.6.0 -usr/lib/libkabckolab.so.4 -usr/lib/libkabckolab.so.4.6.0 -usr/lib/libkcal_groupdav.so.4 -usr/lib/libkcal_groupdav.so.4.6.0 -usr/lib/libkcal_slox.so.4 -usr/lib/libkcal_slox.so.4.6.0 usr/lib/libkcalgroupwise.so.4 usr/lib/libkcalgroupwise.so.4.6.0 -usr/lib/libkcalkolab.so.4 -usr/lib/libkcalkolab.so.4.6.0 -usr/lib/libkgroupwarebase.so.4 -usr/lib/libkgroupwarebase.so.4.6.0 -usr/lib/libkgroupwaredav.so.4 -usr/lib/libkgroupwaredav.so.4.6.0 -usr/lib/libknoteskolab.so.4 -usr/lib/libknoteskolab.so.4.6.0 -usr/lib/libkslox.so.4 -usr/lib/libkslox.so.4.6.0 -usr/share/kde4/apps/kconf_update/kolab-resource.upd -usr/share/kde4/apps/kconf_update/upgrade-resourcetype.pl usr/share/kde4/services/groupwise.protocol usr/share/kde4/services/groupwises.protocol -usr/share/kde4/services/kresources/kabc/kabc_groupdav.desktop -usr/share/kde4/services/kresources/kabc/kabc_groupwise.desktop -usr/share/kde4/services/kresources/kabc/kabc_opengroupware.desktop -usr/share/kde4/services/kresources/kabc/kabc_ox.desktop -usr/share/kde4/services/kresources/kabc/kabc_slox.desktop -usr/share/kde4/services/kresources/kabc/kolab.desktop -usr/share/kde4/services/kresources/kcal/kcal_groupdav.desktop -usr/share/kde4/services/kresources/kcal/kcal_groupwise.desktop -usr/share/kde4/services/kresources/kcal/kcal_opengroupware.desktop -usr/share/kde4/services/kresources/kcal/kcal_ox.desktop -usr/share/kde4/services/kresources/kcal/kcal_slox.desktop -usr/share/kde4/services/kresources/kcal/kolab.desktop -usr/share/kde4/services/kresources/knotes/kolabresource.desktop === modified file 'debian/kdepim-kresources.install' --- debian/kdepim-kresources.install 2010-11-25 01:24:12 +0000 +++ debian/kdepim-kresources.install 2011-06-15 07:41:47 +0000 @@ -1,8 +1,10 @@ +usr/lib/kde4/kabc_groupwise.so usr/lib/kde4/kcal_blog.so -usr/lib/kde4/kcal_kabc.so +usr/lib/kde4/kcal_groupwise.so usr/lib/kde4/kcal_remote.so usr/lib/libkcal_resourceblog.so.4 usr/lib/libkcal_resourceblog.so.4.6.0 +usr/share/kde4/services/kresources/kabc/kabc_groupwise.desktop usr/share/kde4/services/kresources/kcal/blog.desktop -usr/share/kde4/services/kresources/kcal/kabc.desktop +usr/share/kde4/services/kresources/kcal/kcal_groupwise.desktop usr/share/kde4/services/kresources/kcal/remote.desktop === modified file 'debian/kdepim-wizards.install' --- debian/kdepim-wizards.install 2009-12-07 14:51:25 +0000 +++ debian/kdepim-wizards.install 2011-06-15 07:41:47 +0000 @@ -1,8 +1,4 @@ usr/bin/groupwarewizard usr/bin/groupwisewizard -usr/bin/kolabwizard -usr/bin/sloxwizard usr/share/applications/kde4/groupwarewizard.desktop usr/share/kde4/config.kcfg/groupwise.kcfg -usr/share/kde4/config.kcfg/kolab.kcfg -usr/share/kde4/config.kcfg/slox.kcfg === modified file 'debian/kleopatra.install' --- debian/kleopatra.install 2010-05-20 23:07:50 +0000 +++ debian/kleopatra.install 2011-06-15 07:41:47 +0000 @@ -3,24 +3,11 @@ usr/bin/kwatchgnupg usr/lib/kde4/kcm_kleopatra.so usr/lib/libkleopatraclientcore.so.0 -usr/lib/libkleopatraclientcore.so.0.2.1 +usr/lib/libkleopatraclientcore.so.0.3.0 usr/lib/libkleopatraclientgui.so.0 -usr/lib/libkleopatraclientgui.so.0.2.1 +usr/lib/libkleopatraclientgui.so.0.3.0 usr/share/applications/kde4/kleopatra.desktop usr/share/applications/kde4/kleopatra_import.desktop -usr/share/doc/kde/HTML/en/kleopatra/common -usr/share/doc/kde/HTML/en/kleopatra/index.cache.bz2 -usr/share/doc/kde/HTML/en/kleopatra/index.docbook -usr/share/doc/kde/HTML/en/kwatchgnupg/common -usr/share/doc/kde/HTML/en/kwatchgnupg/index.cache.bz2 -usr/share/doc/kde/HTML/en/kwatchgnupg/index.docbook -usr/share/icons/oxygen/128x128/apps/kleopatra.png -usr/share/icons/oxygen/16x16/apps/kleopatra.png -usr/share/icons/oxygen/22x22/apps/kleopatra.png -usr/share/icons/oxygen/32x32/apps/kleopatra.png -usr/share/icons/oxygen/48x48/apps/kleopatra.png -usr/share/icons/oxygen/64x64/apps/kleopatra.png -usr/share/icons/oxygen/scalable/apps/kleopatra.svgz usr/share/kde4/apps/kleopatra/kleopatra.rc usr/share/kde4/apps/kleopatra/pics/gpg4win-compact.png usr/share/kde4/apps/kleopatra/pics/gpg4win.png @@ -39,8 +26,8 @@ usr/share/kde4/apps/libkleopatra/pics/hi32-app-gpgsm.png usr/share/kde4/apps/libkleopatra/pics/smartcard.xpm usr/share/kde4/services/kleopatra_config_appear.desktop +usr/share/kde4/services/kleopatra_config_cryptooperations.desktop usr/share/kde4/services/kleopatra_config_dirserv.desktop -usr/share/kde4/services/kleopatra_config_dnorder.desktop usr/share/kde4/services/kleopatra_config_gnupgsystem.desktop usr/share/kde4/services/kleopatra_config_smimevalidation.desktop usr/share/kde4/services/kleopatra_decryptverifyfiles.desktop === modified file 'debian/kmail.install' --- debian/kmail.install 2010-11-25 01:24:12 +0000 +++ debian/kmail.install 2011-06-15 07:41:47 +0000 @@ -7,16 +7,11 @@ usr/bin/kmailcvt usr/lib/kde4/kcm_kmail.so usr/lib/kde4/kcm_kmailsummary.so -usr/lib/kde4/kmail_bodypartformatter_application_octetstream.so -usr/lib/kde4/kmail_bodypartformatter_text_calendar.so -usr/lib/kde4/kmail_bodypartformatter_text_vcard.so -usr/lib/kde4/kmail_bodypartformatter_text_xdiff.so usr/lib/kde4/kmailpart.so usr/lib/kde4/kontact_kmailplugin.so usr/lib/libkmailprivate.so.4 usr/lib/libkmailprivate.so.4.6.0 #usr/share/akonadi/agents/nepomukemailfeeder.desktop -usr/share/applications/kde4/KMail.desktop usr/share/applications/kde4/kmail_view.desktop usr/share/icons/hicolor/128x128/apps/kmail.png usr/share/icons/hicolor/16x16/apps/kmail.png @@ -51,45 +46,17 @@ usr/share/kde4/apps/kmail/about/kmail.css usr/share/kde4/apps/kmail/about/main.html usr/share/kde4/apps/kmail/about/top-left-kmail.png -usr/share/kde4/apps/kmail/kmail.notifyrc -usr/share/kde4/apps/kmail/kmail_part.rc -usr/share/kde4/apps/kmail/kmcomposerui.rc -usr/share/kde4/apps/kmail/kmmainwin.rc -usr/share/kde4/apps/kmail/kmreadermainwin.rc -usr/share/kde4/apps/kmail/pics/enterprise_bottom.png -usr/share/kde4/apps/kmail/pics/enterprise_bottom_left.png -usr/share/kde4/apps/kmail/pics/enterprise_bottom_right.png -usr/share/kde4/apps/kmail/pics/enterprise_icon.png -usr/share/kde4/apps/kmail/pics/enterprise_left.png -usr/share/kde4/apps/kmail/pics/enterprise_right.png -usr/share/kde4/apps/kmail/pics/enterprise_s_left.png -usr/share/kde4/apps/kmail/pics/enterprise_s_right.png -usr/share/kde4/apps/kmail/pics/enterprise_sbar.png -usr/share/kde4/apps/kmail/pics/enterprise_sp_right.png -usr/share/kde4/apps/kmail/pics/enterprise_sw.png -usr/share/kde4/apps/kmail/pics/enterprise_top.png -usr/share/kde4/apps/kmail/pics/enterprise_top_left.png -usr/share/kde4/apps/kmail/pics/enterprise_top_right.png -usr/share/kde4/apps/kmail/pics/enterprise_w.png +usr/share/kde4/apps/kmail2/kmail2.notifyrc +usr/share/kde4/apps/kmail2/kmail_part.rc +usr/share/kde4/apps/kmail2/kmcomposerui.rc +usr/share/kde4/apps/kmail2/kmmainwin.rc +usr/share/kde4/apps/kmail2/kmreadermainwin.rc usr/share/kde4/apps/kmail/pics/kmwizard.png usr/share/kde4/apps/kmail/pics/mail-deleted.png -usr/share/kde4/apps/kmail/pics/mail-encrypted-full.png -usr/share/kde4/apps/kmail/pics/mail-encrypted-part.png -usr/share/kde4/apps/kmail/pics/mail-encrypted.png -usr/share/kde4/apps/kmail/pics/mail-horizontal-space.png usr/share/kde4/apps/kmail/pics/mail-thread-ignored.png usr/share/kde4/apps/kmail/pics/mail-thread-watch.png -usr/share/kde4/apps/kmail/pics/mail-vertical-separator-line.png usr/share/kde4/apps/kmail/pics/pgp-keys.png -usr/share/kde4/apps/kmail/pics/quicklistClosed.png -usr/share/kde4/apps/kmail/pics/quicklistOpened.png -usr/share/kde4/apps/kmail/pics/quotecollapse.png -usr/share/kde4/apps/kmail/pics/quoteexpand.png -usr/share/kde4/apps/kmail/plugins/bodypartformatter/application_octetstream.desktop -usr/share/kde4/apps/kmail/plugins/bodypartformatter/text_calendar.desktop -usr/share/kde4/apps/kmail/plugins/bodypartformatter/text_vcard.desktop -usr/share/kde4/apps/kmail/plugins/bodypartformatter/text_xdiff.desktop -usr/share/kde4/apps/kmail/tips +usr/share/kde4/apps/kmail2/tips usr/share/kde4/apps/kmailcvt/pics/step1.png usr/share/kde4/apps/kontact/ksettingsdialog/kmail.setdlg usr/share/kde4/config.kcfg/custommimeheader.kcfg @@ -106,5 +73,3 @@ usr/share/kde4/services/kmail_config_misc.desktop usr/share/kde4/services/kmail_config_security.desktop usr/share/kde4/services/kontact/kmailplugin.desktop -usr/share/kde4/servicetypes/dbusimap.desktop -usr/share/kde4/servicetypes/dbusmail.desktop === modified file 'debian/knode.install' --- debian/knode.install 2010-11-25 01:24:12 +0000 +++ debian/knode.install 2011-06-15 07:41:47 +0000 @@ -6,15 +6,10 @@ usr/lib/libknodecommon.so.4.6.0 usr/share/applications/kde4/KNode.desktop usr/share/icons/hicolor/128x128/apps/knode.png -usr/share/icons/hicolor/128x128/apps/knode2.png usr/share/icons/hicolor/16x16/apps/knode.png -usr/share/icons/hicolor/16x16/apps/knode2.png usr/share/icons/hicolor/32x32/apps/knode.png -usr/share/icons/hicolor/32x32/apps/knode2.png usr/share/icons/hicolor/48x48/apps/knode.png -usr/share/icons/hicolor/48x48/apps/knode2.png usr/share/icons/hicolor/64x64/apps/knode.png -usr/share/icons/hicolor/64x64/apps/knode2.png usr/share/kde4/apps/knode/filters/1.fltr usr/share/kde4/apps/knode/filters/2.fltr usr/share/kde4/apps/knode/filters/3.fltr === modified file 'debian/knotes.install' --- debian/knotes.install 2009-11-15 23:53:38 +0000 +++ debian/knotes.install 2011-06-15 07:41:47 +0000 @@ -9,10 +9,6 @@ usr/share/icons/hicolor/32x32/apps/knotes.png usr/share/icons/hicolor/48x48/apps/knotes.png usr/share/icons/hicolor/64x64/apps/knotes.png -usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_alarm.png -usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_close.png -usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_date.png -usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_delete.png usr/share/kde4/apps/knotes/knotes_part.rc usr/share/kde4/apps/knotes/knotesappui.rc usr/share/kde4/apps/knotes/knotesui.rc === modified file 'debian/konsolekalendar.install' --- debian/konsolekalendar.install 2009-06-06 20:28:22 +0000 +++ debian/konsolekalendar.install 2011-06-15 07:41:47 +0000 @@ -1,7 +1,2 @@ usr/bin/konsolekalendar usr/share/applications/kde4/konsolekalendar.desktop -usr/share/kde4/apps/konsolekalendar/pics/hi128-apps-konsolekalendar.png -usr/share/kde4/apps/konsolekalendar/pics/hi16-apps-konsolekalendar.png -usr/share/kde4/apps/konsolekalendar/pics/hi22-apps-konsolekalendar.png -usr/share/kde4/apps/konsolekalendar/pics/hi32-apps-konsolekalendar.png -usr/share/kde4/apps/konsolekalendar/pics/hi48-apps-konsolekalendar.png === modified file 'debian/korganizer.install' --- debian/korganizer.install 2011-02-10 08:44:50 +0000 +++ debian/korganizer.install 2011-06-15 07:41:47 +0000 @@ -14,14 +14,8 @@ usr/lib/kde4/korg_thisdayinhistory.so usr/lib/kde4/korg_yearprint.so usr/lib/kde4/korganizerpart.so -usr/lib/libkorg_stdprinting.so.4 -usr/lib/libkorg_stdprinting.so.4.6.0 -usr/lib/libkorganizer_calendar.so.4 -usr/lib/libkorganizer_calendar.so.4.6.0 usr/lib/libkorganizer_core.so.4 usr/lib/libkorganizer_core.so.4.6.0 -usr/lib/libkorganizer_eventviewer.so.4 -usr/lib/libkorganizer_eventviewer.so.4.6.0 usr/lib/libkorganizer_interfaces.so.4 usr/lib/libkorganizer_interfaces.so.4.6.0 usr/lib/libkorganizerprivate.so.4 @@ -41,7 +35,6 @@ usr/share/icons/oxygen/22x22/actions/checkmark.png usr/share/kde4/apps/kconf_update/korganizer.upd usr/share/kde4/apps/kontact/ksettingsdialog/korganizer.setdlg -usr/share/kde4/apps/korgac/icons/hicolor/22x22/actions/korgac.png usr/share/kde4/apps/korganizer/korganizer_part.rc usr/share/kde4/apps/korganizer/korganizerui.rc usr/share/kde4/apps/korganizer/sounds/alert.wav === modified file 'debian/libkdepim4.install' --- debian/libkdepim4.install 2010-11-25 01:24:12 +0000 +++ debian/libkdepim4.install 2011-06-15 07:41:47 +0000 @@ -1,7 +1,4 @@ -usr/lib/kde4/kpartsdesignerplugin.so usr/lib/kde4/plugins/designer/kdepimwidgets.so -usr/lib/libakonadi-kcal_next.so.4 -usr/lib/libakonadi-kcal_next.so.4.6.0 usr/lib/libakonadi_next.so.4 usr/lib/libakonadi_next.so.4.6.0 usr/lib/libkcal_resourceremote.so.4 @@ -9,8 +6,6 @@ usr/lib/libkdepim.so.4 usr/lib/libkdepim.so.4.6.0 usr/share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png -usr/share/icons/oxygen/22x22/actions/button_fewer.png -usr/share/icons/oxygen/22x22/actions/button_more.png usr/share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png usr/share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png usr/share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png @@ -18,27 +13,4 @@ usr/share/kde4/apps/kdepimwidgets/pics/addresseelineedit.png usr/share/kde4/apps/kdepimwidgets/pics/clicklineedit.png usr/share/kde4/apps/kdepimwidgets/pics/kdateedit.png -usr/share/kde4/apps/kdepimwidgets/pics/ktimeedit.png -usr/share/kde4/apps/libkdepim/about/bar-bottom-left.png -usr/share/kde4/apps/libkdepim/about/bar-bottom-middle.png -usr/share/kde4/apps/libkdepim/about/bar-bottom-right.png -usr/share/kde4/apps/libkdepim/about/bar-middle-left.png -usr/share/kde4/apps/libkdepim/about/bar-middle-right.png -usr/share/kde4/apps/libkdepim/about/bar-top-left.png -usr/share/kde4/apps/libkdepim/about/bar-top-middle.png -usr/share/kde4/apps/libkdepim/about/bar-top-right.png -usr/share/kde4/apps/libkdepim/about/bottom-left.png -usr/share/kde4/apps/libkdepim/about/bottom-middle.png -usr/share/kde4/apps/libkdepim/about/bottom-right.png -usr/share/kde4/apps/libkdepim/about/box-bottom-left.png -usr/share/kde4/apps/libkdepim/about/box-bottom-middle.png -usr/share/kde4/apps/libkdepim/about/box-bottom-right.png -usr/share/kde4/apps/libkdepim/about/box-middle-left.png -usr/share/kde4/apps/libkdepim/about/box-middle-right.png -usr/share/kde4/apps/libkdepim/about/box-top-left.png -usr/share/kde4/apps/libkdepim/about/box-top-middle.png -usr/share/kde4/apps/libkdepim/about/box-top-right.png -usr/share/kde4/apps/libkdepim/about/kde_infopage.css -usr/share/kde4/apps/libkdepim/about/kde_infopage_rtl.css -usr/share/kde4/apps/libkdepim/about/top-left.png -usr/share/kde4/apps/libkdepim/about/top-middle.png +usr/share/kde4/apps/kdepimwidgets/pics/ktimeedit.png \ No newline at end of file === modified file 'debian/patches/kubuntu_install_headers.diff' --- debian/patches/kubuntu_install_headers.diff 2011-06-12 11:34:23 +0000 +++ debian/patches/kubuntu_install_headers.diff 2011-06-15 07:41:47 +0000 @@ -42,71 +42,6 @@ + DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui + ) \ No newline at end of file -Index: kdepim-4.4.11.1/libkleo/CMakeLists.txt -=================================================================== ---- kdepim-4.4.11.1.orig/libkleo/CMakeLists.txt 2011-04-20 22:03:31.000000000 +0200 -+++ kdepim-4.4.11.1/libkleo/CMakeLists.txt 2011-06-11 16:30:44.000000000 +0200 -@@ -117,4 +117,60 @@ - set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) - install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS}) - -+install( FILES -+ kleo/cryptplug.h -+ kleo/cryptplugfactory.h -+ kleo/cryptplugwrapper.h -+ kleo/cryptplugwrapperlist.h -+ kleo/kleo_export.h -+ kleo/enum.h -+ kleo/oidmap.h -+ kleo/cryptobackend.h -+ kleo/cryptobackendfactory.h -+ kleo/cryptoconfig.h -+ kleo/dn.h -+ kleo/job.h -+ kleo/keylistjob.h -+ kleo/keygenerationjob.h -+ kleo/abstractimportjob.h -+ kleo/importjob.h -+ kleo/importfromkeyserverjob.h -+ kleo/exportjob.h -+ kleo/changeexpiryjob.h -+ kleo/changeownertrustjob.h -+ kleo/downloadjob.h -+ kleo/deletejob.h -+ kleo/encryptjob.h -+ kleo/decryptjob.h -+ kleo/signjob.h -+ kleo/specialjob.h -+ kleo/verifydetachedjob.h -+ kleo/verifyopaquejob.h -+ kleo/decryptverifyjob.h -+ kleo/signencryptjob.h -+ kleo/signkeyjob.h -+ kleo/adduseridjob.h -+ kleo/refreshkeysjob.h -+ kleo/multideletejob.h -+ kleo/hierarchicalkeylistjob.h -+ kleo/keyfilter.h -+ kleo/keyfiltermanager.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel) -+ -+install ( FILES -+ ui/kdhorizontalline.h -+ ui/messagebox.h -+ ui/progressbar.h -+ ui/progressdialog.h -+ ui/keylistview.h -+ ui/keyselectiondialog.h -+ ui/keyrequester.h -+ ui/keyapprovaldialog.h -+ ui/backendconfigwidget.h -+ ui/dnattributeorderconfigwidget.h -+ ui/cryptoconfigmodule.h -+ ui/cryptoconfigdialog.h -+ ui/directoryserviceswidget.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel) -+ - install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) Index: kdepim-4.4.11.1/libkpgp/CMakeLists.txt =================================================================== --- kdepim-4.4.11.1.orig/libkpgp/CMakeLists.txt 2011-04-20 22:03:31.000000000 +0200 === modified file 'debian/patches/series' --- debian/patches/series 2011-06-12 11:34:23 +0000 +++ debian/patches/series 2011-06-15 07:41:47 +0000 @@ -1,5 +1,3 @@ #debianize_akregator_default.diff -displaying_only_unread_issue.diff kubuntu_debianize_akregator_default.diff -kubuntu_kalarm_kstatusnotifier.diff kubuntu_install_headers.diff