lp://staging/~mitya57/ubuntu/trusty/qtchooser/39-g4717841-1ubuntu1
- Get this branch:
- bzr branch lp://staging/~mitya57/ubuntu/trusty/qtchooser/39-g4717841-1ubuntu1
Branch merges
- Martin Pitt: Approve
-
Diff: 900 lines (+92/-572)13 files modified.pc/applied-patches (+0/-1)
.pc/enable-tests.patch/Makefile (+10/-1)
.pc/ensure_harcoded_paths_are_found.patch/src/qtchooser/main.cpp (+0/-516)
.tag (+1/-1)
Makefile (+10/-1)
debian/changelog (+16/-0)
debian/control (+23/-7)
debian/patches/enable-tests.patch (+2/-2)
debian/patches/ensure_harcoded_paths_are_found.patch (+0/-27)
debian/patches/series (+0/-1)
doc/qtchooser.1 (+1/-1)
src/qtchooser/main.cpp (+28/-14)
tests/auto/qtchooser/tst_qtchooser.cpp (+1/-0)
Branch information
- Owner:
- Dmitry Shachnev
- Status:
- Merged
Recent revisions
- 8. By Dmitry Shachnev
-
Merge with Debian unstable, remaining changes:
- Break qt4 (<= 4:4.8.4+dfsg-0ubuntu3~ ), not (<= 4:4.8.4+dfsg-1~).
- Make the package Multi-Arch: foreign. - 7. By Dmitry Shachnev
-
* Merge with Debian unstable, remaining changes:
- Break qt4 (<= 4:4.8.4+dfsg-0ubuntu3~ ), not (<= 4:4.8.4+dfsg-1~).
- Make the package Multi-Arch: foreign. - 6. By Matthias Klose
-
Make the package Multi-Arch: foreign. LP: #1209239.
Note, this is for installation only, choosing the defaults for the
foreign architecture is not yet implemented. - 5. By Dmitry Shachnev
-
* Merge with Debian experimental (LP: #1179995), remaining Ubuntu change:
- Break qt4 (<= 4:4.8.4+dfsg-0ubuntu3~ ), not (<= 4:4.8.4+dfsg-1~). - 4. By Lisandro Damián Nicanor Pérez Meyer <email address hidden>
-
[ Pino Toscano ]
* Add Vcs-Git and Vcs-Browser headers.
* Append the CPPFLAGS to the CXXFLAGS, as qtchooser's build system uses only
the latter.
* Export the LDFLAGS as LFLAGS, as qtchooser's build system uses only the
latter.
* Drop the own copy of qtchooser.1 and use the upstream version.[ Lisandro Damián Nicanor Pérez Meyer ]
* Add a three possible paths for configs. In this way:
- We can add arch-triplet qualified configs.
- We can install arch-specific configs.
- We avoid FTBFS of Qt4 packages already in the archive without the need to
patch debhelper for this.
- Tools like qdbus will fallback to the Qt4 version even if qt4-default is
not installed.
Apps wanting to use Qt5's qdbus should explicitly call it with -qt=qt5. - 3. By Lisandro Damián Nicanor Pérez Meyer <email address hidden>
-
[ Lisandro Damián Nicanor Pérez Meyer ]
* Fix missing BSD-3-clause license missing in debian/copyright. Thanks
Ansgar Burchardt for noticing it![ Pino Toscano ]
* Fix build on Hurd (patch fix-PATH_MAX.diff). - 2. By Lisandro Damián Nicanor Pérez Meyer <email address hidden>
-
[ Timo Jyrinki ]
* Initial release. (Closes: #696687)
* Proposed upstream patch:
- create-a-system- default- path.patch
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/trusty/qtchooser