rev 10272 - branches/kde4/packages/kdepimlibs/debian

Fri Apr 25 21:21:58 UTC 2008

Author: modax-guest
Date: 2008-04-25 21:21:58 +0000 (Fri, 25 Apr 2008)
New Revision: 10272

Added:
   branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.installgen
   branches/kde4/packages/kdepimlibs/debian/kdepimlibs5-dev.installgen
   branches/kde4/packages/kdepimlibs/debian/kdepimlibs5.installgen
   branches/kde4/packages/kdepimlibs/debian/patches/
Modified:
   branches/kde4/packages/kdepimlibs/debian/changelog
   branches/kde4/packages/kdepimlibs/debian/control
   branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.install
   branches/kde4/packages/kdepimlibs/debian/kdepimlibs5-dev.install
   branches/kde4/packages/kdepimlibs/debian/kdepimlibs5.install
   branches/kde4/packages/kdepimlibs/debian/rules
Log:
* Packaging of the newer snapshot

Modified: branches/kde4/packages/kdepimlibs/debian/changelog
===================================================================

--- branches/kde4/packages/kdepimlibs/debian/changelog	2008-04-25 20:59:27 UTC (rev 10271)
+++ branches/kde4/packages/kdepimlibs/debian/changelog	2008-04-25 21:21:58 UTC (rev 10272)
@@ -1,9 +1,29 @@
-kdepimlibs (4:4.0.70+svn799089-1) UNRELEASED; urgency=low
+kdepimlibs (4:4.0.71+svn801124-1~pre1) UNRELEASED; urgency=low
 
-  * New upstream snapshot.
+  * New upstream development snapshot:
+    - The latest upstream commit is r801124 by pino
+    - Date: Fri, 25 Apr 2008 21:12:06 -0000
 
- -- Fathi Boudra <fabo at debian.org>  Mon, 21 Apr 2008 16:28:35 +0200
+  +++ Changes by Modestas Vainius:
 
+  * Build-depend on libakonadi-dev.
+  * Add 01_fix_target_link_libraries.diff to add missing references to
+    QtNetwork, QtDBus, QtXml libraries. Also cleanup interim dependences a
+    bit.
+  * Update install files.
+  * Add installgen files.
+  * Add 97_use_imported_targets_with_cmake26.diff which enables use of
+    install(EXPORT) instead of EXPORT_LIBRARY_DEPENDENCIES with cmake 2.6.
+    The patch is not complete since apparently the dependency file is
+    not used anyway (fortunately).
+  * kdepimlibs5-dev: drop version from kdelibs5-dev dependency. It does not
+    add any real value as a proper dependecy is already enforced via
+    kdelibs5-dev = kdelibs5 -> kdepimlibs5 = kdepimlibs5-dev chain. What's
+    more, it is unnecesarily painful to deal with (esp. with regard to
+    snapshots).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Apr 2008 00:16:37 +0300
+
 kdepimlibs (4:4.0.68+svn794641-1) experimental; urgency=low
 
   * New upstream snapshot:

Modified: branches/kde4/packages/kdepimlibs/debian/control
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/control	2008-04-25 20:59:27 UTC (rev 10271)
+++ branches/kde4/packages/kdepimlibs/debian/control	2008-04-25 21:21:58 UTC (rev 10272)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake, kdelibs5-dev (>= 4:4.0.68),
- libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake, kdelibs5-dev (>= 4:4.0.71),
+ libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev, libakonadi-dev
 Standards-Version: 3.7.3
 Homepage: http://pim.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdepimlibs
@@ -32,7 +32,7 @@
 Package: kdepimlibs5-dev
 Section: libdevel
 Architecture: any
-Depends: kdepimlibs5 (= ${binary:Version}), kdelibs5-dev (>= ${source:Upstream-Version}),
+Depends: kdepimlibs5 (= ${binary:Version}), kdelibs5-dev
  libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev
 Conflicts: libkleopatra1-dev
 Description: development files for the KDE 4 PIM libraries

Modified: branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.install
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.install	2008-04-25 20:59:27 UTC (rev 10271)
+++ branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.install	2008-04-25 21:21:58 UTC (rev 10272)
@@ -1,10 +1,4 @@
 usr/share/apps/akonadi-kde/kcfg2dbus.xsl
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Agent.Control.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.AgentManager.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Agent.Status.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.NotificationManager.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Resource.xml
-usr/share/dbus-1/interfaces/org.kde.Akonadi.Tracer.xml
 usr/share/dbus-1/interfaces/org.kde.KResourcesManager.xml
 usr/share/dbus-1/interfaces/org.kde.pim.IdentityManager.xml
 usr/share/kde4/apps/kabc/countrytransl.map
@@ -100,8 +94,8 @@
 usr/share/kde4/apps/libical/zoneinfo/America/Cuiaba.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Curacao.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Danmarkshavn.ics
-usr/share/kde4/apps/libical/zoneinfo/America/Dawson_Creek.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Dawson.ics
+usr/share/kde4/apps/libical/zoneinfo/America/Dawson_Creek.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Denver.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Detroit.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Dominica.ics
@@ -289,8 +283,8 @@
 usr/share/kde4/apps/libical/zoneinfo/Atlantic/Madeira.ics
 usr/share/kde4/apps/libical/zoneinfo/Atlantic/Reykjavik.ics
 usr/share/kde4/apps/libical/zoneinfo/Atlantic/South_Georgia.ics
-usr/share/kde4/apps/libical/zoneinfo/Atlantic/Stanley.ics
 usr/share/kde4/apps/libical/zoneinfo/Atlantic/St_Helena.ics
+usr/share/kde4/apps/libical/zoneinfo/Atlantic/Stanley.ics
 usr/share/kde4/apps/libical/zoneinfo/Australia/Adelaide.ics
 usr/share/kde4/apps/libical/zoneinfo/Australia/Brisbane.ics
 usr/share/kde4/apps/libical/zoneinfo/Australia/Broken_Hill.ics
@@ -418,8 +412,8 @@
 usr/share/kde4/services/kresources/kabc/dir.desktop
 usr/share/kde4/services/kresources/kabc/file.desktop
 usr/share/kde4/services/kresources/kabc/ldapkio.desktop
-usr/share/kde4/services/kresources/kabc_manager.desktop
 usr/share/kde4/services/kresources/kabc/net.desktop
+usr/share/kde4/services/kresources/kabc_manager.desktop
 usr/share/kde4/services/kresources/kcal/local.desktop
 usr/share/kde4/services/kresources/kcal/localdir.desktop
 usr/share/kde4/services/kresources/kcal_manager.desktop

Added: branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.installgen
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.installgen	                        (rev 0)
+++ branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.installgen	2008-04-25 21:21:58 UTC (rev 10272)
@@ -0,0 +1,4 @@
+depends last
+
+mime:text/.*
+dst:usr/share

Modified: branches/kde4/packages/kdepimlibs/debian/kdepimlibs5-dev.install
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/kdepimlibs5-dev.install	2008-04-25 20:59:27 UTC (rev 10271)
+++ branches/kde4/packages/kdepimlibs/debian/kdepimlibs5-dev.install	2008-04-25 21:21:58 UTC (rev 10272)
@@ -1,7 +1,7 @@
 usr/include/akonadi/agentbase.h
 usr/include/akonadi/agentfilterproxymodel.h
-usr/include/akonadi/agentinstancecreatejob.h
 usr/include/akonadi/agentinstance.h
+usr/include/akonadi/agentinstancecreatejob.h
 usr/include/akonadi/agentinstancemodel.h
 usr/include/akonadi/agentinstancewidget.h
 usr/include/akonadi/agentmanager.h
@@ -9,33 +9,33 @@
 usr/include/akonadi/agenttypemodel.h
 usr/include/akonadi/agenttypewidget.h
 usr/include/akonadi/akonadi_export.h
-usr/include/akonadi/attributefactory.h
 usr/include/akonadi/attribute.h
+usr/include/akonadi/attributefactory.h
 usr/include/akonadi/cachepolicy.h
 usr/include/akonadi/changerecorder.h
+usr/include/akonadi/collection.h
 usr/include/akonadi/collectioncopyjob.h
 usr/include/akonadi/collectioncreatejob.h
 usr/include/akonadi/collectiondeletejob.h
 usr/include/akonadi/collectionfetchjob.h
 usr/include/akonadi/collectionfilterproxymodel.h
-usr/include/akonadi/collection.h
 usr/include/akonadi/collectionmodel.h
 usr/include/akonadi/collectionmodifyjob.h
 usr/include/akonadi/collectionpropertiesdialog.h
 usr/include/akonadi/collectionpropertiespage.h
-usr/include/akonadi/collectionstatisticsdelegate.h
 usr/include/akonadi/collectionstatistics.h
+usr/include/akonadi/collectionstatisticsdelegate.h
 usr/include/akonadi/collectionstatisticsjob.h
 usr/include/akonadi/collectionstatisticsmodel.h
 usr/include/akonadi/collectionview.h
 usr/include/akonadi/control.h
 usr/include/akonadi/entity.h
+usr/include/akonadi/item.h
 usr/include/akonadi/itemcopyjob.h
 usr/include/akonadi/itemcreatejob.h
 usr/include/akonadi/itemdeletejob.h
 usr/include/akonadi/itemfetchjob.h
 usr/include/akonadi/itemfetchscope.h
-usr/include/akonadi/item.h
 usr/include/akonadi/itemmodel.h
 usr/include/akonadi/itemmodifyjob.h
 usr/include/akonadi/itemmonitor.h
@@ -51,13 +51,7 @@
 usr/include/akonadi/kmime/messagethreaderproxymodel.h
 usr/include/akonadi/kmime/messagethreadingattribute.h
 usr/include/akonadi/monitor.h
-usr/include/akonadi/private/akonadiprotocolinternals_export.h
 usr/include/akonadi/private/collectionpathresolver_p.h
-usr/include/akonadi/private/imapparser_p.h
-usr/include/akonadi/private/imapset_p.h
-usr/include/akonadi/private/notificationmessage_p.h
-usr/include/akonadi/private/protocol_p.h
-usr/include/akonadi/private/xdgbasedirs_p.h
 usr/include/akonadi/resourcebase.h
 usr/include/akonadi/searchcreatejob.h
 usr/include/akonadi/session.h
@@ -82,27 +76,27 @@
 usr/include/gpgme++/interfaces/dataprovider.h
 usr/include/gpgme++/interfaces/passphraseprovider.h
 usr/include/gpgme++/interfaces/progressprovider.h
-usr/include/gpgme++/keygenerationresult.h
 usr/include/gpgme++/key.h
+usr/include/gpgme++/keygenerationresult.h
 usr/include/gpgme++/keylistresult.h
 usr/include/gpgme++/notation.h
 usr/include/gpgme++/result.h
 usr/include/gpgme++/signingresult.h
 usr/include/gpgme++/trustitem.h
 usr/include/gpgme++/verificationresult.h
+usr/include/kabc/address.h
 usr/include/kabc/addressbook.h
-usr/include/kabc/addresseedialog.h
 usr/include/kabc/addressee.h
+usr/include/kabc/addresseedialog.h
 usr/include/kabc/addresseelist.h
-usr/include/kabc/address.h
 usr/include/kabc/addresslineedit.h
-usr/include/kabc/distributionlistdialog.h
 usr/include/kabc/distributionlist.h
+usr/include/kabc/distributionlistdialog.h
 usr/include/kabc/emailselectdialog.h
 usr/include/kabc/errorhandler.h
 usr/include/kabc/field.h
-usr/include/kabc/formatfactory.h
 usr/include/kabc/format.h
+usr/include/kabc/formatfactory.h
 usr/include/kabc/geo.h
 usr/include/kabc/kabc_export.h
 usr/include/kabc/key.h
@@ -112,22 +106,22 @@
 usr/include/kabc/phonenumber.h
 usr/include/kabc/picture.h
 usr/include/kabc/plugin.h
+usr/include/kabc/resource.h
 usr/include/kabc/resourceabc.h
 usr/include/kabc/resourcecached.h
-usr/include/kabc/resource.h
 usr/include/kabc/secrecy.h
 usr/include/kabc/sortmode.h
 usr/include/kabc/sound.h
 usr/include/kabc/stdaddressbook.h
 usr/include/kabc/timezone.h
+usr/include/kabc/vcard.h
 usr/include/kabc/vcardconverter.h
 usr/include/kabc/vcardformat.h
-usr/include/kabc/vcard.h
 usr/include/kabc/vcardline.h
 usr/include/kabc/vcardparser.h
+usr/include/kblog/blog.h
 usr/include/kblog/blogcomment.h
 usr/include/kblog/blogger1.h
-usr/include/kblog/blog.h
 usr/include/kblog/blogmedia.h
 usr/include/kblog/blogpost.h
 usr/include/kblog/gdata.h
@@ -152,8 +146,8 @@
 usr/include/kcal/event.h
 usr/include/kcal/exceptions.h
 usr/include/kcal/filestorage.h
-usr/include/kcal/freebusycache.h
 usr/include/kcal/freebusy.h
+usr/include/kcal/freebusycache.h
 usr/include/kcal/freebusyperiod.h
 usr/include/kcal/freebusyurlstore.h
 usr/include/kcal/htmlexport.h
@@ -162,9 +156,9 @@
 usr/include/kcal/icalformat.h
 usr/include/kcal/icaltimezones.h
 usr/include/kcal/imipscheduler.h
+usr/include/kcal/incidence.h
 usr/include/kcal/incidencebase.h
 usr/include/kcal/incidenceformatter.h
-usr/include/kcal/incidence.h
 usr/include/kcal/journal.h
 usr/include/kcal/kcal_export.h
 usr/include/kcal/kcalversion.h
@@ -175,13 +169,13 @@
 usr/include/kcal/qtopiaformat.h
 usr/include/kcal/recurrence.h
 usr/include/kcal/recurrencerule.h
-usr/include/kcal/resourcecachedconfig.h
 usr/include/kcal/resourcecached.h
+usr/include/kcal/resourcecachedconfig.h
 usr/include/kcal/resourcecalendar.h
+usr/include/kcal/resourcelocal.h
 usr/include/kcal/resourcelocalconfig.h
-usr/include/kcal/resourcelocaldirconfig.h
 usr/include/kcal/resourcelocaldir.h
-usr/include/kcal/resourcelocal.h
+usr/include/kcal/resourcelocaldirconfig.h
 usr/include/kcal/scheduler.h
 usr/include/kcal/sortablelist.h
 usr/include/kcal/todo.h
@@ -218,8 +212,8 @@
 usr/include/kmime/kmime_message.h
 usr/include/kmime/kmime_newsarticle.h
 usr/include/kmime/kmime_util.h
-usr/include/kpimidentities/identitycombo.h
 usr/include/kpimidentities/identity.h
+usr/include/kpimidentities/identitycombo.h
 usr/include/kpimidentities/identitymanager.h
 usr/include/kpimidentities/kpimidentities_export.h
 usr/include/kpimidentities/signature.h
@@ -239,9 +233,9 @@
 usr/include/kresources/resource.h
 usr/include/kresources/selectdialog.h
 usr/include/ktnef/formatter.h
+usr/include/ktnef/ktnef_export.h
 usr/include/ktnef/ktnefattach.h
 usr/include/ktnef/ktnefdefs.h
-usr/include/ktnef/ktnef_export.h
 usr/include/ktnef/ktnefmessage.h
 usr/include/ktnef/ktnefparser.h
 usr/include/ktnef/ktnefproperty.h
@@ -253,10 +247,10 @@
 usr/include/mailtransport/sendmailjob.h
 usr/include/mailtransport/servertest.h
 usr/include/mailtransport/smtpjob.h
+usr/include/mailtransport/transport.h
 usr/include/mailtransport/transportbase.h
 usr/include/mailtransport/transportcombobox.h
 usr/include/mailtransport/transportconfigdialog.h
-usr/include/mailtransport/transport.h
 usr/include/mailtransport/transportjob.h
 usr/include/mailtransport/transportmanagementwidget.h
 usr/include/mailtransport/transportmanager.h
@@ -334,12 +328,11 @@
 usr/lib/gpgmepp/GpgmeppLibraryDepends.cmake
 usr/lib/libakonadi-kde.so
 usr/lib/libakonadi-kmime.so
-usr/lib/libakonadiprotocolinternals.so
-usr/lib/libgpgme++-pthread.so
 usr/lib/libgpgme++-pth.so
+usr/lib/libgpgme++-pthread.so
 usr/lib/libgpgme++.so
-usr/lib/libkabc_file_core.so
 usr/lib/libkabc.so
+usr/lib/libkabc_file_core.so
 usr/lib/libkblog.so
 usr/lib/libkcal.so
 usr/lib/libkimap.so
@@ -354,8 +347,11 @@
 usr/lib/libqgpgme.so
 usr/lib/libsyndication.so
 usr/share/kde4/apps/cmake/modules/CheckTimezone.cmake
+usr/share/kde4/apps/cmake/modules/FindAkonadi.cmake
 usr/share/kde4/apps/cmake/modules/FindGpgme.cmake
 usr/share/kde4/apps/cmake/modules/FindLdap.cmake
 usr/share/kde4/apps/cmake/modules/FindLibical.cmake
 usr/share/kde4/apps/cmake/modules/FindQGpgme.cmake
 usr/share/kde4/apps/cmake/modules/KDEPimLibsDependencies.cmake
+usr/share/kde4/apps/cmake/modules/KDEPimLibsImports.cmake
+usr/share/kde4/apps/cmake/modules/KDEPimLibsImports-debian.cmake

Added: branches/kde4/packages/kdepimlibs/debian/kdepimlibs5-dev.installgen
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/kdepimlibs5-dev.installgen	                        (rev 0)
+++ branches/kde4/packages/kdepimlibs/debian/kdepimlibs5-dev.installgen	2008-04-25 21:21:58 UTC (rev 10272)
@@ -0,0 +1,3 @@
+dst:.*\.cmake$
+dst:usr/include
+dst:usr/lib/.*so$ link:

Modified: branches/kde4/packages/kdepimlibs/debian/kdepimlibs5.install
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/kdepimlibs5.install	2008-04-25 20:59:27 UTC (rev 10271)
+++ branches/kde4/packages/kdepimlibs/debian/kdepimlibs5.install	2008-04-25 21:21:58 UTC (rev 10272)
@@ -18,11 +18,9 @@
 usr/lib/libakonadi-kde.so.4.1.0
 usr/lib/libakonadi-kmime.so.4
 usr/lib/libakonadi-kmime.so.4.1.0
-usr/lib/libakonadiprotocolinternals.so.4
-usr/lib/libakonadiprotocolinternals.so.4.1.0
-usr/lib/libgpgme++-pthread.so.1.1.0
-usr/lib/libgpgme++-pth.so.1.1.0
-usr/lib/libgpgme++.so.1.1.0
+usr/lib/libgpgme++-pthread.so.1.2.0
+usr/lib/libgpgme++-pth.so.1.2.0
+usr/lib/libgpgme++.so.1.2.0
 usr/lib/libkabc_file_core.so.4
 usr/lib/libkabc_file_core.so.4.1.0
 usr/lib/libkabc.so.4

Added: branches/kde4/packages/kdepimlibs/debian/kdepimlibs5.installgen
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/kdepimlibs5.installgen	                        (rev 0)
+++ branches/kde4/packages/kdepimlibs/debian/kdepimlibs5.installgen	2008-04-25 21:21:58 UTC (rev 10272)
@@ -0,0 +1,3 @@
+mime:application/x-sharedlib,.* ! link:
+mime:application/x-sharedlib,.* link: dst:usr/lib/.*\.so\.
+mime:application/x-executable,.*

Modified: branches/kde4/packages/kdepimlibs/debian/rules
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/rules	2008-04-25 20:59:27 UTC (rev 10271)
+++ branches/kde4/packages/kdepimlibs/debian/rules	2008-04-25 21:21:58 UTC (rev 10272)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-UPSTREAMVERSION := 4:4.0.70+svn799089-1
+UPSTREAMVERSION := 4:4.0.71
 
 DEB_DH_MAKESHLIBS_ARGS_kdepimlibs5 := -V'kdepimlibs5 (>= $(UPSTREAMVERSION))'
 


