~ubuntu-branches/ubuntu/quantal/kdeadmin/quantal

Viewing all changes in revision 119.

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2011-11-23 23:46:47 UTC
  • mfrom: (1.2.64) (3.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20111123234647-5ac0aa9z1gagsb94
Tags: 4:4.7.3-0ubuntu1
* New upstream release
* Merge with Debian git remaining changes:
  - debian/control:
    - 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
  - debian/patches:
    - Remove 01_system_config_printer_kde_cupsutils.diff, it's only
      relevant for Debian not Ubuntu
  - Add system-config-printer-kde.links to link s-c-p-common python modules
    that are used in s-c-d-kde (ppdippstr.py, pysmb.py, smburi.py) LP: #793679
  - Do not include full copies of files from system-config-printer-common in
    debian/ and remove from system-config-printer-kde.install

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: