-
Committer:
Package Import Robot
-
Author(s):
Martin Pitt
-
Date:
2012-10-25 10:13:47 UTC
-
mfrom:
(1.3.23 sid)
-
Revision ID:
package-import@ubuntu.com-20121025101347-9j6o52b7blynlnz0
Tags: 0.4.118ubuntu1
* Merge from 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).
- Makefile.in, configure, configure.ac, debian/control.in,
test/Makefile.am, test/Makefile.in: Drop build dependency on
python-support and python-central. Disable distutils pycentral and
pysupport tests if the tools are not present (LP #904248).