~ubuntu-branches/ubuntu/lucid/kdelibs/lucid

Viewing all changes in revision 166.

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-01-09 13:49:59 UTC
  • mfrom: (1.1.17 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100109134959-wfhy4o02oil1s3an
Tags: 4:3.5.10.dfsg.1-3ubuntu1
* Merge from Debian Testing.  Remaining Ubuntu changes:
  - make sure control and control.in are in sync
  - --with-distribution="Kubuntu (`lsb_release --codename --short`)
    $(DEB_VERSION)"
  - binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and
    cr*-device-system.png.uu
  - don't build-dep on libgamin-dev, libfam-dev
  - stop kdelibs4-dev depending on gamin/fam
  - don't install .svgz icons, docs or all_languages in kdelibs-data.install
  - rosetta support in rules common-install-prehook-impl:: [and
    common-post-build-arch:: ?] and include debian/kubuntu-desktop-i18n/
  - build-dep on: gettext-kde, kdesdk-scripts, lsb-release, base-files, sudo
  - cdbs build-dep 0.4.41ubuntu2
  - kdelibs4-dev depends on gettext-kde, kdesdk-scripts
  - copy debian/icons over
  - Make kdelibs4c2a depend on launchpad-integration, sudo.  Recommends on
    xdg-user-dirs
  - Remove 19_debianize_useragent.diff (changed to
    kubuntu_19_debianize_useragent.diff) s/Debian/Kubuntu
  - remove kdelibs4c2a depends on menu-xdg
  - include kubuntu_01_kdepot.diff and kde.pot in debian/patches/common
  - use a local copy of kde.mk without the common-install-prehook-impl::
    rule; edit debian-qt-kde.mk to include debian/cdbs/kde.mk
  - build with --with-sudo-kdesu-backend and build-dep on sudo and make
    kdelibs4c2a depend on sudo
  - kdelibs-data.install : Add nzb mimetype
  - Make kdelibs4-dev replace more recent kdelibs4c2a for overlapping files
  - remove /usr/bin/preparetips, arts files and ksvntopng from
    kdelibs4-dev.install
  - Drop the package kdelibs4-doc completely. It contained API documentation
    which is now obsolete, but still available via api.kde.org.
  - make sure control and control.in are in sync
  - in debian/rule remove .pot files outside .po directory
  - 97_automake_cleanup.diff becomes kubuntu_97_automake_cleanup.diff
* Remove libarts1-dev from build-depends and kdelibs4-dev depends from control.in
* Drop debian/patches/kubuntu_62_flash_installer.diff (obsolete and broken)
* Drop debian/patches/kubuntu_gcc4.4_ftbfs.diff, now included from Debian as
  debian/patches/65_gcc4.4_ftbfs.diff
* Drop debian/patches/security_05_CVE-2009-0689.diff, now included from
  Debian as debian/patches/CVE-2009-0689.diff

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: