Last commit made on 2014-04-15
Get this branch:
git clone -b ubuntu/trusty-proposed https://git.launchpad.net/ubuntu/+source/python-qt4
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

cea09c7... by Rohan Garg on 2014-04-15

Import patches-unapplied version 4.10.4+dfsg-1ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 864c846c3a1e44abaf94e79ba706a14b700863ae

New changelog entries:
  * Fix encoding issues when converting a QString back to ai
    python string (LP: #1299881)
    + Add kubuntu_fix-encoding-issues.patch

864c846... by Dimitri John Ledkov on 2014-03-31

Import patches-unapplied version 4.10.4+dfsg-1build1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: f31f8612dad14b2a29c68e7831fffc4d1f6fb488

New changelog entries:
  * No change rebuild to drop python3.3 compiled extension.

f31f861... by Dmitry Shachnev on 2014-03-19

Import patches-unapplied version 4.10.4+dfsg-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 5b389ffe34ba321d9c82348c8cbed28ecaedc30b

New changelog entries:
  [ Bernd Zeimetz ]
  * Removing myself from Uploaders.
  [ Dmitry Shachnev ]
  * New upstream bugfix release.
  * Bump sip version requirement to 4.15.5.
  * debian/patches/config_extra_headers.diff: drop, applied upstream.
  * debian/patches/phonon_cfgtest.diff: drop, fixed differently upstream.
  * Refresh and rebase other patches.
  * debian/rules: Drop Python 2.5 compatibility code.
  * debian/watch: Fix DFSG version mangling.
  * Bump Standards-Version to 3.9.5, no changes needed.

5b389ff... by Dmitry Shachnev on 2013-11-20

Import patches-unapplied version 4.10.3+dfsg1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 05ebcc7beb7fc34a3f79cf2428a1accac69e5dca

New changelog entries:
  * get-orig-source.sh: Only remove the _static folder, as we still
    need some files in html that are not generated by Sphinx.
  * Re-add debian/python-qt4-doc.docs (closes: #729993).
  * Remove obsolete README.debian, examples work fine now.
  * Do not install Windows-specific activeqt examples.
  * Add description to debian_configure_changes.diff.
  * Remove leftover debug output from debian/rules.
  * Symlink duplicate files in examples using fdupes.

05ebcc7... by Dmitry Shachnev on 2013-11-13

Import patches-unapplied version 4.10.3+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 2bba372db3b534f70cd412333c8a74c1d190e183

New changelog entries:
  * Update pyrcc4 man page to list -py2 and -py3 options.
  * Regenerate resource files during build.
  * Repack orig tarball to remove non-free Sphinx-generated HTML
    documentation and non-free JS files (closes: #723039).
  * Add debian/get-orig-source.sh script.
  * Update debian/watch to mangle dfsg version.
  * Drop debian/python-qt4-doc.docs, we install docs directly.
  * Pass --debug to configure-ng.py when doing debug builds.
  * Add a patch (phonon_cfgtest.diff) to fix detection of new Phonon
  * Add a patch (config_flags.diff) to apply build flags to designer
  * Remove duplicate references to GPL license file from debian/copyright.
  * Add myself to Uploaders.

2bba372... by Scott Kitterman on 2013-10-12

Import patches-unapplied version 4.10.3-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3736d8e77e7eff67fb3a14bbca7f7ef110dc8a0e

New changelog entries:
  * Upload to unstable
  [ Jonathan Riddell ]
  * Add patch qreal_float_support.diff back to add back QList<double> code
  [ Scott Kitterman ]
  * Remove __pycache__ directories shipped in some examples

3736d8e... by Scott Kitterman on 2013-08-22

Import patches-unapplied version 4.10.3-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 102b2ceb726afaa32fb8fa54be1fbd9b9f5c5aa0

New changelog entries:
  * New upstream release
    - Bump minumum build-dep version for python/3-sip to 4.15
    - Remove debian/patches/qreal_float_support.diff, alternate solution
      implemented upstream
    - Refresh patches
  * Bump minimum version for python/3-all-dev to those that support the
    simplified build target introduced in the last upload. (Closes: #718733)

102b2ce... by Scott Kitterman on 2013-08-03

Import patches-unapplied version 4.10.2-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 310826a145fd4ff2a34114f3273043ea78c03c06

New changelog entries:
  [ Dmitry Shachnev ]
  * Update dh_compress arguments so that pagefold.qss and wordlist.txt
    (in python-qt4-doc examples) are not compressed.
  [ Scott Kitterman ]
  * Feedback changes from Ubuntu:
    - Add autopkg test, to check that at least a basic import works, should
      catch API version changes in sip4.
    - Unify build targets across py2 & 3, both now multiarched and python3.2
      is not supported

310826a... by Scott Kitterman on 2013-06-07

Import patches-unapplied version 4.10.2-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d2f94ceafd7dd134cf05b2f1efcaa0f34225fc1c

New changelog entries:
  * 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

d2f94ce... by Scott Kitterman on 2013-05-16

Import patches-unapplied version 4.10.1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: bfc8e714ed5e8666b9999e20b5e42263c6182ae9

New changelog entries:
  * Upload to unstable
  [ Jakub Wilk ]
  * Use canonical URIs for Vcs-* fields.
  [ Dmitrijs Ledkovs ]
  * Fix compiling Qt Designer plugin with multiarched python.
  * Enable DEB_BUILD_OPTIONS compliant parallel build.
  [ Scott Kitterman ]
  * New upstream release
    - Refresh patches
    - Update debian/rules to work with python3.2 and 3.3 (Closes: #707157)
    - Bump minimum required sip4 build-dep versions to 4.14.4
  * Adjust pyqtconfig.py references in debian/python3-pyqt4.install to cover
    all variants now shipped
  * Fix find command in install-arch so pyqtconfig files for debug packages
    aren't removed
  * Additional minor cleanups to get files installed properly for pyqtconifg
     and .so files in python3-dbus.mainloop.qt/-dbg
  * Add debian/patches/config_extra_headers.diff so additional header
    directories used in python3.3 due to multiarch are found during build
  * Update debian/rules to account for different layout of python3.3 in
    anicipation of multiarched python3.3
  * Add specific build-dep on python2.7-dev >=2.7.5-2~ for python2.7-config
    configdir support
  * Update python3-all-dev minimum version due to bug fixes in 3.2.3-6 for
    building with multiple python3 versions
  * Generate a multi-version pyqtconfig.py for python3 variants to account
    for multiple files installed into the same directory as is done with
    sipconfig in python3-sip (Closes: #707734)
  * Add removal of qpy/QtCore/qpycore_post_init.cpp to clean rule
  * Drop unused python:Provides
  * Bump standards version to 3.9.4 without further change
  [ Steve Langasek ]
  * Fine adjustments to debian/rules