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

Ana Beatriz Guerrero López ana at alioth.debian.org
Mon Jul 28 15:26:50 UTC 2008 

Author: ana
Date: 2008-07-28 15:26:50 +0000 (Mon, 28 Jul 2008)
New Revision: 11787

Modified:
   branches/kde4/packages/kdepim/debian/akregator.install
   branches/kde4/packages/kdepim/debian/changelog
   branches/kde4/packages/kdepim/debian/control
   branches/kde4/packages/kdepim/debian/kdepim-doc.install
   branches/kde4/packages/kdepim/debian/kjots.install
   branches/kde4/packages/kdepim/debian/patches/series
   branches/kde4/packages/kdepim/debian/rules
Log:
  * Update installed files and build depend versions.
  * Bump shlibs to 4:4.1.0 in debian/rules.
  * Disable korn that has been removed upstream.
  * kjots is now a service and it does not shown in the menu anymore.



Modified: branches/kde4/packages/kdepim/debian/akregator.install
===================================================================
--- branches/kde4/packages/kdepim/debian/akregator.install	2008-07-28 15:03:28 UTC (rev 11786)
+++ branches/kde4/packages/kdepim/debian/akregator.install	2008-07-28 15:26:50 UTC (rev 11787)
@@ -17,7 +17,6 @@
 usr/share/icons/hicolor/scalable/apps/akregator.svgz
 usr/share/kde4/apps/akregator/*
 usr/share/kde4/apps/akregator/about/*
-usr/share/kde4/apps/akregator/kpartplugins/*
 usr/share/kde4/apps/akregator/pics/*
 usr/share/kde4/apps/kontact/ksettingsdialog/akregator.setdlg
 usr/share/kde4/config.kcfg/akregator.kcfg

Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4/packages/kdepim/debian/changelog	2008-07-28 15:03:28 UTC (rev 11786)
+++ branches/kde4/packages/kdepim/debian/changelog	2008-07-28 15:26:50 UTC (rev 11787)
@@ -1,9 +1,16 @@
-kdepim (4:4.0.99-1) UNRELEASED; urgency=low
+kdepim (4:4.1.0-1) experimental; urgency=low
 
-  * 10_hide_kjotspart_menu.diff (Closes: #491112)
+  * New upstream release.
 
- -- Xavier Vello <xavier.vello at gmail.com>  Mon, 21 Jul 2008 16:18:27 +0200
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+  
+  * Update installed files and build depend versions.
+  * Bump shlibs to 4:4.1.0 in debian/rules.
+  * Disable korn that has been removed upstream.
+  * kjots is now a service and it does not shown in the menu anymore.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 15 Jun 2008 21:18:47 +0200
+
 kdepim (4:4.0.98-1) experimental; urgency=low
 
   * New upstream release, Release Candidate 1.

Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control	2008-07-28 15:03:28 UTC (rev 11786)
+++ branches/kde4/packages/kdepim/debian/control	2008-07-28 15:26:50 UTC (rev 11787)
@@ -4,15 +4,15 @@
 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>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs, debhelper (>= 6), cmake (>= 2.4.5), quilt,
- kdelibs5-dev (>= 4:4.0.98), kdepimlibs5-dev (>= 4:4.0.98),
- libphonon-dev (>= 4:4.2~), 
+Build-Depends: cdbs, debhelper (>= 6), cmake (>= 2.6.0), quilt,
+ kdelibs5-dev (>= 4:4.1.0), kdepimlibs5-dev (>= 4:4.1.0),
+ libphonon-dev (>= 4:4.2.0), 
  libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,
  xsltproc, libgnokii3-dev, libxss-dev, libqca2-dev (>= 2.0.0),
  libopensync1exp3-dev, libassuan-dev,
  libstreams-dev, libstreamanalyzer-dev, libsearchclient-dev,
  libstrigihtmlgui-dev, libstrigiqtdbusclient-dev, zlib1g-dev,
- libakonadi-dev (>= 0.81.0)
+ libakonadi-dev (>= 1.0.0)
 Standards-Version: 3.7.3
 Homepage: http://pim.kde.org/
 
@@ -21,8 +21,9 @@
 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}), kleopatra (>= ${source:Version}),
  kmail (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), kode (>= ${source:Version}),
- konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}), korn (>= ${source:Version}),
+ konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}),
  ktimetracker (>= ${source:Version}), ktnef (>= ${source:Version}), kdepim-strigi-plugins (>= ${source:Version}), kjots (>= ${source:Version})
+#korn (>= ${source:Version}),
 # kmobiletools (>= ${source:Version}), kpilot (>= ${source:Version})
 Suggests: kdepim-doc
 Description: Personal Information Management apps from the official KDE release
@@ -293,20 +294,20 @@
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
-Package: korn
-Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: KDE mail checker
- Korn is a KDE mail checker that can display a small summary in the Kicker
- tray.  It supports checking mbox, pop3, imap4, and nntp sources.
- .
- Once mail is received you can have Korn run a third party program or change
- the color/icon of the Kicker display.  In addition to this you can have
- Korn run a program once you click on the docked icon in Kicker.
- .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
+#Package: korn
+#Section: kde
+#Architecture: any
+#Depends: ${shlibs:Depends}
+#Description: KDE mail checker
+# Korn is a KDE mail checker that can display a small summary in the Kicker
+# tray.  It supports checking mbox, pop3, imap4, and nntp sources.
+# .
+# Once mail is received you can have Korn run a third party program or change
+# the color/icon of the Kicker display.  In addition to this you can have
+# Korn run a program once you click on the docked icon in Kicker.
+# .
+# This package is part of KDE, and a component of the KDE PIM module.
+# See the 'kde' and 'kdepim' packages for more information.
 
 # Enabled for 4.2
 # Package: kpilot

Modified: branches/kde4/packages/kdepim/debian/kdepim-doc.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kdepim-doc.install	2008-07-28 15:03:28 UTC (rev 11786)
+++ branches/kde4/packages/kdepim/debian/kdepim-doc.install	2008-07-28 15:26:50 UTC (rev 11787)
@@ -182,8 +182,6 @@
 usr/share/doc/kde4/HTML/en/korganizer/plugins-chapter.docbook
 usr/share/doc/kde4/HTML/en/korganizer/remotefile-resource.png
 usr/share/doc/kde4/HTML/en/korganizer/todo-general.png
-usr/share/doc/kde4/HTML/en/korn/index.cache.bz2
-usr/share/doc/kde4/HTML/en/korn/index.docbook
 # usr/share/doc/kde4/HTML/en/kpilot/address-app.png
 # usr/share/doc/kde4/HTML/en/kpilot/conduit-knotes.png
 # usr/share/doc/kde4/HTML/en/kpilot/conduit-mal.png

Modified: branches/kde4/packages/kdepim/debian/kjots.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kjots.install	2008-07-28 15:03:28 UTC (rev 11786)
+++ branches/kde4/packages/kdepim/debian/kjots.install	2008-07-28 15:26:50 UTC (rev 11787)
@@ -1,7 +1,6 @@
 usr/bin/kjots
 usr/lib/kde4/kjotspart.so
 usr/share/applications/kde4/Kjots.desktop
-usr/share/applications/kde4/kjotspart.desktop
 usr/share/doc/kde4/HTML/en/kjots/common
 usr/share/doc/kde4/HTML/en/kjots/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kjots/index.docbook
@@ -15,9 +14,9 @@
 usr/share/kde4/apps/kontact/ksettingsdialog/kjots.setdlg
 usr/share/kde4/config.kcfg/kjots.kcfg
 usr/share/kde4/services/kontact/kjots_plugin.desktop
+usr/share/kde4/services/kjotspart.desktop
 usr/share/icons/oxygen/16x16/actions/edit-delete-page.png
 usr/share/icons/oxygen/22x22/actions/edit-delete-page.png
 usr/share/icons/oxygen/32x32/actions/edit-delete-page.png
 usr/share/icons/oxygen/48x48/actions/edit-delete-page.png
 usr/share/icons/oxygen/scalable/actions/edit-delete-page.svgz
-

Modified: branches/kde4/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/series	2008-07-28 15:03:28 UTC (rev 11786)
+++ branches/kde4/packages/kdepim/debian/patches/series	2008-07-28 15:26:50 UTC (rev 11787)
@@ -1,3 +1,3 @@
-10_hide_kjotspart_menu.diff
+#10_hide_kjotspart_menu.diff
 30_debianize_akregator_default.diff
 97_fix_target_link_libraries.diff

Modified: branches/kde4/packages/kdepim/debian/rules
===================================================================
--- branches/kde4/packages/kdepim/debian/rules	2008-07-28 15:03:28 UTC (rev 11786)
+++ branches/kde4/packages/kdepim/debian/rules	2008-07-28 15:26:50 UTC (rev 11787)
@@ -2,10 +2,10 @@
 
 include debian/cdbs/kde.mk
 
-DEB_DH_MAKESHLIBS_ARGS_libkdepim4 := -V'libkdepim4 (>= 4:4.0.98)'
-DEB_DH_MAKESHLIBS_ARGS_libkholidays4 := -V'libkholidays4 (>= 4:4.0.98)'
-DEB_DH_MAKESHLIBS_ARGS_libkleo4 :=  -V'libkleo4 (>= 4:4.0.98)'
-DEB_DH_MAKESHLIBS_ARGS_libkpgp4 :=  -V'libkpgp4 (>= 4:4.0.98)'
-DEB_DH_MAKESHLIBS_ARGS_libksieve4 :=  -V'libksieve4 (>= 4:4.0.98)'
-DEB_DH_MAKESHLIBS_ARGS_libmaildir4 :=  -V'libmaildir4 (>= 4:4.0.98)'
-DEB_DH_MAKESHLIBS_ARGS_libmimelib4 :=  -V'libmimelib4 (>= 4:4.0.98)'
+DEB_DH_MAKESHLIBS_ARGS_libkdepim4 := -V'libkdepim4 (>= 4:4.1.0)'
+DEB_DH_MAKESHLIBS_ARGS_libkholidays4 := -V'libkholidays4 (>= 4:4.1.0)'
+DEB_DH_MAKESHLIBS_ARGS_libkleo4 :=  -V'libkleo4 (>= 4:4.1.0)'
+DEB_DH_MAKESHLIBS_ARGS_libkpgp4 :=  -V'libkpgp4 (>= 4:4.1.0)'
+DEB_DH_MAKESHLIBS_ARGS_libksieve4 :=  -V'libksieve4 (>= 4:4.1.0)'
+DEB_DH_MAKESHLIBS_ARGS_libmaildir4 :=  -V'libmaildir4 (>= 4:4.1.0)'
+DEB_DH_MAKESHLIBS_ARGS_libmimelib4 :=  -V'libmimelib4 (>= 4:4.1.0)'

More information about the pkg-kde-commits mailing list