-
Committer:
Package Import Robot
-
Author(s):
Benjamin Drung
-
Date:
2012-06-02 12:33:00 UTC
-
mfrom:
(5.1.15 sid)
-
Revision ID:
package-import@ubuntu.com-20120602123300-cmj36sgxk0zi6k0h
Tags: 2.8.12.1-11ubuntu1
* Merge from Debian unstable. Remaining changes:
- debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
built, as this is required by some applications (LP: #632984)
- debian/control:
- Build-dep on libxt-dev, libgstreamer-plugins-base0.10-dev,
and libgconf2-dev for mediactrl.
- Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to
python-wxversion to guarantee upgrade ordering when moving from
pycentral to dh_python2.
* Drop fix-bashism-in-example.patch. (LP: #1005609)