~ubuntu-branches/ubuntu/natty/kdesdk/natty-proposed

Viewing all changes in revision 95.

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-05-20 08:13:59 UTC
  • mfrom: (1.1.42 upstream) (0.5.5 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100520081359-yag3g4usklfyq9ih
Tags: 4:4.4.3-1ubuntu1
* Merge with Debian unstable, remaining changes:
  - Build dep on libboost1.42-dev
  - kdesdk-dbg depends on kdesdk, not suggests\
  - Keep the Kubuntu docpath (/usr/share/doc/kde)
  - Don't install the following in kdesdk-scripts:
    + extractattr
    + extractrc
  - Keep kubuntu_01_kate_desktop.patch

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: