~ubuntu-branches/ubuntu/utopic/cdbs/utopic

Viewing all changes in revision 132.

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2014-06-26 12:00:42 UTC
  • mfrom: (1.3.29 sid)
  • Revision ID: package-import@ubuntu.com-20140626120042-aqwvy6olr3kvoelc
Tags: 0.4.125ubuntu1
* Merge from Debian unstable. Remaining changes:
  - 1/rules/utils.mk.in: add some text before listing missing file to make
    it easier to see from the build log. (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).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: