-
Committer:
Daniel Holbach
-
Date:
2013-12-17 11:41:34 UTC
-
Revision ID:
daniel.holbach@canonical.com-20131217114134-eaq9jg9dsh5hhsqm
* Merge from debian, remaining changes:
- debian/control: Build depend on gnome-common, so we can get a .pot file
to use for launchpad translations
- debian/rules: build translations template
- Update watch file to only track GNOME 2.20 as gtk-engines was then
ported to gtk3 and finally abandoned.
* Drop our automake fix, debian now supports the new version
* Fix FTBS due to automake bug (Closes: #713353)
* Force to use automake1.11, thus fixing FTBFS.