[SCM] KDE PIM module packaging branch, master, updated. debian/4.11.5-1
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 28 20:12:06 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=db34d57
The following commit has been merged in the master branch:
commit db34d57ad211c1cf2e4214a76f4f1555540e1637
Author: Maximiliano Curia <maxy at debian.org>
Date: Tue Jan 28 16:24:56 2014 +0100
wrap-and-sort
---
debian/control | 217 ++++++++++++++++++++++---------------
debian/copyright | 8 +-
debian/kmail-mobile.install | 40 +++----
debian/kmail.install | 12 +-
debian/knotes.install | 2 +-
debian/patches/disable_test_verify | 4 +-
6 files changed, 162 insertions(+), 121 deletions(-)
diff --git a/debian/control b/debian/control
index d349dc0..0ca886d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,24 +9,39 @@ Uploaders: Sune Vuorela <sune at debian.org>,
George Kiagiadakis <kiagiadakis.george at gmail.com>,
Eshat Cakar <info at eshat.de>,
Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12),
- kdepimlibs5-dev (>= 4:4.11.3), libphonon-dev (>= 4:4.6.0really4.3.80),
- pkg-config,
- libgpgme11-dev, libboost-dev (>= 1.40.0-2), libboost-graph-dev (>= 1.40.0-2),
- 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.9.51), shared-desktop-ontologies (>= 0.11),
- libgrantlee-dev (>= 0.3.0), libqtwebkit-dev, libqt4-opengl-dev, libprison-dev,
- nepomuk-core-dev (>= 4:4.11),
- libnepomukwidgets-dev (>= 4:4.11),
- akonadi-server (>= 1.9.51), liblink-grammar4-dev,
- libkactivities-dev (>= 4:4.11),
- libsoprano-dev (>= 2.9.0)
+Build-Depends: akonadi-server (>= 1.9.51),
+ cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.11),
+ kdepimlibs5-dev (>= 4:4.11.3),
+ libakonadi-dev (>= 1.9.51),
+ libassuan-dev,
+ libboost-dev (>= 1.40.0-2),
+ libboost-graph-dev (>= 1.40.0-2),
+ libgpgme11-dev,
+ libgrantlee-dev (>= 0.3.0),
+ libkactivities-dev (>= 4:4.11),
+ liblink-grammar4-dev,
+ libnepomukwidgets-dev (>= 4:4.11),
+ libphonon-dev (>= 4:4.6.0really4.3.80),
+ libprison-dev,
+ libqca2-dev (>= 2.0.0),
+ libqt4-opengl-dev,
+ libqtwebkit-dev,
+ libsasl2-dev,
+ libsearchclient-dev (>= 0.6.3),
+ libsoprano-dev (>= 2.9.0),
+ libstreamanalyzer-dev (>= 0.6.3),
+ libstreams-dev (>= 0.6.3),
+ libstrigihtmlgui-dev (>= 0.6.3),
+ libstrigiqtdbusclient-dev (>= 0.6.3),
+ libxss-dev,
+ nepomuk-core-dev (>= 4:4.11),
+ pkg-config,
+ pkg-kde-tools (>= 0.12),
+ shared-desktop-ontologies (>= 0.11),
+ xsltproc,
+ zlib1g-dev
Build-Depends-Indep: dblatex
Standards-Version: 3.9.5
XS-Testsuite: autopkgtest
@@ -37,13 +52,22 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kdepim.git
Package: kdepim
Section: metapackages
Architecture: all
-Depends: ${misc:Depends}, akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}),
- kalarm (>= ${source:Version}), kdepim-kresources (>= ${source:Version}),
- kmail (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}),
- konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}),
- ktimetracker (>= ${source:Version}), kjots (>= ${source:Version}),
- kleopatra (>= ${source:Version}), blogilo (>= ${source:Version}),
- akonadiconsole (>= ${source:Version})
+Depends: akonadiconsole (>= ${source:Version}),
+ akregator (>= ${source:Version}),
+ blogilo (>= ${source:Version}),
+ kaddressbook (>= ${source:Version}),
+ kalarm (>= ${source:Version}),
+ kdepim-kresources (>= ${source:Version}),
+ kjots (>= ${source:Version}),
+ kleopatra (>= ${source:Version}),
+ kmail (>= ${source:Version}),
+ knode (>= ${source:Version}),
+ knotes (>= ${source:Version}),
+ konsolekalendar (>= ${source:Version}),
+ kontact (>= ${source:Version}),
+ korganizer (>= ${source:Version}),
+ ktimetracker (>= ${source:Version}),
+ ${misc:Depends}
Description: Personal Information Management apps from the official KDE release
KDE (the K Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
@@ -56,9 +80,12 @@ Description: Personal Information Management apps from the official KDE release
Package: kdepim-mobile
Section: metapackages
Architecture: all
-Depends: ${misc:Depends}, kaddressbook-mobile (>= ${source:Version}),
- kmail-mobile (>= ${source:Version}), korganizer-mobile (>= ${source:Version}),
- notes-mobile (>= ${source:Version}), tasks-mobile (>= ${source:Version})
+Depends: kaddressbook-mobile (>= ${source:Version}),
+ kmail-mobile (>= ${source:Version}),
+ korganizer-mobile (>= ${source:Version}),
+ notes-mobile (>= ${source:Version}),
+ tasks-mobile (>= ${source:Version}),
+ ${misc:Depends}
Description: Personal Information Management apps for mobile environments
This metapackage includes a collection of official KDE Personal Information
Management (PIM) applications which have been designed for use in the mobile
@@ -68,7 +95,7 @@ Description: Personal Information Management apps for mobile environments
Package: akregator
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: kontact (<< 4:4.1.80)
Replaces: kontact (<< 4:4.1.80)
Homepage: http://akregator.kde.org/
@@ -85,10 +112,10 @@ Description: RSS/Atom feed aggregator
Package: kaddressbook
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: kdepim-kresources
-Breaks: korganizer (<< 4:4.1.80), kontact (<< 4:4.1.80)
-Replaces: korganizer (<< 4:4.1.80), kontact (<< 4:4.1.80)
+Breaks: kontact (<< 4:4.1.80), korganizer (<< 4:4.1.80)
+Replaces: kontact (<< 4:4.1.80), korganizer (<< 4:4.1.80)
Description: address book and contact data manager
KAddressBook enables you to manage your contacts efficiently and comfortably.
It can load and save your contacts to many different locations, including
@@ -99,7 +126,7 @@ Description: address book and contact data manager
Package: kaddressbook-mobile
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: kdepim-kresources
Description: address book and contact data manager for mobile environments
This package provides a convenient application for managing your addresses and
@@ -110,7 +137,7 @@ Description: address book and contact data manager for mobile environments
Package: kalarm
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
Suggests: jovie
Homepage: http://www.astrojar.org.uk/kalarm/
Description: alarm message, command and email scheduler
@@ -128,7 +155,7 @@ Description: alarm message, command and email scheduler
Package: kdepim-kresources
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: korganizer
Suggests: knotes
Breaks: korganizer (<< 4:4.1.80)
@@ -142,8 +169,13 @@ Description: KDE PIM resource plugins
Package: kleopatra
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt4 | pinentry-x11
+Depends: dirmngr,
+ gnupg-agent,
+ gnupg2,
+ gpgsm,
+ pinentry-qt4 | pinentry-x11,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: certificate Manager
Kleopatra is a tool for managing X.509 certificates and pgp keys.
.
@@ -152,11 +184,17 @@ Description: certificate Manager
Package: kmail
Section: mail
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Recommends: gnupg2, gnupg-agent, pinentry-qt4 | pinentry-x11
-Suggests: kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter | spambayes (>= 1.0.4-6) | bsfilter | crm114, clamav | f-prot-installer, procmail
-Breaks: kmailcvt (<< 4:3.90.0), akonadi-kde (<< 4:4.1.3), kontact (<< 4:4.1.80)
-Replaces: kmailcvt (<< 4:3.90.0), akonadi-kde (<< 4:4.1.3), kontact (<< 4:4.1.80)
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Recommends: gnupg-agent, gnupg2, pinentry-qt4 | pinentry-x11
+Suggests: clamav | f-prot-installer,
+ kaddressbook,
+ kleopatra,
+ procmail,
+ spamassassin | bogofilter | annoyance-filter | spambayes (>= 1.0.4-6) | bsfilter | crm114
+Breaks: akonadi-kde (<< 4:4.1.3), kmailcvt (<< 4:3.90.0), kontact (<< 4:4.1.80)
+Replaces: akonadi-kde (<< 4:4.1.3),
+ kmailcvt (<< 4:3.90.0),
+ kontact (<< 4:4.1.80)
Provides: imap-client, mail-reader
Homepage: http://kontact.kde.org/kmail/
Description: full featured graphical email client
@@ -171,7 +209,7 @@ Description: full featured graphical email client
Package: kmail-mobile
Section: mail
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: email client for mobile environments
This package provides an email client which has been specially designed for
use on mobile devices. It focuses on usability with touchscreen displays and
@@ -182,7 +220,7 @@ Description: email client for mobile environments
Package: knode
Section: news
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: kdepim-dev (<< 4:3.4.0), kontact (<< 4:4.1.80), libkpgp4 (<< 4:4.10.2)
Replaces: kdepim-dev (<< 4:3.4.0), kontact (<< 4:4.1.80), libkpgp4 (<< 4:4.10.2)
Provides: news-reader
@@ -197,7 +235,7 @@ Description: graphical news reader
Package: knotes
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: kdepim-kresources
Breaks: kontact (<< 4:4.1.80)
Replaces: kontact (<< 4:4.1.80)
@@ -210,7 +248,7 @@ Description: sticky notes application
Package: notes-mobile
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: notes application for mobile environments
This package provides notes taking application which has been specially
designed for use on mobile devices. Its user interface aims to make it easy to
@@ -221,7 +259,7 @@ Description: notes application for mobile environments
Package: konsolekalendar
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: konsole personal organizer
KonsoleKalendar is a command-line interface to KDE calendars.
KonsoleKalendar complements KOrganizer by providing a console
@@ -231,12 +269,12 @@ Description: konsole personal organizer
Package: kontact
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: kmail, knotes, akregator, kaddressbook, korganizer
-Suggests: gnokii, kjots, ktimetracker, knode
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: akregator, kaddressbook, kmail, knotes, korganizer
+Suggests: gnokii, kjots, knode, ktimetracker
Homepage: http://kontact.kde.org/
-Breaks: korganizer (<< 4:4.1.80), akregator (<< 4:4.1.80)
-Replaces: korganizer (<< 4:4.1.80), akregator (<< 4:4.1.80)
+Breaks: akregator (<< 4:4.1.80), korganizer (<< 4:4.1.80)
+Replaces: akregator (<< 4:4.1.80), korganizer (<< 4:4.1.80)
Description: integrated application for personal information management
Kontact is the integrated solution to your personal information management
needs. It combines applications like KMail, KOrganizer and
@@ -248,7 +286,7 @@ Description: integrated application for personal information management
Package: tasks-mobile
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: task management application for mobile environments
This package provides a task management application which user interface has
been designed for use on the mobile devices.
@@ -257,7 +295,7 @@ Description: task management application for mobile environments
Package: korganizer
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
Suggests: kdepim-kresources
Homepage: http://kontact.kde.org/korganizer/
Breaks: kaddressbook (<< 4:4.1.80), kontact (<< 4:4.1.80)
@@ -275,7 +313,7 @@ Description: calendar and personal organizer
Package: korganizer-mobile
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: calendar and personal organizer for mobile environments
This package provides a calendar and personal organizer applications which has
been specially designed for use on mobile devices. KOrganizer Mobile aims
@@ -287,7 +325,7 @@ Description: calendar and personal organizer for mobile environments
Package: ktimetracker
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: karm, kontact (<< 4:4.1.80)
Replaces: karm, kontact (<< 4:4.1.80)
Description: time tracker tool
@@ -299,7 +337,7 @@ Description: time tracker tool
Package: libcalendarsupport4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: calendar support library
This library defines calendar related model objects for KDE PIM module
applications and provides a common interface for accessing and managing
@@ -310,14 +348,14 @@ Description: calendar support library
Package: libcomposereditorng4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: compose editor library
This package is part of the KDE PIM module.
Package: libeventviews4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: event viewing library
This internal library implements a GUI framework for viewing various calendar
events in agenda, list, month view or timeline fashion.
@@ -327,14 +365,14 @@ Description: event viewing library
Package: libgrammar4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: grammar library
This package is part of the KDE PIM module.
Package: libincidenceeditorsng4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: incidence editors library
This library implements GUI components for incidence (including but not
limited to alarms, attendances, free-busy etc.) editing. These GUI components
@@ -345,7 +383,7 @@ Description: incidence editors library
Package: libpimcommon4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for common bits of KDEPIM
This internal library is for sharing some common bits between
the applications in KDEPIM
@@ -353,9 +391,9 @@ Description: library for common bits of KDEPIM
Package: libkdepim4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: kmail (<< 4:4.1.80), kdepim-runtime (<< 4:4.4.0)
-Replaces: kmail (<< 4:4.1.80), kdepim-runtime (<< 4:4.4.0)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kdepim-runtime (<< 4:4.4.0), kmail (<< 4:4.1.80)
+Replaces: kdepim-runtime (<< 4:4.4.0), kmail (<< 4:4.1.80)
Description: KDE PIM library
This is the internal runtime package for applications from the KDE PIM module.
It contains shared libraries and data which most of KDE PIM applications use.
@@ -365,7 +403,7 @@ Description: KDE PIM library
Package: libkdepimdbusinterfaces4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: KDE PIM D-Bus interfaces library
This internal library implements handling of D-Bus interfaces shared among
some of the KDE PIM applications.
@@ -375,7 +413,7 @@ Description: KDE PIM D-Bus interfaces library
Package: libkdgantt2-0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Gantt chart library
This library implements Gantt chart drawing functionality. It allows to easily
embed the Gantt charts into the application as long as it is capable of
@@ -386,7 +424,7 @@ Description: Gantt chart library
Package: libkleo4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: certificate based crypto library
This package contains libkleo, a library for Kleopatra and other parts
of KDE using certificate-based crypto.
@@ -396,7 +434,7 @@ Description: certificate based crypto library
Package: libkpgp4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
Description: gpg based crypto library
This package contains libkpgp4, a gnupg-library for KMail and other parts of
kdepim using gpg-based crypto.
@@ -406,7 +444,7 @@ Description: gpg based crypto library
Package: libksieve4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Sieve, the mail filtering language, library
This library implements a parser and lexer for Sieve, the mail filtering
language (RFC 3028).
@@ -416,7 +454,7 @@ Description: Sieve, the mail filtering language, library
Package: libkmanagesieve4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Sieve script remote management library
This library implements a subset of the protocol for remotely managing Sieve
scripts (RFC 5804). Among other basic operations, it provides an easy to use
@@ -428,7 +466,7 @@ Description: Sieve script remote management library
Package: libksieveui4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Sieve, the mail filtering language, GUI library
This library implements GUI dialogs and elements which enable users to easily
create, edit and manage their mail filters on the mail servers which support
@@ -440,7 +478,7 @@ Description: Sieve, the mail filtering language, GUI library
Package: libmailcommon4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: email utility library
This package contains common utility functions for dealing with email.
.
@@ -449,7 +487,7 @@ Description: email utility library
Package: libmailimporter4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: mailimporter library
This package contains a library for importing mails into KDE applicatiosn
.
@@ -458,7 +496,7 @@ Description: mailimporter library
Package: libmessagecomposer4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: message composer library
This package contains the message composer library. It provides basic e-mail
message composing facilities.
@@ -468,7 +506,7 @@ Description: message composer library
Package: libmessagecore4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: message core library
This package contains the message core library. It provides basic e-mail
message handling facilities.
@@ -478,7 +516,7 @@ Description: message core library
Package: libmessagelist4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
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.
@@ -488,7 +526,7 @@ Description: message list library
Package: libmessageviewer4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: message viewer library
This package contains the message viewer library which implements feature-rich
and highly configurable widget for viewing e-mail messages.
@@ -498,21 +536,21 @@ Description: message viewer library
Package: libpimactivity4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: pim activity library
This package is part of the KDE PIM module.
Package: libsendlater4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: send later library
This package is part of the KDE PIM module.
Package: libtemplateparser4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: KMail template parser library
This library implements a parser for the mail templates which KMail uses to
enable customization of initial structure for the new, reply or forwarded
@@ -523,7 +561,9 @@ Description: KMail template parser library
Package: libkdepimmobileui4
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdepim-mobileui-data (= ${source:Version})
+Depends: kdepim-mobileui-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: user interface library for KDE PIM mobile applications
This package contains a base user interface library for KDE PIM mobile
applications. It defines mobile UI design priciples in order to establish
@@ -544,7 +584,7 @@ Description: common data files for KDE PIM mobile applications
Package: kjots
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: kontact (<< 4:4.1.80)
Replaces: kontact (<< 4:4.1.80)
Section: utils
@@ -556,7 +596,7 @@ Description: note-taking utility
Package: blogilo
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
+Depends: libqt4-sql-sqlite, ${misc:Depends}, ${shlibs:Depends}
Description: graphical blogging client
Blogilo is a Free/Open Source Blogging client, focused on simplicity and
usability. Currently featured:
@@ -584,7 +624,7 @@ Description: graphical blogging client
Package: akonadiconsole
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: akonadi-kde (<< 4:4.3.0), kdepim-runtime (<< 4:4.4.0)
Replaces: akonadi-kde (<< 4:4.3.0), kdepim-runtime (<< 4:4.4.0)
Description: management and debugging console for akonadi
@@ -597,8 +637,7 @@ Description: management and debugging console for akonadi
Package: kdepim-dbg
Priority: extra
Section: debug
-Depends: ${misc:Depends}, kdepimlibs-dbg,
- kdepim (= ${source:Version}) |
+Depends: kdepim (= ${source:Version}) |
kaddressbook (= ${binary:Version}) |
kalarm (= ${binary:Version}) |
kdepim-kresources (= ${binary:Version}) |
@@ -616,7 +655,9 @@ Depends: ${misc:Depends}, kdepimlibs-dbg,
kmail-mobile (= ${binary:Version}) |
korganizer-mobile (= ${binary:Version}) |
notes-mobile (= ${binary:Version}) |
- tasks-mobile (= ${binary:Version})
+ tasks-mobile (= ${binary:Version}),
+ kdepimlibs-dbg,
+ ${misc:Depends}
Breaks: kdeutils-dbg (<< 4:4.0.80)
Replaces: kdeutils-dbg (<< 4:4.0.80)
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index ce9fa73..e18174b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,7 +38,7 @@ GPLv2orv3eV
published by the Free Software Foundation; either version 2 of
the License or (at your option) version 3 or any later version
accepted by the membership of KDE e.V. (or its successor approved
- by the membership of KDE e.V.), which shall act as a proxy
+ by the membership of KDE e.V.), which shall act as a proxy
defined in Section 14 of version 3 of the license.
This program is distributed in the hope that it will be useful,
@@ -109,7 +109,7 @@ MIT
THE SOFTWARE.
bsd-ish
-(from kdelibs COPYING-CMAKE-SCRIPTS)
+(from kdelibs COPYING-CMAKE-SCRIPTS)
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -119,7 +119,7 @@ bsd-ish
2. Redistributions in binary form must reproduce the copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
+ 3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -296,5 +296,5 @@ copyright (C) 2004 Chris Howells
copyright (C) 2005 Danny Kukawka <danny.kukawka at web.de>
copyright (C) 2005 Robert Rockers
-The debian packaging is licensed under the gplv2 or later.
+The debian packaging is licensed under the gplv2 or later.
Please see /usr/share/common-licenses/GPL-2 for details
diff --git a/debian/kmail-mobile.install b/debian/kmail-mobile.install
index 30140fa..4ea2e18 100644
--- a/debian/kmail-mobile.install
+++ b/debian/kmail-mobile.install
@@ -3,31 +3,31 @@ usr/share/applications/kde4/kmail-mobile.desktop
usr/share/icons/hicolor/48x48/apps/kmail-mobile.png
usr/share/icons/hicolor/64x64/apps/kmail-mobile.png
usr/share/icons/hicolor/80x80/apps/kmail-mobile-harmattan.png
+usr/share/kde4/apps/kmail-mobile/AboutPage.qml
+usr/share/kde4/apps/kmail-mobile/AccountSettingsPage.qml
+usr/share/kde4/apps/kmail-mobile/AclEditor.qml
+usr/share/kde4/apps/kmail-mobile/AttachmentEditor.qml
usr/share/kde4/apps/kmail-mobile/BulkActionComponent.qml
+usr/share/kde4/apps/kmail-mobile/ConfigDialog.qml
+usr/share/kde4/apps/kmail-mobile/EditorView.qml
usr/share/kde4/apps/kmail-mobile/FavoriteManagerPage.qml
-usr/share/kde4/apps/kmail-mobile/kmail-mobile.notifyrc
-usr/share/kde4/apps/kmail-mobile/kmail-composer.qml
-usr/share/kde4/apps/kmail-mobile/ForwardOptionsPage.qml
-usr/share/kde4/apps/kmail-mobile/kmail-mobile.qml
-usr/share/kde4/apps/kmail-mobile/add-attachment-button.png
-usr/share/kde4/apps/kmail-mobile/SnippetsEditor.qml
-usr/share/kde4/apps/kmail-mobile/AclEditor.qml
-usr/share/kde4/apps/kmail-mobile/SnippetsList.qml
-usr/share/kde4/apps/kmail-mobile/toggle-signature-button.png
usr/share/kde4/apps/kmail-mobile/FilterEditor.qml
-usr/share/kde4/apps/kmail-mobile/ConfigDialog.qml
-usr/share/kde4/apps/kmail-mobile/StartPage.qml
-usr/share/kde4/apps/kmail-mobile/AttachmentEditor.qml
+usr/share/kde4/apps/kmail-mobile/ForwardOptionsPage.qml
+usr/share/kde4/apps/kmail-mobile/HeaderView.qml
usr/share/kde4/apps/kmail-mobile/KMailActions.qml
usr/share/kde4/apps/kmail-mobile/KMailComposerActions.qml
-usr/share/kde4/apps/kmail-mobile/HeaderView.qml
-usr/share/kde4/apps/kmail-mobile/toggle-encryption-button.png
+usr/share/kde4/apps/kmail-mobile/MarkAsPage.qml
usr/share/kde4/apps/kmail-mobile/NewMailPage.qml
-usr/share/kde4/apps/kmail-mobile/EditorView.qml
+usr/share/kde4/apps/kmail-mobile/ReplyOptionsPage.qml
usr/share/kde4/apps/kmail-mobile/SettingsPage.qml
-usr/share/kde4/apps/kmail-mobile/AccountSettingsPage.qml
-usr/share/kde4/apps/kmail-mobile/remove-attachment-button.png
-usr/share/kde4/apps/kmail-mobile/AboutPage.qml
+usr/share/kde4/apps/kmail-mobile/SnippetsEditor.qml
+usr/share/kde4/apps/kmail-mobile/SnippetsList.qml
+usr/share/kde4/apps/kmail-mobile/StartPage.qml
usr/share/kde4/apps/kmail-mobile/VacationScriptIndicator.qml
-usr/share/kde4/apps/kmail-mobile/ReplyOptionsPage.qml
-usr/share/kde4/apps/kmail-mobile/MarkAsPage.qml
+usr/share/kde4/apps/kmail-mobile/add-attachment-button.png
+usr/share/kde4/apps/kmail-mobile/kmail-composer.qml
+usr/share/kde4/apps/kmail-mobile/kmail-mobile.notifyrc
+usr/share/kde4/apps/kmail-mobile/kmail-mobile.qml
+usr/share/kde4/apps/kmail-mobile/remove-attachment-button.png
+usr/share/kde4/apps/kmail-mobile/toggle-encryption-button.png
+usr/share/kde4/apps/kmail-mobile/toggle-signature-button.png
diff --git a/debian/kmail.install b/debian/kmail.install
index 0cb4527..5a89121 100644
--- a/debian/kmail.install
+++ b/debian/kmail.install
@@ -35,20 +35,20 @@ usr/share/doc/kde/HTML/*/akonadi_archivemail_agent/
usr/share/doc/kde/HTML/*/akonadi_sendlater_agent/
usr/share/doc/kde/HTML/*/headerthemeeditor/
usr/share/doc/kde/HTML/*/importwizard
-usr/share/doc/kde/HTML/*/kmailcvt/
usr/share/doc/kde/HTML/*/kmail/
+usr/share/doc/kde/HTML/*/kmailcvt/
usr/share/doc/kde/HTML/*/ktnef/
usr/share/doc/kde/HTML/*/pimsettingexporter/
usr/share/icons/hicolor/128x128/apps/kmail.png
-usr/share/icons/hicolor/16x16/apps/kmailcvt.png
usr/share/icons/hicolor/16x16/apps/kmail.png
+usr/share/icons/hicolor/16x16/apps/kmailcvt.png
usr/share/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
usr/share/icons/hicolor/22x22/actions/ktnef_extract_to.png
usr/share/icons/hicolor/22x22/apps/kmail.png
-usr/share/icons/hicolor/32x32/apps/kmailcvt.png
usr/share/icons/hicolor/32x32/apps/kmail.png
-usr/share/icons/hicolor/48x48/apps/kmailcvt.png
+usr/share/icons/hicolor/32x32/apps/kmailcvt.png
usr/share/icons/hicolor/48x48/apps/kmail.png
+usr/share/icons/hicolor/48x48/apps/kmailcvt.png
usr/share/icons/hicolor/48x48/apps/ktnef.png
usr/share/icons/hicolor/64x64/apps/kmail.png
usr/share/icons/hicolor/scalable/apps/kmail.svgz
@@ -106,11 +106,11 @@ usr/share/kde4/apps/ktnef/ktnefui.rc
usr/share/kde4/apps/messageviewer/plugins/bodypartformatter/text_calendar.desktop
usr/share/kde4/apps/messageviewer/plugins/bodypartformatter/text_vcard.desktop
usr/share/kde4/apps/messageviewer/plugins/bodypartformatter/text_xdiff.desktop
-usr/share/kde4/apps/messageviewer/themes/example_fancy/header.desktop
-usr/share/kde4/apps/messageviewer/themes/example_fancy/header.html
usr/share/kde4/apps/messageviewer/themes/example/header.desktop
usr/share/kde4/apps/messageviewer/themes/example/header.html
usr/share/kde4/apps/messageviewer/themes/example/header_row.html
+usr/share/kde4/apps/messageviewer/themes/example_fancy/header.desktop
+usr/share/kde4/apps/messageviewer/themes/example_fancy/header.html
usr/share/kde4/apps/pimsettingexporter/pimsettingexporter.rc
usr/share/kde4/config.kcfg/customtemplates_kfg.kcfg
usr/share/kde4/config.kcfg/kmail.kcfg
diff --git a/debian/knotes.install b/debian/knotes.install
index 6eb5601..e230c95 100644
--- a/debian/knotes.install
+++ b/debian/knotes.install
@@ -15,8 +15,8 @@ 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/icons/hicolor/scalable/apps/knotes.svgz
-usr/share/kde4/apps/knotes/knotesappui.rc
usr/share/kde4/apps/knotes/knotes_part.rc
+usr/share/kde4/apps/knotes/knotesappui.rc
usr/share/kde4/apps/knotes/knotesui.rc
usr/share/kde4/apps/kontact/ksettingsdialog/knotes.setdlg
usr/share/kde4/config.kcfg/knoteconfig.kcfg
diff --git a/debian/patches/disable_test_verify b/debian/patches/disable_test_verify
index f986fb3..30db1f6 100644
--- a/debian/patches/disable_test_verify
+++ b/debian/patches/disable_test_verify
@@ -1,13 +1,13 @@
Index: kdepim/kleopatra/tests/CMakeLists.txt
===================================================================
--- kdepim.orig/kleopatra/tests/CMakeLists.txt 2014-01-28 10:23:22.448367127 +0100
-+++ kdepim/kleopatra/tests/CMakeLists.txt 2014-01-28 16:23:37.908433875 +0100
++++ kdepim/kleopatra/tests/CMakeLists.txt 2014-01-28 16:37:12.186983895 +0100
@@ -54,7 +54,7 @@
add_definitions(-DKLEO_TEST_GNUPGHOME=\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\")
add_definitions(-DKLEO_TEST_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}\")
-kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
-+# kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
++kde4_add_executable(test_verify ${test_verify_SRCS})
target_link_libraries(test_verify
kleo
--
KDE PIM module packaging
More information about the pkg-kde-commits
mailing list