← Back to branch summary

~ubuntu-branches/ubuntu/trusty/python-qt4/trusty-proposed

« back to all changes in this revision

Viewing changes to .pc/config_extra_headers.diff/configure.py

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2013-06-06 23:44:13 UTC
  • mfrom: (1.3.13)
  • Revision ID: package-import@ubuntu.com-20130606234413-t1ksl5ja7go1c1w2
Tags: 4.10.2-1
http://bugs.debian.org/711457
* New upstream release
* Add build-conflicts python3.2-dev << 3.2.3-8~ due to need for
  python3.2-config to support the --configdir option (avoids adding a
  python3.2 specific build-dep) (Closes: #711457)
* Switch python2.7-dev specific build-depends to versioned build-conflict on
  older versions for the same reasons as python3.2-dev
* Remove obsolete Build-conflicts on python-xml and python-xml-dbg

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/config_extra_headers.diff/configure.py
33
33
 
34
34
 
35
35
# Initialise the globals.
36
 
pyqt_version = 0x040a01
37
 
pyqt_version_str = "4.10.1"
 
36
pyqt_version = 0x040a02
 
37
pyqt_version_str = "4.10.2"
38
38
 
39
39
sip_min_version = 0x040e03
40
40
 
1064
1064
    sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules))
1065
1065
    sipconfig.inform("The PyQt Python package will be installed in %s." % opts.pyqtmoddir)
1066
1066
 
1067
 
    if opts.with_deprecated:
1068
 
        sipconfig.inform("PyQt is being built with deprecated Qt v4 features.")
1069
 
    else:
1070
 
        sipconfig.inform("PyQt is being built without deprecated Qt v4 features.")
 
1067
    if qt_version >= 0x050000:
 
1068
        if opts.with_deprecated:
 
1069
            sipconfig.inform("PyQt is being built with deprecated Qt v4 features.")
 
1070
        else:
 
1071
            sipconfig.inform("PyQt is being built without deprecated Qt v4 features.")
1071
1072
 
1072
1073
    if opts.no_docstrings:
1073
1074
        sipconfig.inform("PyQt is being built without generated docstrings.")
1475
1476
        sip_flags.append("-x")
1476
1477
        sip_flags.append("VendorID")
1477
1478
 
1478
 
    if not opts.with_deprecated:
 
1479
    if qt_version >= 0x050000 and not opts.with_deprecated:
1479
1480
        sip_flags.append("-x")
1480
1481
        sip_flags.append("PyQt_Deprecated_5_0")
1481
1482