lp:~ubuntu-branches/ubuntu/oneiric/pyside/oneiric-201109062006

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/oneiric/pyside

Ubuntu branches: Pending requested 2011-09-06

Diff: 19 lines (+13/-0) (has conflicts)

1 file modified

debian/patches/force-phonon.patch (+13/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

15. By Barry Warsaw on 2011-09-06

* debian/patches/force-phonon.patch:
  Force the addition of the phonon directory to the CMake files.
  (LP: #832864)
* debian/control: Ubuntu 11.10 only has debhelper 8.9.0.

14. By Barry Warsaw on 2011-09-06

* Add Pre-Depends on dpkg to -dbg for its data.tar.xz.
* Fix the -dbg files renaming regexp. (Closes: #639380)
* New 1.0.6.1 "Isolino for Qt4.6" release.
  - Drop patch from upstream, included in point-release.
* Bump tests timeout from 1 to 10 minutes.
* Make sure to move the -dbg symlinks out of the -dev package.
* Add DEP-3 header to patches that lack one.
* Add lintian overrides:
  - missing-pre-dependency-on-multiarch-support for the -dbg
    package.
  - package-contains-empty-directory for all the python packages.
* New 1.0.6 upstream "Isolino" release
  - Bump B-Ds:
    + generatorrunner to 0.6.12.
    + shiboken to 1.0.6.
  - Symbols:
    + Add six for 1.0.6.
* Compress python-pyside-dbg using xz.
* Import upstream patch to fix build with Qt4.6.
* Convert library to multiarch.
  - Bump B-D:
    - on debhelper to 8.9.3.
    - on cmake to 2.8.4+dfsg.1-3~.
  - Bump debhelper compatibility level to 9.
  - Override lintian warning about debhelper being too young.
  - Update *.install files to cope with new library paths.
  - Update .so symlinks paths.
  - Initialize D_H_MULTIARCH from dpkg-architectures, use it in the
    LIB_SUFFIX cmake variable.
  - Add a Pre-Depends on multiarch-support to the libpyside package.
  - Add Multi-Arch: same to the libpyside package.
* Use the ${LIBPYSIDE_SOVERSION} variable everywhere.
* Un-$(shell ize debian/rules.
* Update symbols to cope with size_t size differences between 32-64
  bit machines (Closes: #635868).
* Update buildsystem to ensure proper build'ability of arch:all
  packages.
* New 1.0.5 upstream "And no name was given that day" release
  - Bump B-Ds:
    + shiboken to 1.0.5.
  - Symbols:
    + Add one from 1.0.4.
    + Add six for 1.0.5.
* Symlink arch:any packages' documentation to libpyside's. Make sure
  the dependencies are explicit for Policy compliance.

13. By Didier Raboud on 2011-06-23

* New 1.0.4 upstream "The winter is coming" release
  - Bump the B-D chain versions:
    + generatorrunner to 0.6.11.
    + shiboken to 1.0.4.
* Remove the "make the debug flavour work" TODO.
* Separate -indep and -arch targets.
* Include the PySideConfig snippets for the debug flavours

12. By Didier Raboud on 2011-05-28

* New 1.0.3 upstream release
  - Bump the B-D chain versions:
    + generatorrunner to 0.6.10.
    + shiboken to 1.0.3.
  - Refresh patches.
  - Add 23 new symbols to libpyside1.0.
* This fixes the PySide 1.0.2 FTBFS (Closes: #628266), when built against
  shiboken 1.0.3.

11. By Didier Raboud on 2011-05-01

* New 1.0.2 upstream release
  - Bump the B-D chain versions:
    + generatorrunner to 0.6.9.
    + shiboken to 1.0.2.
* Drop explicit apiextractor B-D.
* Add two symbols for the new stream operators for PyObjectWrapper.
* Bump Standards-Version to 3.9.2 without changes needed.

10. By Didier Raboud on 2011-04-01

* New 1.0.1 upstream release
  - Bump the B-D chain versions:
    + generatorrunner to 0.6.8.
    + shiboken to 1.0.1.

* Move phonon-backend-gstreamer B-D earlier in the list to help the
  aptitude-based resolver (thanks to the pkg-kde team for the help!)
* Use dh_python2, hence get the debug files at the correct place.

9. By Didier Raboud on 2011-02-18

* New 1.0.0~rc1 upstream release
  - Bump the B-D chain versions:
    + apiextractor to 0.10.0-2~
    + generatorrunner to 0.6.6
    + shiboken to 1.0.0~rc1
* Update patches to ~rc1.
* debian/watch: update to handle Release Candidates too.
* Bump XS-Python-Version to >= 2.6.

8. By Didier Raboud on 2010-10-19

* New 0.4.2 upstream release.
  - Add some 0.4.1 and 0.4.2 symbols.
  - Bump apiextractor and shiboken B-D versions.
  - Update patches.
  - Update debian/dh_pycmakedeps to work with new upstream coding style.

* Patches:
  - u_c130273_fix_py25_QtScript_property.patch
    Remove, was from upstream.
  - u_20e226b_fix_missing_qcoreapplication_arguments_method.patch
    Remove, was from upstream.
  - u_268bf77_fixed_signal_signature_parser.patch
    Remove, was from upstream.
  + libPythonVersionPostfix.patch: Refresh
  + usePySpecificShiboken.patch: Refresh
  + lessBuildVerbosity.patch: Refresh

* Bump the B-D chain versions.
* Make sure the private.py is installed in QtCore module.
* Build against Qt 4.7.
  - Add libqtwebkit-dev
  - Drop QtMultimedia module.
  - Add the QtDeclarative package.

7. By Didier Raboud on 2010-09-27

* New 0.4.1 upstream release. (LP: #648612)
  - Add some 0.4.1 symbols.

* Patches:
  - u_c130273_fix_py25_QtScript_property.patch
    Remove, was from upstream.
  - u_20e226b_fix_missing_qcoreapplication_arguments_method.patch
    Remove, was from upstream.
  - u_268bf77_fixed_signal_signature_parser.patch
    Remove, was from upstream.
  + libPythonVersionPostfix.patch: Refresh
  + usePySpecificShiboken.patch: Refresh
  + lessBuildVerbosity.patch: Refresh

* Bump the B-D chain versions.
* Make sure the private.py is installed in QtCore module.
* Build against Qt 4.7.
  - Add libqtwebkit-dev
  - Drop QtMultimedia module.
  - Add the QtDeclarative package.

6. By Didier Raboud on 2010-06-18

* Run all tests but don't make them critical.
  - Update fixTests.patch to allow all tests.

* Reduce the build log size by forcing CMAKE_VERBOSE_MAKEFILE to OFF
  - Add lessBuildVerbosity.patch to add --silent option to
    generatorrunner.
  Closes: #586305