~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to wxPython/setup.py

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2012-05-27 17:32:13 UTC
  • mfrom: (5.1.13 sid)
  • Revision ID: package-import@ubuntu.com-20120527173213-e0dcxtnrefaa1if5
Tags: 2.8.12.1-9ubuntu1
* 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.
  - Patches
    + fix-bashism-in-example.patch
* Backport patch to fix calling SetMenuBar() twice causes the menubar to not
  resize correctly in GTK. (LP: #996407)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1052
1052
 
1053
1053
              **other_kw
1054
1054
              )
1055
 
 
 
1055
        BUILD_OPTIONS['build_base'] = BUILD_BASE + "-common"
1056
1056
        if not EGGing:
1057
1057
            if INSTALL_MULTIVERSION:
1058
1058
                setup(name             = 'wxPython-common',
1067
1067
                      platforms        = PLATFORMS,
1068
1068
                      classifiers      = filter(None, CLASSIFIERS.split("\n")),
1069
1069
                      keywords         = KEYWORDS,
1070
 
 
 
1070
                      packages = [''],
1071
1071
                      package_dir = { '': 'wxversion' },
1072
1072
                      py_modules = ['wxversion'],
1073
1073