-
Committer:
Bazaar Package Importer
-
Author(s):
Matthias Klose
-
Date:
2011-08-14 12:11:33 UTC
-
mfrom:
(2.1.6 sid)
-
Revision ID:
james.westby@ubuntu.com-20110814121133-38xd6io6z4p1ljzl
Tags: 2.7-6ubuntu4
* Merge with Debian; remaining changes:
- Don't ship usr/share/vim/addons/plugin in the -dev package.
- Don't build llvm-2.7-priv-dev, remove build dependency on
llvm-2.7-priv-dev.
- Adjust conflicts with unversioned llvm package as found in lucid.
- Patch 0010-r109125.patch.
- Don't ship the unversioned binaries and man pages, now provided
by the llvm-runtime, llvm and llvm-dev packages.