[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.11.1-1-6-g053e3ab

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Wed May 25 19:22:54 UTC 2011


The following commit has been merged in the master branch:
commit 053e3ab9c5ef02d62005bde39de8cb1a64b22703
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed May 25 20:51:04 2011 +0200

    Add conflicts against kde-l10n.
---
 debian/control |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/debian/control b/debian/control
index 9930b36..d385fd0 100644
--- a/debian/control
+++ b/debian/control
@@ -80,6 +80,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: kontact (<< 4:4.1.80)
 Replaces: kontact (<< 4:4.1.80)
+Conflicts: kde-l10n
 Homepage: http://akregator.kde.org/
 Description: RSS/Atom feed aggregator 
  Akregator is a news feed reader. It enables you to follow  
@@ -98,6 +99,7 @@ Depends: ${shlibs:Depends}, ${misc: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)
+Conflicts: kde-l10n
 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 
@@ -110,6 +112,7 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Suggests: kttsd | jovie
+Conflicts: kde-l10n
 Homepage: http://www.astrojar.org.uk/kalarm/
 Description: alarm message, command and email scheduler
  KAlarm provides a graphical interface to schedule personal timed events -
@@ -132,6 +135,7 @@ Recommends: korganizer
 Suggests: knotes
 Breaks: korganizer (<< 4:4.1.80)
 Replaces: korganizer (<< 4:4.1.80)
+Conflicts: kde-l10n
 Description: KDE PIM resource plugins
  This package adds more resource plugins for KDE PIM applications such as
  blogging, tracking feature plans etc.
@@ -146,6 +150,7 @@ Breaks: korganizer (<< 4:4.1.80), knotes (<< 4:4.1.80), kaddressbook (<< 4:4.1.8
  kdepim-kresources (<< 4:4.1.80)
 Replaces: korganizer (<< 4:4.1.80), knotes (<< 4:4.1.80), kaddressbook (<< 4:4.1.80), libkdepim4 (<< 4:4.1.80),
  kdepim-kresources (<< 4:4.1.80)
+Conflicts: kde-l10n
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Description: KDE PIM Groupware plugins
  This package includes several plugins used by KDE PIM components to
@@ -160,6 +165,7 @@ Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kdepim-groupware (= ${binary:Version})
 Suggests: egroupware
+Conflicts: kde-l10n
 Description: KDE server configuration wizards
  This package contains KDE-based wizards for configuring KDE PIM applications
  to access eGroupware, Kolab 2, Scalix and SLOX (SuSE Linux Openexchange
@@ -185,6 +191,7 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt4 | pinentry-x11
+Conflicts: kde-l10n
 Description: certificate Manager
  Kleopatra is a tool for managing X.509 certificates and pgp keys.
  .
@@ -199,6 +206,7 @@ Suggests: kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter
 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)
 Provides: imap-client, mail-reader
+Conflicts: kde-l10n
 Homepage: http://kontact.kde.org/kmail/
 Description: full featured graphical email client
  KMail is a fully-featured email client that fits nicely into the KDE
@@ -230,6 +238,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: kdepim-dev (<< 4:3.4.0), kontact (<< 4:4.1.80)
 Replaces: kdepim-dev (<< 4:3.4.0), kontact (<< 4:4.1.80)
 Provides: news-reader
+Conflicts: kde-l10n
 Homepage: http://kontact.kde.org/knode/
 Description: graphical news reader
  KNode is an easy-to-use, convenient newsreader. It is intended to be usable
@@ -246,6 +255,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: kdepim-kresources
 Breaks: kontact (<< 4:4.1.80)
 Replaces: kontact (<< 4:4.1.80)
+Conflicts: kde-l10n
 Description: sticky notes application
  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
@@ -257,6 +267,7 @@ Package: konsolekalendar
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kde-l10n
 Description: konsole personal organizer
  KonsoleKalendar is a command-line interface to KDE calendars.
  KonsoleKalendar complements KOrganizer by providing a console
@@ -273,6 +284,7 @@ Suggests: gnokii, kjots, ktimetracker, knode
 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)
+Conflicts: kde-l10n
 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
@@ -289,6 +301,7 @@ Suggests: kdepim-kresources, kdepim-groupware
 Homepage: http://kontact.kde.org/korganizer/
 Breaks: kaddressbook (<< 4:4.1.80), kontact (<< 4:4.1.80)
 Replaces: kaddressbook (<< 4:4.1.80), kontact (<< 4:4.1.80)
+Conflicts: kde-l10n
 Description: calendar and personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
@@ -306,6 +319,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: karm, kontact (<< 4:4.1.80)
 Replaces: karm, kontact (<< 4:4.1.80)
+Conflicts: kde-l10n
 Description: time tracker tool
  KTimetracker is a time tracker for busy people who need to keep track
  of the amount of time they spend on various tasks.
@@ -318,6 +332,7 @@ 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)
+Conflicts: kde-l10n
 Description: KDE PIM library
  This is the runtime package for programs that use the libkdepim library.
  .
@@ -327,6 +342,7 @@ Package: libkleo4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kde-l10n
 Description: certificate based crypto library
  This package contains libkleo, a library for Kleopatra and other parts
  of KDE using certificate-based crypto.
@@ -337,6 +353,7 @@ Package: libkpgp4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kde-l10n
 Description: gpg based crypto library
  This package contains libkpgp4, a gnupg-library for KMail and other parts of
  kdepim using gpg-based crypto.
@@ -347,6 +364,7 @@ Package: libksieve4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kde-l10n
 Description: mail/news message filtering library
  This is the runtime package for programs that use the libksieve library.
  .
@@ -368,6 +386,7 @@ Package: libmessagecore4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kde-l10n
 Description: message core library 
  This package contains the message core library. It provides basic e-mail
  message handling facilities.
@@ -378,6 +397,7 @@ Package: libmessagelist4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kde-l10n
 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.
@@ -388,6 +408,7 @@ Package: libmessageviewer0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kde-l10n
 Description: message viewer library
  This package contains the message viewer library which implements feature-rich
  and highly configurable widget for viewing e-mail messages.
@@ -409,6 +430,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: kontact (<< 4:4.1.80)
 Replaces: kontact (<< 4:4.1.80)
+Conflicts: kde-l10n
 Section: utils
 Description: note-taking utility 
  Kjots is a notebook utility that organizes notes using groups of pages.
@@ -419,6 +441,7 @@ Package: blogilo
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
+Conflicts: kde-l10n
 Description: graphical blogging client 
  Blogilo is a Free/Open Source Blogging client, focused on simplicity and
  usability. Currently featured:

-- 
KDE PIM module packaging



More information about the pkg-kde-commits mailing list