~ubuntu-branches/ubuntu/saucy/nspr/saucy-security

Viewing all changes in revision 32.

  • Committer: Package Import Robot
  • Author(s): Jamie Strandboge
  • Date: 2013-03-13 09:38:00 UTC
  • mfrom: (1.1.17) (30.1.2 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20130313093800-d7fa2ywhoygatxj3
Tags: 2:4.9.5-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - rules: Enable Thumb2 build on armel, armhf.
  - control: Change Vcs-* to XS-Debian-Vcs-*.
  - control: Add conflicts to evolution-documentation-*,
    language-support-translation-*.
  - control: Add Breaks: evolution-plugins.
  - debian/patches/cross: Fix crossbuilding. Patch taken from chromiumos
    overlay. Refreshed
  - debian/patches/arm64support: Add arm64/aarch64 support

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: