← Back to branch summary

~ubuntu-branches/ubuntu/precise/kdeadmin/precise

Viewing all changes in revision 100.

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi, Alessandro Ghersi, Jonathan Riddell
  • Date: 2010-10-17 06:47:21 UTC
  • mfrom: (1.2.50 upstream)
  • Revision ID: james.westby@ubuntu.com-20101017064721-1gc4g44trays84gg
Tags: 4:4.5.2-0ubuntu1
[ 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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: