-
Committer:
Package Import Robot
-
Author(s):
Martin Pitt
-
Date:
2011-10-11 07:32:03 UTC
-
mfrom:
(1.3.7 sid)
-
Revision ID:
package-import@ubuntu.com-20111011073203-klon32u6j4czm6um
Tags: 0.4.99ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
- 1/rules/utils.mk.in: add some text before listing missing file to make
it easier to see from the build log (LP #509249, Debian #565771)
- 1/class/gnome.mk.in: Call dh_translations.
- test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
with pkgstriptranslations installed. (Ubuntu specific)
- 1/rules/debhelper.mk.in: Call dh_scour. debian/control.in: Add scour
build and binary dependency (build dep for test suite).
- 1/class/python-distutils.mk.in, 1/class/python-module.mk.in: Add
--prefix support for pysupport by DEB_PYTHON_PREFIX_ARG (LP #625581)