[SCM] KDE PIM module packaging branch, experimental, updated. debian/4.4.11.1+l10n-1-59-gad3f742

Eshat Cakar eshat-guest at alioth.debian.org
Wed Feb 8 13:38:21 UTC 2012


The following commit has been merged in the experimental branch:
commit ad3f74237ec9e0dbb0956706ce5fb4a24594b873
Author: Eshat Cakar <info at eshat.de>
Date:   Wed Feb 8 14:27:34 2012 +0100

    Remove empty kdepim-groupware and kdepim-wizard packages
---
 debian/changelog                          |    1 +
 debian/control                            |   37 +---------------------------
 debian/kdepim-groupware.lintian-overrides |    1 -
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3b8ce4..ed07648 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ kdepim (4:4.8.0-0r0) UNRELEASED; urgency=low
   * Add myself to uploaders.
   * Bump kdelibs5-dev and kdepimlibs5-dev build dependecies to 4:4.8.
   * Add libprision-dev for QR Code support of contacts.
+  * Remove empty kdepim-groupware and kdepim-wizard packages.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Dec 2011 00:37:45 +0100
 
diff --git a/debian/control b/debian/control
index ea53803..28cd4c2 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdepim.git
 Package: kdepim
 Architecture: all
 Depends: ${misc:Depends}, akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}),
- kalarm (>= ${source:Version}), kdepim-kresources (>= ${source:Version}), kdepim-wizards (>= ${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}), kdepim-strigi-plugins (>= ${source:Version}), kjots (>= ${source:Version}),
@@ -106,37 +106,6 @@ Description: KDE PIM resource plugins
  .
  This package is part of KDE, and a component of the KDE PIM module.
 
-Package: kdepim-groupware
-Section: kde
-Architecture: any
-Recommends: kdepim-wizards
-Breaks: 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)
-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}
-Description: KDE PIM Groupware plugins
- This package includes several plugins used by KDE PIM components to
- interface with Groupware servers. Supported Groupware platforms include
- eGroupware, Kolab 2, Scalix and SLOX (SuSE Linux Openexchange Server),
- Novell GroupWise and GroupDAV.
- .
- This package is part of KDE, and a component of the KDE PIM module.
-
-Package: kdepim-wizards
-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
- Server) and Novell GroupWise groupware servers.
- .
- This package is part of KDE, and a component of the KDE PIM module.
-
 #Package: kitchensync
 #Section: kde
 #Architecture: any
@@ -261,7 +230,7 @@ Package: korganizer
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-Suggests: kdepim-kresources, kdepim-groupware
+Suggests: kdepim-kresources
 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)
@@ -529,10 +498,8 @@ Depends: ${misc:Depends}, kdepimlibs-dbg,
  kdepim  (= ${source:Version}) |
  kaddressbook (= ${binary:Version}) |
  kalarm (= ${binary:Version}) |
- kdepim-groupware (= ${binary:Version}) |
  kdepim-kresources (= ${binary:Version}) |
  kdepim-strigi-plugins (= ${binary:Version}) |
- kdepim-wizards (= ${binary:Version}) |
  kjots (= ${binary:Version}) |
  kleopatra (= ${binary:Version}) |
  kmail (= ${binary:Version}) |
diff --git a/debian/kdepim-groupware.install b/debian/kdepim-groupware.install
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/kdepim-groupware.lintian-overrides b/debian/kdepim-groupware.lintian-overrides
deleted file mode 100644
index 0f60ba3..0000000
--- a/debian/kdepim-groupware.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kdepim-groupware: package-name-doesnt-match-sonames libgwsoap4 libkabcgroupwise4 libkcalgroupwise4
diff --git a/debian/kdepim-wizards.install b/debian/kdepim-wizards.install
deleted file mode 100644
index e69de29..0000000

-- 
KDE PIM module packaging



More information about the pkg-kde-commits mailing list