rev 17222 - in trunk/packages/kdeadmin/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2010-02-28 19:19:37 +0000 (Sun, 28 Feb 2010)
New Revision: 17222

Added:
   trunk/packages/kdeadmin/debian/kde-config-cron.install
Removed:
   trunk/packages/kdeadmin/debian/kcron.install
   trunk/packages/kdeadmin/debian/kpackage.install
   trunk/packages/kdeadmin/debian/patches/03_fix_runtime_fail_type_mismatch.diff
Modified:
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/control
   trunk/packages/kdeadmin/debian/patches/series
Log:
* Remove 03_fix_runtime_fail_type_mismatch, merged upstream.
* KPackage dead, remove it.
* Rename kcron to kde-config-cron to match agreed upon naming scheme. keep
  transitional package until squeeze is out.
* Update install files

Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2010-02-28 18:23:34 UTC (rev 17221)
+++ trunk/packages/kdeadmin/debian/changelog	2010-02-28 19:19:37 UTC (rev 17222)
@@ -1,4 +1,4 @@
-kdeadmin (4:4.4.1-0) UNRELEASED; urgency=low
+kdeadmin (4:4.4.1-0r1) UNRELEASED; urgency=low
 
   * New upstream release:
     - system-config-printer-kde works again with non-English locales.
@@ -9,6 +9,13 @@
   * Fix Vcs-Browser URL.
   * Add cmake to Build-Depends.
   * Add kde-sc-dev-latest (>= 4:4.4.1) to Build-Depends.
+ 
+  [ Sune Vuorela ]
+  * Remove 03_fix_runtime_fail_type_mismatch, merged upstream.
+  * KPackage dead, remove it.
+  * Rename kcron to kde-config-cron to match agreed upon naming scheme. keep
+    transitional package until squeeze is out.
+  * Update install files
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Feb 2010 01:18:56 +0200
 

Modified: trunk/packages/kdeadmin/debian/control
===================================================================
--- trunk/packages/kdeadmin/debian/control	2010-02-28 18:23:34 UTC (rev 17221)
+++ trunk/packages/kdeadmin/debian/control	2010-02-28 19:19:37 UTC (rev 17222)
@@ -14,8 +14,8 @@
 Package: kdeadmin
 Section: kde
 Architecture: all
-Depends: kcron (>= ${source:Version}), knetworkconf (>= ${source:Version}),
- kpackage (>= ${source:Version}), ksystemlog (>= ${source:Version}),
+Depends: kde-config-cron (>= ${source:Version}), knetworkconf (>= ${source:Version}),
+ ksystemlog (>= ${source:Version}),
  kuser (>= ${source:Version})
 Recommends: system-config-printer-kde (>= ${source:Version})
 Description: system administration tools from the official KDE 4 release
@@ -31,11 +31,24 @@
 
 Package: kcron
 Section: admin
+Architecture: all
+Depends: kde-config-cron
+Description: program scheduler frontend - transitional package
+ This package helps migrating from the kcron standalone app to the kde
+ config module in kde-config-cron.
+ .
+ It is a transitional package. it can safely be removed
+
+Package: kde-config-cron
+Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
-Description: program scheduler for KDE 4
- KCron is an application for scheduling programs to run at specific intervals
+Conflicts: kcron (<< 4:4.4)
+Replaces: kcron (<< 4:4.4)
+Description: program scheduler frontend
+ kde-config-cron is a kde configuration module for
+ for scheduling programs to run at specific intervals
  using cron, the UNIX scheduling service.
  .
  This package is part of the KDE 4 administration module.
@@ -50,18 +63,6 @@
  .
  This package is part of the KDE 4 administration module.
 
-Package: kpackage
-Section: admin
-Architecture: any
-Depends: ${shlibs:Depends}, smartpm-core
-Suggests: khelpcenter, rpm
-Description: package management tool for KDE 4
- KPackage is a frontend to the SMART package manager, supporting Debian, RPM,
- and other package formats.  It can be used to search for, examine, install,
- and remove packages.
- .
- This package is part of the KDE 4 administration module.
-
 Package: ksystemlog
 Section: admin
 Architecture: any

Copied: trunk/packages/kdeadmin/debian/kde-config-cron.install (from rev 17212, trunk/packages/kdeadmin/debian/kcron.install)
===================================================================
--- trunk/packages/kdeadmin/debian/kde-config-cron.install	                        (rev 0)
+++ trunk/packages/kdeadmin/debian/kde-config-cron.install	2010-02-28 19:19:37 UTC (rev 17222)
@@ -0,0 +1,8 @@
+usr/lib/kde4/kcm_cron.so
+usr/share/doc/kde4/HTML/en/kcron/common
+usr/share/doc/kde4/HTML/en/kcron/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcron/index.docbook
+usr/share/doc/kde4/HTML/en/kcron/kcronstart.png
+usr/share/doc/kde4/HTML/en/kcron/newtask.png
+usr/share/doc/kde4/HTML/en/kcron/newvariable.png
+usr/share/kde4/services/kcm_cron.desktop

Modified: trunk/packages/kdeadmin/debian/patches/series
===================================================================
--- trunk/packages/kdeadmin/debian/patches/series	2010-02-28 18:23:34 UTC (rev 17221)
+++ trunk/packages/kdeadmin/debian/patches/series	2010-02-28 19:19:37 UTC (rev 17222)
@@ -1,3 +1,2 @@
 01_system_config_printer_kde_cupsutils.diff
 02_kuser_first_uid_gid_fix.diff
-03_fix_runtime_fail_type_mismatch.diff