« back to all changes in this revision
Viewing changes to kcron/src/kcm_cron.desktop
- Committer: Bazaar Package Importer
- Date: 2010-10-17 06:47:21 UTC
- mfrom: (1.2.50 upstream)
- Revision ID: james.westby@ubuntu.com-20101017064721-1gc4g44trays84gg
[ Alessandro Ghersi ]
* Merge with Debian git remaining changes:
- debian/control:
- Don't ship knetworkconf, it is utterly busted
- kdeadmin doesn't depend on knetworkconf
- kde-config-cron conflicts/replaces on kcron (<< 4:4.4.60)
- system-config-printer-kde depends on system-printer-common
- system-config-printer-kde doesn't depend on python-cupsutils
- kdeadmin-dbg depends on kdeadmin
- debian/patches:
- Remove 01_system_config_printer_kde_cupsutils.diff, it's only
relevant for Debian not Ubuntu
[ Jonathan Riddell ]
* New upstream release
* Merge with Debian git remaining changes:
- debian/control:
- Don't ship knetworkconf, it is utterly busted
- kdeadmin doesn't depend on knetworkconf
- kde-config-cron conflicts/replaces on kcron (<< 4:4.4.60)
- system-config-printer-kde depends on system-printer-common
- system-config-printer-kde doesn't depend on python-cupsutils
- kdeadmin-dbg depends on kdeadmin
- debian/patches:
- Remove 01_system_config_printer_kde_cupsutils.diff, it's only
relevant for Debian not Ubuntu
[ Jonathan Riddell ]
* New upstream release
- files added:
- .pc/03_system_config_printer_kde_issues.diff
- .pc/03_system_config_printer_kde_issues.diff/system-config-printer-kde
- .pc/05_system_config_printer_kde_scroll_printer_options.diff
- .pc/05_system_config_printer_kde_scroll_printer_options.diff/system-config-printer-kde
- files removed:
- .pc/kubuntu_01_system-config-printer-kde_fixes.diff
- .pc/kubuntu_01_system-config-printer-kde_fixes.diff/system-config-printer-kde
- files modified:
- .pc/applied-patches
added
removed
kcron/src/kcm_cron.desktop
