rev 12923 - in branches/kde4.2/packages/kdepim/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Fri Dec 12 22:32:24 UTC 2008 

Author: modax-guest
Date: 2008-12-12 22:32:24 +0000 (Fri, 12 Dec 2008)
New Revision: 12923

Removed:
   branches/kde4.2/packages/kdepim/debian/kdepim.installgen
   branches/kde4.2/packages/kdepim/debian/kitchensync.install
   branches/kde4.2/packages/kdepim/debian/kitchensync.install.disabled
   branches/kde4.2/packages/kdepim/debian/ktimetracker.installgen
Modified:
   branches/kde4.2/packages/kdepim/debian/akonadi-kde.install
   branches/kde4.2/packages/kdepim/debian/changelog
   branches/kde4.2/packages/kdepim/debian/control
   branches/kde4.2/packages/kdepim/debian/installgen
   branches/kde4.2/packages/kdepim/debian/kaddressbook.install
   branches/kde4.2/packages/kdepim/debian/kalarm.install
   branches/kde4.2/packages/kdepim/debian/libkholidays4.install
   branches/kde4.2/packages/kdepim/debian/not-installed
   branches/kde4.2/packages/kdepim/debian/patches/series
Log:
New kdepim snaphost

Modified: branches/kde4.2/packages/kdepim/debian/akonadi-kde.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/akonadi-kde.install	2008-12-12 20:42:31 UTC (rev 12922)
+++ branches/kde4.2/packages/kdepim/debian/akonadi-kde.install	2008-12-12 22:32:24 UTC (rev 12923)
@@ -69,4 +69,3 @@
 usr/share/kde4/services/kcm_akonadi_server.desktop
 usr/share/kde4/services/kresources/kabc/akonadi.desktop
 usr/share/kde4/services/kresources/kcal/akonadi.desktop
-usr/share/opensync-0.38/defaults/akonadi-sync

Modified: branches/kde4.2/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdepim/debian/changelog	2008-12-12 20:42:31 UTC (rev 12922)
+++ branches/kde4.2/packages/kdepim/debian/changelog	2008-12-12 22:32:24 UTC (rev 12923)
@@ -1,4 +1,4 @@
-kdepim (4:4.1.81+svn890640-0r1) UNRELEASED; urgency=low
+kdepim (4:4.1.85+svn896105-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -6,18 +6,17 @@
 
   * Resync patches:
     - 01_branch_imap_duplication_fix.diff - remove, stolen from upstream.
-    - 97_fix_target_link_libraries.diff - regenerate.
+    - 97_fix_target_link_libraries.diff - remove, obsolete.
   * Bump KDE build dependencies to 4.1.80 and later.
   * Build depend on akonadi >= 1.0.80.
   * Add README.source.
   * Add debian/installgen.
   * Remove explicit cmake build dependency.
   * Add new build dependencies:
-    - libopensync1exp6-dev (>= 0.38);
-    - libglib2.0-dev;
     - libpisock-dev;
     - libmal has been removed from Debian some time ago.
   * Binary package changes:
+    - disable kitchensync;
     - reenable kpilot;
     - disable korn;
     - remove ktnef;
@@ -38,7 +37,7 @@
   * Update install files.
   * Tweak kontact Recommends/Suggest a bit.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Nov 2008 02:11:31 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 12 Dec 2008 23:54:57 +0200
 
 kdepim (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdepim/debian/control
===================================================================
--- branches/kde4.2/packages/kdepim/debian/control	2008-12-12 20:42:31 UTC (rev 12922)
+++ branches/kde4.2/packages/kdepim/debian/control	2008-12-12 22:32:24 UTC (rev 12923)
@@ -12,15 +12,14 @@
  libassuan-dev,
  libstreams-dev, libstreamanalyzer-dev, libsearchclient-dev,
  libstrigihtmlgui-dev, libstrigiqtdbusclient-dev, zlib1g-dev,
- libakonadi-dev (>= 1.0.80), libopensync1exp6-dev (>= 0.38), libglib2.0-dev,
- libpisock-dev 
+ libakonadi-dev (>= 1.0.80), libpisock-dev 
 Standards-Version: 3.8.0
 Homepage: http://pim.kde.org/
 
 Package: kdepim
 Architecture: all
 Depends: akonadi-kde (>= ${source:Version}), akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}),
- kdepim-kresources (>= ${source:Version}), kdepim-wizards (>= ${source:Version}), kitchensync (>= ${source:Version}),
+ kdepim-kresources (>= ${source:Version}), kdepim-wizards (>= ${source:Version}),
  kmail (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), kode (>= ${source:Version}),
  konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}),
  ktimetracker (>= ${source:Version}), kdepim-strigi-plugins (>= ${source:Version}), kjots (>= ${source:Version}),
@@ -179,19 +178,19 @@
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
-Package: kitchensync
-Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: konqueror
-Conflicts: kdebluetooth-irmcsync (<< 0.99+1.0beta2-4.1)
-Homepage: http://www.opensync.org/wiki/kitchensync
-Description: Synchronization framework
- This package contains a synchronization framework, still under heavy
- development.  Kitchensync uses opensync.
- .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+#Package: kitchensync
+#Section: kde
+#Architecture: any
+#Depends: ${shlibs:Depends}
+#Suggests: konqueror
+#Conflicts: kdebluetooth-irmcsync (<< 0.99+1.0beta2-4.1)
+#Homepage: http://www.opensync.org/wiki/kitchensync
+#Description: Synchronization framework
+# This package contains a synchronization framework, still under heavy
+# development.  Kitchensync uses opensync.
+# .
+# This package is part of KDE, and a component of the KDE PIM module.
+# See the 'kde' and 'kdepim' packages for more information.
 
 Package: kleopatra
 Section: net
@@ -307,7 +306,7 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kitchensync, kmail, knotes, akregator, kaddressbook, korganizer
+Recommends: kmail, knotes, akregator, kaddressbook, korganizer
 Suggests: akregator, knewsticker, gnokii, kjots, ktimeticker, knode
 Homepage: http://kontact.kde.org/
 Replaces: korganizer (<< 4:4.1.80), akregator (<< 4:4.1.80)

Modified: branches/kde4.2/packages/kdepim/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdepim/debian/installgen	2008-12-12 20:42:31 UTC (rev 12922)
+++ branches/kde4.2/packages/kdepim/debian/installgen	2008-12-12 22:32:24 UTC (rev 12923)
@@ -109,8 +109,8 @@
 [ktimetracker]
 from:/ktimetracker/
 
-[kitchensync]
-from:/kitchensync/
+#[kitchensync]
+#from:/kitchensync/
 
 [kontact]
 # Kontact needs to come last so its plugins get picked up

Modified: branches/kde4.2/packages/kdepim/debian/kaddressbook.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kaddressbook.install	2008-12-12 20:42:31 UTC (rev 12922)
+++ branches/kde4.2/packages/kdepim/debian/kaddressbook.install	2008-12-12 22:32:24 UTC (rev 12923)
@@ -34,6 +34,7 @@
 usr/share/doc/kde4/HTML/en/kabcclient/common
 usr/share/doc/kde4/HTML/en/kabcclient/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kabcclient/index.docbook
+usr/share/doc/kde4/HTML/en/kabcclient/man-kabcclient.1.docbook
 usr/share/doc/kde4/HTML/en/kaddressbook/addhost.png
 usr/share/doc/kde4/HTML/en/kaddressbook/common
 usr/share/doc/kde4/HTML/en/kaddressbook/conf.png

Modified: branches/kde4.2/packages/kdepim/debian/kalarm.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/kalarm.install	2008-12-12 20:42:31 UTC (rev 12922)
+++ branches/kde4.2/packages/kdepim/debian/kalarm.install	2008-12-12 22:32:24 UTC (rev 12923)
@@ -16,12 +16,12 @@
 usr/share/doc/kde4/HTML/en/kalarm/mainwindow.png
 usr/share/doc/kde4/HTML/en/kalarm/spinbox.png
 usr/share/icons/hicolor/16x16/apps/kalarm.png
-usr/share/icons/hicolor/22x22/apps/kalarm.png
 usr/share/icons/hicolor/32x32/apps/kalarm.png
 usr/share/icons/hicolor/48x48/apps/kalarm.png
 usr/share/icons/oxygen/16x16/actions/document-new-from-template.png
 usr/share/icons/oxygen/16x16/apps/kalarm.png
 usr/share/icons/oxygen/22x22/actions/document-new-from-template.png
+usr/share/icons/oxygen/22x22/actions/kalarm.png
 usr/share/icons/oxygen/22x22/apps/kalarm.png
 usr/share/icons/oxygen/32x32/apps/kalarm.png
 usr/share/icons/oxygen/48x48/apps/kalarm.png

Deleted: branches/kde4.2/packages/kdepim/debian/kdepim.installgen

Deleted: branches/kde4.2/packages/kdepim/debian/kitchensync.install

Deleted: branches/kde4.2/packages/kdepim/debian/kitchensync.install.disabled

Deleted: branches/kde4.2/packages/kdepim/debian/ktimetracker.installgen

Modified: branches/kde4.2/packages/kdepim/debian/libkholidays4.install
===================================================================
--- branches/kde4.2/packages/kdepim/debian/libkholidays4.install	2008-12-12 20:42:31 UTC (rev 12922)
+++ branches/kde4.2/packages/kdepim/debian/libkholidays4.install	2008-12-12 22:32:24 UTC (rev 12923)
@@ -12,6 +12,7 @@
 usr/share/kde4/apps/libkholidays/holiday_ca
 usr/share/kde4/apps/libkholidays/holiday_catalan
 usr/share/kde4/apps/libkholidays/holiday_ch
+usr/share/kde4/apps/libkholidays/holiday_cl
 usr/share/kde4/apps/libkholidays/holiday_co
 usr/share/kde4/apps/libkholidays/holiday_cz
 usr/share/kde4/apps/libkholidays/holiday_de
@@ -29,6 +30,7 @@
 usr/share/kde4/apps/libkholidays/holiday_il
 usr/share/kde4/apps/libkholidays/holiday_is
 usr/share/kde4/apps/libkholidays/holiday_it
+usr/share/kde4/apps/libkholidays/holiday_jm
 usr/share/kde4/apps/libkholidays/holiday_jp
 usr/share/kde4/apps/libkholidays/holiday_lt
 usr/share/kde4/apps/libkholidays/holiday_mx

Modified: branches/kde4.2/packages/kdepim/debian/not-installed
===================================================================
--- branches/kde4.2/packages/kdepim/debian/not-installed	2008-12-12 20:42:31 UTC (rev 12922)
+++ branches/kde4.2/packages/kdepim/debian/not-installed	2008-12-12 22:32:24 UTC (rev 12923)
@@ -1,22 +1,3 @@
-# groupwise related files
-./usr/bin/groupwisewizard
-./usr/bin/groupwarewizard
-./usr/share/kde4/services/kresources/kabc/kabc_groupwise.desktop
-./usr/share/kde4/services/kresources/kcal/kcal_groupwise.desktop
-./usr/lib/kde4/kio_groupwise.so
-./usr/lib/libgwsoap.so.4
-./usr/lib/libgwsoap.so.4.1.0
-./usr/share/kde4/services/groupwise.protocol
-./usr/share/kde4/services/groupwises.protocol
-./usr/lib/kde4/kabc_groupwise.so
-./usr/lib/kde4/kcal_groupwise.so
-./usr/lib/libkabcgroupwise.so
-./usr/lib/libkabcgroupwise.so.4
-./usr/lib/libkabcgroupwise.so.4.1.0
-./usr/lib/libkcalgroupwise.so
-./usr/lib/libkcalgroupwise.so.4
-./usr/lib/libkcalgroupwise.so.4.1.0
-
 # we don't install any headers and .so links for the moment.
 # if there's need for these files one day, we can reconsider thid decision.
 # backed up upstream...
@@ -30,11 +11,7 @@
 ./usr/include/akregator/storagefactory.h
 ./usr/include/akregator/storagefactoryregistry.h
 ./usr/include/akregator/types.h
-./usr/include/kaddressbook/configurewidget.h
-./usr/include/kaddressbook/contacteditorwidget.h
-./usr/include/kaddressbook/extensionwidget.h
 ./usr/include/kaddressbook/kaddressbook_export.h
-./usr/include/kaddressbook/xxport.h
 ./usr/include/kdepimprotocols.h
 ./usr/include/kleo/adduseridjob.h
 ./usr/include/kleo/changeexpiryjob.h
@@ -121,89 +98,36 @@
 ./usr/include/libkleopatraclient/core/signencryptfilescommand.h
 ./usr/include/libkleopatraclient/gui/certificaterequester.h
 ./usr/include/libkleopatraclient/kleopatraclient_export.h
-./usr/include/libkmobiletools/addressbook.h
-./usr/include/libkmobiletools/addressbookentry.h
-./usr/include/libkmobiletools/baseerror.h
-./usr/include/libkmobiletools/config.h
-./usr/include/libkmobiletools/contactslist.h
-./usr/include/libkmobiletools/coreservice.h
-./usr/include/libkmobiletools/deviceloader.h
-./usr/include/libkmobiletools/devicesconfig.h
-./usr/include/libkmobiletools/encodingshelper.h
-./usr/include/libkmobiletools/engine.h
-./usr/include/libkmobiletools/enginedata.h
-./usr/include/libkmobiletools/enginexp.h
-./usr/include/libkmobiletools/errorhandler.h
-./usr/include/libkmobiletools/errorlog.h
-./usr/include/libkmobiletools/errortypes/baseerror.h
-./usr/include/libkmobiletools/gsmcodec.h
-./usr/include/libkmobiletools/ifaces/actionprovider.h
-./usr/include/libkmobiletools/ifaces/addressbook.h
-./usr/include/libkmobiletools/ifaces/dialaction.h
-./usr/include/libkmobiletools/ifaces/guiservice.h
-./usr/include/libkmobiletools/ifaces/information.h
-./usr/include/libkmobiletools/ifaces/jobprovider.h
-./usr/include/libkmobiletools/ifaces/shortmessages.h
-./usr/include/libkmobiletools/ifaces/smsfolders.h
-./usr/include/libkmobiletools/ifaces/status.h
-./usr/include/libkmobiletools/ifaces/wizardprovider.h
-./usr/include/libkmobiletools/information.h
-./usr/include/libkmobiletools/job.h
-./usr/include/libkmobiletools/jobmanager.h
-./usr/include/libkmobiletools/jobxp.h
-./usr/include/libkmobiletools/kmobiletools_devices.h
-./usr/include/libkmobiletools/kmobiletools_export.h
-./usr/include/libkmobiletools/kmobiletoolshelper.h
-./usr/include/libkmobiletools/picksmscenter.h
-./usr/include/libkmobiletools/qserial.h
-./usr/include/libkmobiletools/serialdevice.h
-./usr/include/libkmobiletools/serviceloader.h
-./usr/include/libkmobiletools/sms.h
-./usr/include/libkmobiletools/smslist.h
-./usr/include/libkmobiletools/status.h
-./usr/include/libkmobiletools/weaver.h
-./usr/include/libkmobiletoolsengineui/connectionsPage.h
-./usr/include/libkmobiletoolsengineui/devicesfoundPage.h
-./usr/include/libkmobiletoolsengineui/engineui_export.h
-./usr/include/libkmobiletoolsengineui/scanprogressPage.h
-./usr/lib/kde4/plugins/designer/kdepimwidgets.so
-./usr/lib/libakonadi-kabc.so
+./usr/lib/libakonadi-kabccommon.so
 ./usr/lib/libakonadi-kcal.so
 ./usr/lib/libakregatorinterfaces.so
-./usr/lib/libakregatorprivate.so
 ./usr/lib/libgwsoap.so
 ./usr/lib/libimap.so
 ./usr/lib/libkabc_groupdav.so
-./usr/lib/libkabc_groupwise.so
 ./usr/lib/libkabc_slox.so
 ./usr/lib/libkabc_xmlrpc.so
+./usr/lib/libkabcgroupwise.so
 ./usr/lib/libkabckolab.so
 ./usr/lib/libkabcommon.so
 ./usr/lib/libkabcscalix.so
 ./usr/lib/libkabinterfaces.so
 ./usr/lib/libkalarm_resources.so
 ./usr/lib/libkcal_groupdav.so
-./usr/lib/libkcal_groupwise.so
 ./usr/lib/libkcal_resourceblog.so
 ./usr/lib/libkcal_resourcefeatureplan.so
 ./usr/lib/libkcal_resourceremote.so
 ./usr/lib/libkcal_slox.so
 ./usr/lib/libkcal_xmlrpc.so
+./usr/lib/libkcalgroupwise.so
 ./usr/lib/libkcalkolab.so
 ./usr/lib/libkcalscalix.so
 ./usr/lib/libkdepim.so
-./usr/lib/libkfeed.so
 ./usr/lib/libkgroupwarebase.so
 ./usr/lib/libkgroupwaredav.so
 ./usr/lib/libkholidays.so
-./usr/lib/libkitchensyncprivate.so
 ./usr/lib/libkleo.so
 ./usr/lib/libkleopatraclientcore.so
 ./usr/lib/libkleopatraclientgui.so
-./usr/lib/libkmailprivate.so
-./usr/lib/libkmobiletoolsengineui.so
-./usr/lib/libkmobiletoolslib.so
-./usr/lib/libkmtaddressbook_service.so
 ./usr/lib/libknodecommon.so
 ./usr/lib/libknotes_xmlrpc.so
 ./usr/lib/libknoteskolab.so
@@ -211,15 +135,12 @@
 ./usr/lib/libkocorehelper.so
 ./usr/lib/libkode.so
 ./usr/lib/libkontactinterfaces.so
-./usr/lib/libkontactprivate.so
 ./usr/lib/libkorg_stdprinting.so
 ./usr/lib/libkorganizer_calendar.so
 ./usr/lib/libkorganizer_eventviewer.so
 ./usr/lib/libkorganizer_interfaces.so
-./usr/lib/libkorganizerprivate.so
 ./usr/lib/libkpgp.so
 ./usr/lib/libkpilot.so
-./usr/lib/libkpinterfaces.so
 ./usr/lib/libkschema.so
 ./usr/lib/libkschemawidgets.so
 ./usr/lib/libksieve.so
@@ -227,9 +148,23 @@
 ./usr/lib/libkxmlcommon.so
 ./usr/lib/libmaildir.so
 ./usr/lib/libmimelib.so
-./usr/lib/libqopensync.so
 ./usr/lib/libschema.so
 ./usr/lib/libwscl.so
 ./usr/lib/libwsdl.so
+./usr/share/dbus-1/interfaces/org.kde.KAddressbook.Core.xml
+./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
+./usr/share/dbus-1/interfaces/org.kde.akregator.part.xml
+./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
+./usr/share/dbus-1/interfaces/org.kde.korganizer.Korganizer.xml
+./usr/share/dbus-1/interfaces/org.kde.ktimetracker.ktimetracker.xml
+./usr/share/dbus-1/interfaces/org.kde.mailtransport.service.xml
 ./usr/share/kde4/apps/cmake/modules/FindKode.cmake
 ./usr/share/kde4/apps/cmake/modules/KodeMacros.cmake

Modified: branches/kde4.2/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/series	2008-12-12 20:42:31 UTC (rev 12922)
+++ branches/kde4.2/packages/kdepim/debian/patches/series	2008-12-12 22:32:24 UTC (rev 12923)
@@ -1,2 +1 @@
 30_debianize_akregator_default.diff
-97_fix_target_link_libraries.diff

More information about the pkg-kde-commits mailing list