Merge lp:~timo-jyrinki/kubuntu-packaging/qt4-qtchooser-migration-raring into lp:~kubuntu-packagers/kubuntu-packaging/qt
- qt4-qtchooser-migration-raring
- Merge into qt
Status: | Merged |
---|---|
Approved by: | Fathi Boudra |
Approved revision: | 351 |
Merged at revision: | 347 |
Proposed branch: | lp:~timo-jyrinki/kubuntu-packaging/qt4-qtchooser-migration-raring |
Merge into: | lp:~kubuntu-packagers/kubuntu-packaging/qt |
Diff against target: |
1164 lines (+183/-617) 44 files modified
debian/changelog (+10/-1) debian/control (+23/-4) debian/libqt4-dev-bin.install (+7/-7) debian/libqt4-dev-bin.links.in (+5/-3) debian/libqt4-dev-bin.postinst (+0/-15) debian/libqt4-dev-bin.preinst (+14/-0) debian/libqt4-dev-bin.prerm (+0/-13) debian/libqt4-dev.install (+1/-0) debian/patches/01_debian_append_qt4_suffix.diff (+0/-415) debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff (+1/-1) debian/patches/series (+0/-1) debian/qdbus.install (+1/-1) debian/qt4-default.install (+1/-0) debian/qt4-demos.install (+1/-1) debian/qt4-designer.install (+1/-1) debian/qt4-designer.links.in (+2/-1) debian/qt4-designer.menu (+2/-2) debian/qt4-designer.postinst (+0/-10) debian/qt4-designer.preinst (+13/-0) debian/qt4-designer.prerm (+0/-12) debian/qt4-dev-tools.install (+14/-14) debian/qt4-dev-tools.links.in (+2/-0) debian/qt4-dev-tools.menu (+4/-4) debian/qt4-dev-tools.postinst (+0/-15) debian/qt4-dev-tools.preinst (+14/-0) debian/qt4-dev-tools.prerm (+0/-13) debian/qt4-linguist-tools.install (+2/-2) debian/qt4-linguist-tools.links.in (+4/-2) debian/qt4-linguist-tools.postinst (+0/-15) debian/qt4-linguist-tools.preinst (+14/-0) debian/qt4-linguist-tools.prerm (+0/-13) debian/qt4-qmake.install (+1/-1) debian/qt4-qmake.links.in (+2/-1) debian/qt4-qmake.postinst (+0/-10) debian/qt4-qmake.preinst (+13/-0) debian/qt4-qmake.prerm (+0/-12) debian/qt4-qmlviewer.install (+1/-1) debian/qt4-qtconfig.install (+1/-1) debian/qt4-qtconfig.links.in (+1/-0) debian/qt4-qtconfig.menu (+1/-1) debian/qt4-qtconfig.postinst (+0/-10) debian/qt4-qtconfig.preinst (+13/-0) debian/qt4-qtconfig.prerm (+0/-12) debian/rules (+14/-2) |
To merge this branch: | bzr merge lp:~timo-jyrinki/kubuntu-packaging/qt4-qtchooser-migration-raring |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Review via email: mp+146090@code.launchpad.net |
Commit message
* Migrate to use qtchooser for Qt5 co-installation support
- Libraries co-installed, executables managed by qtchooser
- Packages will need build-dep on qt4-default to build against Qt4
- Symlinks left for binaries that had -qt4 via alternatives
* Clean alternatives on upgrade
* Add qt4-default package
Description of the change
* Migrate to use qtchooser for Qt5 co-installation support
- Libraries co-installed, executables managed by qtchooser
- Packages will need build-dep on qt4-default to build against Qt4
- Symlinks left for binaries that had -qt4 via alternatives
* Clean alternatives on upgrade
* Add qt4-default package
The package has been so far tested in https:/
The changes are identical to what's has been done in the Debian experimental branch at http://
qtchooser packaging is available at http://
The snapshot release for orig tarball is at http://
- 352. By Timo Jyrinki
-
Add the symlinks with a for loop instead.
Preview Diff
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2013-01-15 12:31:59 +0000 |
3 | +++ debian/changelog 2013-02-08 06:33:21 +0000 |
4 | @@ -1,11 +1,20 @@ |
5 | qt4-x11 (4:4.8.4+dfsg-0ubuntu3) UNRELEASED; urgency=low |
6 | |
7 | + [ Harald Sitter] |
8 | * Rename fix_medium_font.diff to kubuntu_39_fix_medium_font.diff to reflect |
9 | its origin. |
10 | * Apply kubuntu patches in numeric order. |
11 | * Add more dep3 tags to kubuntu patches. |
12 | |
13 | - -- Harald Sitter <apachelogger@ubuntu.com> Mon, 03 Dec 2012 11:12:52 +0100 |
14 | + [ Timo Jyrinki ] |
15 | + * Migrate to use qtchooser for Qt5 co-installation support |
16 | + - Libraries co-installed, executables managed by qtchooser |
17 | + - Packages will need build-dep on qt4-default to build against Qt4 |
18 | + - Symlinks left for binaries that had -qt4 via alternatives |
19 | + * Clean alternatives on upgrade |
20 | + * Add qt4-default package |
21 | + |
22 | + -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Wed, 16 Jan 2013 07:58:47 +0000 |
23 | |
24 | qt4-x11 (4:4.8.4+dfsg-0ubuntu2) raring; urgency=low |
25 | |
26 | |
27 | === modified file 'debian/control' |
28 | --- debian/control 2012-09-24 12:41:03 +0000 |
29 | +++ debian/control 2013-02-08 06:33:21 +0000 |
30 | @@ -7,7 +7,8 @@ |
31 | Modestas Vainius <modax@debian.org>, |
32 | Sune Vuorela <debian@pusling.com>, |
33 | Pino Toscano <pino@debian.org>, |
34 | - Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> |
35 | + Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>, |
36 | + Timo Jyrinki <timo@debian.org> |
37 | Build-Depends: debhelper (>= 9), |
38 | dpkg-dev (>= 1.16.1), |
39 | flex, |
40 | @@ -561,6 +562,7 @@ |
41 | Depends: ${misc:Depends}, ${shlibs:Depends} |
42 | Breaks: libqt4-dev (<< 4:4.8.2) |
43 | Replaces: libqt4-dev (<< 4:4.8.2) |
44 | +Recommends: qtchooser |
45 | Description: Qt 4 development programs |
46 | Qt is a cross-platform C++ application framework. Qt's primary feature |
47 | is its rich set of widgets that provide standard GUI functionality. |
48 | @@ -720,7 +722,7 @@ |
49 | Replaces: libqt4-core (<< 4.4.0~beta1-1), |
50 | libqt4-designer (<< 4.4.0~beta1-1), |
51 | qt4-dev-tools (<= 4.0.1-2) |
52 | -Recommends: libqt4-dev |
53 | +Recommends: libqt4-dev, qtchooser |
54 | Description: graphical designer for Qt 4 applications |
55 | Qt is a cross-platform C++ application framework. Qt's primary feature |
56 | is its rich set of widgets that provide standard GUI functionality. |
57 | @@ -734,7 +736,7 @@ |
58 | Depends: libqt4-sql-sqlite, ${misc:Depends}, ${shlibs:Depends} |
59 | Breaks: libqt4-core (<< 4.4.0~beta1-1) |
60 | Replaces: libqt4-core (<< 4.4.0~beta1-1) |
61 | -Recommends: libqt4-dev, qt4-designer, qt4-doc |
62 | +Recommends: libqt4-dev, qt4-designer, qt4-doc, qtchooser |
63 | Suggests: qt4-doc-html |
64 | Conflicts: qt3-dev-tools-embedded |
65 | Description: Qt 4 development tools |
66 | @@ -760,6 +762,7 @@ |
67 | Depends: ${misc:Depends}, ${shlibs:Depends} |
68 | Breaks: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1) |
69 | Replaces: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1) |
70 | +Recommends: qtchooser |
71 | Description: Qt 4 qmake Makefile generator tool |
72 | Qt is a cross-platform C++ application framework. Qt's primary feature |
73 | is its rich set of widgets that provide standard GUI functionality. |
74 | @@ -781,6 +784,7 @@ |
75 | Depends: ${misc:Depends}, ${shlibs:Depends} |
76 | Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.1.0) |
77 | Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.1.0) |
78 | +Recommends: qtchooser |
79 | Description: Qt 4 configuration tool |
80 | Qt is a cross-platform C++ application framework. Qt's primary feature |
81 | is its rich set of widgets that provide standard GUI functionality. |
82 | @@ -807,7 +811,7 @@ |
83 | Architecture: any |
84 | Section: devel |
85 | Depends: ${misc:Depends}, ${shlibs:Depends} |
86 | -Recommends: imagemagick | gifsicle |
87 | +Recommends: imagemagick | gifsicle, qtchooser |
88 | Description: Qt 4 QML viewer |
89 | Qt is a cross-platform C++ application framework. Qt's primary feature |
90 | is its rich set of widgets that provide standard GUI functionality. |
91 | @@ -822,6 +826,7 @@ |
92 | Depends: ${misc:Depends}, ${shlibs:Depends} |
93 | Breaks: libqt4-dev (<< 4:4.7.3-2) |
94 | Replaces: libqt4-dev (<< 4:4.7.3-2) |
95 | +Recommends: qtchooser |
96 | Description: Qt 4 Linguist tools |
97 | Qt is a cross-platform C++ application framework. Qt's primary feature |
98 | is its rich set of widgets that provide standard GUI functionality. |
99 | @@ -838,6 +843,7 @@ |
100 | Depends: ${misc:Depends}, ${shlibs:Depends} |
101 | Breaks: libqt4-dbus (<< 4:4.7.4-1) |
102 | Replaces: libqt4-dbus (<< 4:4.7.4-1) |
103 | +Recommends: qtchooser |
104 | Description: Qt 4 D-Bus tool |
105 | Qt is a cross-platform C++ application framework. Qt's primary feature |
106 | is its rich set of widgets that provide standard GUI functionality. |
107 | @@ -872,3 +878,16 @@ |
108 | This package contains the complete Qt 4 API documentation (HTML format). |
109 | . |
110 | The documentation is provided in HTML format. |
111 | + |
112 | +Package: qt4-default |
113 | +Architecture: all |
114 | +Depends: qtchooser, libqt4-dev, ${misc:Depends} |
115 | +Conflicts: qt5-default |
116 | +Description: Qt 4 development defaults package |
117 | + Qt is a cross-platform C++ application framework. Qt's primary feature |
118 | + is its rich set of widgets that provide standard GUI functionality. |
119 | + . |
120 | + This package sets Qt 4 to be the default Qt version to be used when |
121 | + using development binaries like qmake. It provides a default |
122 | + configuration for qtchooser, but does not prevent alternative Qt |
123 | + installations from being used. |
124 | |
125 | === modified file 'debian/libqt4-dev-bin.install' |
126 | --- debian/libqt4-dev-bin.install 2012-05-29 13:16:53 +0000 |
127 | +++ debian/libqt4-dev-bin.install 2013-02-08 06:33:21 +0000 |
128 | @@ -1,7 +1,7 @@ |
129 | -usr/bin/moc-qt4 |
130 | -usr/bin/qdbuscpp2xml |
131 | -usr/bin/qdbusxml2cpp |
132 | -usr/bin/qt3to4 |
133 | -usr/bin/rcc |
134 | -usr/bin/uic-qt4 |
135 | -usr/bin/uic3 |
136 | +usr/lib/*/qt4/bin/moc |
137 | +usr/lib/*/qt4/bin/qdbuscpp2xml |
138 | +usr/lib/*/qt4/bin/qdbusxml2cpp |
139 | +usr/lib/*/qt4/bin/qt3to4 |
140 | +usr/lib/*/qt4/bin/rcc |
141 | +usr/lib/*/qt4/bin/uic |
142 | +usr/lib/*/qt4/bin/uic3 |
143 | |
144 | === renamed file 'debian/libqt4-dev-bin.links' => 'debian/libqt4-dev-bin.links.in' |
145 | --- debian/libqt4-dev-bin.links 2012-05-29 13:16:53 +0000 |
146 | +++ debian/libqt4-dev-bin.links.in 2013-02-08 06:33:21 +0000 |
147 | @@ -1,3 +1,5 @@ |
148 | -usr/bin/moc-qt4 usr/share/qt4/bin/moc |
149 | -usr/bin/uic-qt4 usr/share/qt4/bin/uic |
150 | -usr/bin/rcc usr/share/qt4/bin/rcc |
151 | +usr/lib/MULTIARCH/qt4/bin/moc usr/share/qt4/bin/moc |
152 | +usr/lib/MULTIARCH/qt4/bin/uic usr/share/qt4/bin/uic |
153 | +usr/lib/MULTIARCH/qt4/bin/rcc usr/share/qt4/bin/rcc |
154 | +usr/lib/MULTIARCH/qt4/bin/moc usr/bin/moc-qt4 |
155 | +usr/lib/MULTIARCH/qt4/bin/uic usr/bin/uic-qt4 |
156 | |
157 | === removed file 'debian/libqt4-dev-bin.postinst' |
158 | --- debian/libqt4-dev-bin.postinst 2012-05-29 13:16:53 +0000 |
159 | +++ debian/libqt4-dev-bin.postinst 1970-01-01 00:00:00 +0000 |
160 | @@ -1,15 +0,0 @@ |
161 | -#!/bin/sh |
162 | - |
163 | -set -e |
164 | - |
165 | -update-alternatives --install \ |
166 | - /usr/bin/moc moc "/usr/bin/moc-qt4" "40" \ |
167 | - --slave /usr/share/man/man1/moc.1.gz moc.1.gz \ |
168 | - "/usr/share/man/man1/moc-qt4.1.gz" |
169 | - |
170 | -update-alternatives --install \ |
171 | - /usr/bin/uic uic "/usr/bin/uic-qt4" "40" \ |
172 | - --slave /usr/share/man/man1/uic.1.gz uic.1.gz \ |
173 | - "/usr/share/man/man1/uic-qt4.1.gz" |
174 | - |
175 | -#DEBHELPER# |
176 | |
177 | === added file 'debian/libqt4-dev-bin.preinst' |
178 | --- debian/libqt4-dev-bin.preinst 1970-01-01 00:00:00 +0000 |
179 | +++ debian/libqt4-dev-bin.preinst 2013-02-08 06:33:21 +0000 |
180 | @@ -0,0 +1,14 @@ |
181 | +#!/bin/sh |
182 | + |
183 | +set -e |
184 | + |
185 | +case "$1" in |
186 | + upgrade) |
187 | + if dpkg --compare-versions $2 "<<" 4:4.8.5 |
188 | + then |
189 | + update-alternatives --remove moc "/usr/bin/moc-qt4" |
190 | + update-alternatives --remove uic "/usr/bin/uic-qt4" |
191 | + fi ;; |
192 | +esac |
193 | + |
194 | +#DEBHELPER# |
195 | |
196 | === removed file 'debian/libqt4-dev-bin.prerm' |
197 | --- debian/libqt4-dev-bin.prerm 2012-05-29 13:16:53 +0000 |
198 | +++ debian/libqt4-dev-bin.prerm 1970-01-01 00:00:00 +0000 |
199 | @@ -1,13 +0,0 @@ |
200 | -#!/bin/sh |
201 | - |
202 | -set -e |
203 | - |
204 | -case "$1" in |
205 | - upgrade) ;; |
206 | - remove|failed-upgrade|deconfigure) |
207 | - update-alternatives --remove moc "/usr/bin/moc-qt4" |
208 | - update-alternatives --remove uic "/usr/bin/uic-qt4" |
209 | - ;; |
210 | -esac |
211 | - |
212 | -#DEBHELPER# |
213 | |
214 | === modified file 'debian/libqt4-dev.install' |
215 | --- debian/libqt4-dev.install 2012-05-29 13:16:53 +0000 |
216 | +++ debian/libqt4-dev.install 2013-02-08 06:33:21 +0000 |
217 | @@ -1,3 +1,4 @@ |
218 | +usr/share/qtchooser/qt4.conf |
219 | #usr/include/qt4/Qt/QtOpenVG |
220 | #usr/include/qt4/Qt/qvg.h |
221 | #usr/include/qt4/QtOpenVG/QtOpenVG |
222 | |
223 | === removed file 'debian/patches/01_debian_append_qt4_suffix.diff' |
224 | --- debian/patches/01_debian_append_qt4_suffix.diff 2013-01-15 12:19:28 +0000 |
225 | +++ debian/patches/01_debian_append_qt4_suffix.diff 1970-01-01 00:00:00 +0000 |
226 | @@ -1,415 +0,0 @@ |
227 | -Author: Brian Nelson <pyro@debian.org> |
228 | -Author: Fathi Boudra <fabo@debian.org> |
229 | -Author: Pino Toscano <pino@kde.org> |
230 | -Description: Append a -qt4 suffix to some tools. |
231 | - To allow co-installation of the development tools of Qt4 with the Qt3 ones, |
232 | - we append a -qt4 suffix to the executable names of some development tools: |
233 | - assistant, designer, linguist, lrelease, lupdate, moc, qmake, qtconfig, uic. |
234 | -Last-Update: 2011-12-25 |
235 | -Forwarded: not-needed |
236 | - |
237 | ---- |
238 | - config.tests/unix/compile.test | 2 +- |
239 | - config.tests/unix/doubleformat.test | 2 +- |
240 | - config.tests/unix/endian.test | 2 +- |
241 | - config.tests/unix/ptrsize.test | 2 +- |
242 | - config.tests/x11/notype.test | 2 +- |
243 | - configure | 12 ++++++------ |
244 | - demos/qtdemo/menumanager.cpp | 2 +- |
245 | - mkspecs/common/linux.conf | 4 ++-- |
246 | - mkspecs/features/moc.prf | 2 +- |
247 | - mkspecs/features/uic.prf | 2 +- |
248 | - mkspecs/hurd-g++/qmake.conf | 4 ++-- |
249 | - projects.pro | 2 +- |
250 | - qmake/Makefile.unix | 8 ++++---- |
251 | - src/tools/moc/moc.pro | 2 +- |
252 | - src/tools/uic/uic.pro | 2 +- |
253 | - tools/assistant/tools/assistant/assistant.pro | 2 +- |
254 | - tools/designer/src/designer/assistantclient.cpp | 2 +- |
255 | - tools/designer/src/designer/designer.pro | 2 +- |
256 | - tools/designer/src/lib/shared/qdesigner_utils.cpp | 2 +- |
257 | - tools/linguist/linguist/linguist.pro | 2 +- |
258 | - tools/linguist/lrelease/lrelease.pro | 2 +- |
259 | - tools/linguist/lupdate/lupdate.pro | 2 +- |
260 | - tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp | 2 +- |
261 | - tools/qtconfig/qtconfig.pro | 2 +- |
262 | - translations/translations.pro | 6 +++--- |
263 | - 25 files changed, 37 insertions(+), 37 deletions(-) |
264 | - |
265 | -Index: qt-everywhere-opensource-src-4.8.4/config.tests/unix/compile.test |
266 | -=================================================================== |
267 | ---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/unix/compile.test 2013-01-09 12:40:13.609143632 +0000 |
268 | -+++ qt-everywhere-opensource-src-4.8.4/config.tests/unix/compile.test 2013-01-09 12:40:58.041144770 +0000 |
269 | -@@ -69,7 +69,7 @@ |
270 | - rm -f "$EXE" "${EXE}.exe" |
271 | - |
272 | - echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache" |
273 | --"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" |
274 | -+"$OUTDIR/bin/qmake-qt4" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" |
275 | - |
276 | - if [ "$VERBOSE" = "yes" ]; then |
277 | - $MAKE |
278 | -Index: qt-everywhere-opensource-src-4.8.4/config.tests/unix/doubleformat.test |
279 | -=================================================================== |
280 | ---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/unix/doubleformat.test 2013-01-09 12:40:13.609143632 +0000 |
281 | -+++ qt-everywhere-opensource-src-4.8.4/config.tests/unix/doubleformat.test 2013-01-09 12:40:13.589143631 +0000 |
282 | -@@ -10,7 +10,7 @@ |
283 | - |
284 | - # build and run a test program |
285 | - test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tests/unix/doubleformat" |
286 | --"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1 |
287 | -+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1 |
288 | - cd "$OUTDIR/config.tests/unix/doubleformat" |
289 | - |
290 | - DOUBLEFORMAT="UNKNOWN" |
291 | -Index: qt-everywhere-opensource-src-4.8.4/config.tests/unix/endian.test |
292 | -=================================================================== |
293 | ---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/unix/endian.test 2013-01-09 12:40:13.609143632 +0000 |
294 | -+++ qt-everywhere-opensource-src-4.8.4/config.tests/unix/endian.test 2013-01-09 12:40:44.073144412 +0000 |
295 | -@@ -11,7 +11,7 @@ |
296 | - |
297 | - # build and run a test program |
298 | - test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian" |
299 | --"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QMAKE_CXXFLAGS*=$SYSROOT" "LIBS*=$SYSROOT" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 |
300 | -+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QMAKE_CXXFLAGS*=$SYSROOT" "LIBS*=$SYSROOT" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 |
301 | - cd "$OUTDIR/config.tests/unix/endian" |
302 | - |
303 | - |
304 | -Index: qt-everywhere-opensource-src-4.8.4/config.tests/unix/ptrsize.test |
305 | -=================================================================== |
306 | ---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/unix/ptrsize.test 2013-01-09 12:40:13.609143632 +0000 |
307 | -+++ qt-everywhere-opensource-src-4.8.4/config.tests/unix/ptrsize.test 2013-01-09 12:40:13.589143631 +0000 |
308 | -@@ -10,7 +10,7 @@ |
309 | - |
310 | - # build and run a test program |
311 | - test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize" |
312 | --"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1 |
313 | -+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1 |
314 | - cd "$OUTDIR/config.tests/unix/ptrsize" |
315 | - |
316 | - if [ "$VERBOSE" = "yes" ]; then |
317 | -Index: qt-everywhere-opensource-src-4.8.4/config.tests/x11/notype.test |
318 | -=================================================================== |
319 | ---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/x11/notype.test 2013-01-09 12:40:13.609143632 +0000 |
320 | -+++ qt-everywhere-opensource-src-4.8.4/config.tests/x11/notype.test 2013-01-09 12:40:13.589143631 +0000 |
321 | -@@ -27,7 +27,7 @@ |
322 | - NOTYPE=yes |
323 | - |
324 | - test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype" |
325 | -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1 |
326 | -+ "$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1 |
327 | - cd "$OUTDIR/config.tests/x11/notype" |
328 | - |
329 | - if [ "$VERBOSE" = "yes" ]; then |
330 | -Index: qt-everywhere-opensource-src-4.8.4/configure |
331 | -=================================================================== |
332 | ---- qt-everywhere-opensource-src-4.8.4.orig/configure 2013-01-09 12:40:13.609143632 +0000 |
333 | -+++ qt-everywhere-opensource-src-4.8.4/configure 2013-01-09 12:40:13.593143631 +0000 |
334 | -@@ -4899,7 +4899,7 @@ |
335 | - } |
336 | - |
337 | - # build qmake |
338 | --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
339 | -+if true; then ###[ '!' -f "$outpath/bin/qmake-qt4" ]; |
340 | - echo "Creating qmake. Please wait..." |
341 | - |
342 | - OLD_QCONFIG_H= |
343 | -@@ -8683,8 +8683,8 @@ |
344 | - QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc |
345 | - |
346 | - #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR |
347 | --QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc |
348 | --QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic |
349 | -+QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc-qt4 |
350 | -+QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic-qt4 |
351 | - QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 |
352 | - QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc |
353 | - QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp |
354 | -@@ -9092,11 +9092,11 @@ |
355 | - |
356 | - echo "Finding project files. Please wait..." |
357 | - if [ "$CFG_NOPROCESS" != "yes" ]; then |
358 | -- "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" |
359 | -+ "$outpath/bin/qmake-qt4" -prl -r "${relpath}/projects.pro" |
360 | - if [ -f "${relpath}/projects.pro" ]; then |
361 | - mkfile="${outpath}/Makefile" |
362 | - [ -f "$mkfile" ] && chmod +w "$mkfile" |
363 | -- QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" |
364 | -+ QTDIR="$outpath" "$outpath/bin/qmake-qt4" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" |
365 | - fi |
366 | - fi |
367 | - |
368 | -@@ -9283,7 +9283,7 @@ |
369 | - QMAKE_SPEC_ARGS="-spec $SPEC" |
370 | - echo $ECHO_N " for $a$ECHO_C" |
371 | - |
372 | -- QMAKE="$outpath/bin/qmake" |
373 | -+ QMAKE="$outpath/bin/qmake-qt4" |
374 | - QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS" |
375 | - if [ "$file" = ".projects.3" ]; then |
376 | - echo " (fast)" |
377 | -Index: qt-everywhere-opensource-src-4.8.4/projects.pro |
378 | -=================================================================== |
379 | ---- qt-everywhere-opensource-src-4.8.4.orig/projects.pro 2013-01-09 12:40:13.609143632 +0000 |
380 | -+++ qt-everywhere-opensource-src-4.8.4/projects.pro 2013-01-09 12:40:13.597143632 +0000 |
381 | -@@ -144,7 +144,7 @@ |
382 | - equals(QMAKE_HOST.os, Windows) { |
383 | - qmake.files=$$QT_BUILD_TREE/bin/qmake.exe |
384 | - } else { |
385 | -- qmake.files=$$QT_BUILD_TREE/bin/qmake |
386 | -+ qmake.files=$$QT_BUILD_TREE/bin/qmake-qt4 |
387 | - } |
388 | - INSTALLS += qmake |
389 | - |
390 | -Index: qt-everywhere-opensource-src-4.8.4/qmake/Makefile.unix |
391 | -=================================================================== |
392 | ---- qt-everywhere-opensource-src-4.8.4.orig/qmake/Makefile.unix 2013-01-09 12:40:13.609143632 +0000 |
393 | -+++ qt-everywhere-opensource-src-4.8.4/qmake/Makefile.unix 2013-01-09 12:40:13.597143632 +0000 |
394 | -@@ -86,17 +86,17 @@ |
395 | - |
396 | - CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) |
397 | - |
398 | --first all: $(BUILD_PATH)/bin/qmake |
399 | --qmake: $(BUILD_PATH)/bin/qmake |
400 | -+first all: $(BUILD_PATH)/bin/qmake-qt4 |
401 | -+qmake: $(BUILD_PATH)/bin/qmake-qt4 |
402 | - |
403 | --$(BUILD_PATH)/bin/qmake: $(OBJS) $(QOBJS) |
404 | -+$(BUILD_PATH)/bin/qmake-qt4: $(OBJS) $(QOBJS) |
405 | - $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS) |
406 | - |
407 | - clean:: |
408 | - rm -f $(OBJS) $(QOBJS) |
409 | - |
410 | - distclean:: clean |
411 | -- rm -rf $(BUILD_PATH)/bin/qmake .deps |
412 | -+ rm -rf $(BUILD_PATH)/bin/qmake-qt4 .deps |
413 | - |
414 | - depend: |
415 | - makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC) |
416 | -Index: qt-everywhere-opensource-src-4.8.4/tools/linguist/lrelease/lrelease.pro |
417 | -=================================================================== |
418 | ---- qt-everywhere-opensource-src-4.8.4.orig/tools/linguist/lrelease/lrelease.pro 2013-01-09 12:40:13.609143632 +0000 |
419 | -+++ qt-everywhere-opensource-src-4.8.4/tools/linguist/lrelease/lrelease.pro 2013-01-09 12:40:13.597143632 +0000 |
420 | -@@ -1,5 +1,5 @@ |
421 | - TEMPLATE = app |
422 | --TARGET = lrelease |
423 | -+TARGET = lrelease-qt4 |
424 | - DESTDIR = ../../../bin |
425 | - |
426 | - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII |
427 | -Index: qt-everywhere-opensource-src-4.8.4/tools/linguist/lupdate/lupdate.pro |
428 | -=================================================================== |
429 | ---- qt-everywhere-opensource-src-4.8.4.orig/tools/linguist/lupdate/lupdate.pro 2013-01-09 12:40:13.609143632 +0000 |
430 | -+++ qt-everywhere-opensource-src-4.8.4/tools/linguist/lupdate/lupdate.pro 2013-01-09 12:40:13.597143632 +0000 |
431 | -@@ -1,5 +1,5 @@ |
432 | - TEMPLATE = app |
433 | --TARGET = lupdate |
434 | -+TARGET = lupdate-qt4 |
435 | - DESTDIR = ../../../bin |
436 | - |
437 | - QT -= gui |
438 | -Index: qt-everywhere-opensource-src-4.8.4/src/tools/moc/moc.pro |
439 | -=================================================================== |
440 | ---- qt-everywhere-opensource-src-4.8.4.orig/src/tools/moc/moc.pro 2013-01-09 12:40:13.609143632 +0000 |
441 | -+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/moc.pro 2013-01-09 12:40:13.597143632 +0000 |
442 | -@@ -1,5 +1,5 @@ |
443 | - TEMPLATE = app |
444 | --TARGET = moc |
445 | -+TARGET = moc-qt4 |
446 | - |
447 | - DEFINES += QT_MOC |
448 | - DESTDIR = ../../../bin |
449 | -Index: qt-everywhere-opensource-src-4.8.4/src/tools/uic/uic.pro |
450 | -=================================================================== |
451 | ---- qt-everywhere-opensource-src-4.8.4.orig/src/tools/uic/uic.pro 2013-01-09 12:40:13.609143632 +0000 |
452 | -+++ qt-everywhere-opensource-src-4.8.4/src/tools/uic/uic.pro 2013-01-09 12:40:13.597143632 +0000 |
453 | -@@ -1,5 +1,5 @@ |
454 | - TEMPLATE = app |
455 | --TARGET = uic |
456 | -+TARGET = uic-qt4 |
457 | - |
458 | - DESTDIR = ../../../bin |
459 | - DEFINES += QT_UIC |
460 | -Index: qt-everywhere-opensource-src-4.8.4/tools/assistant/tools/assistant/assistant.pro |
461 | -=================================================================== |
462 | ---- qt-everywhere-opensource-src-4.8.4.orig/tools/assistant/tools/assistant/assistant.pro 2013-01-09 12:40:13.609143632 +0000 |
463 | -+++ qt-everywhere-opensource-src-4.8.4/tools/assistant/tools/assistant/assistant.pro 2013-01-09 12:40:13.597143632 +0000 |
464 | -@@ -1,7 +1,7 @@ |
465 | - include(../../../shared/fontpanel/fontpanel.pri) |
466 | - TEMPLATE = app |
467 | - LANGUAGE = C++ |
468 | --TARGET = assistant |
469 | -+TARGET = assistant-qt4 |
470 | - contains(QT_CONFIG, webkit):QT += webkit |
471 | - CONFIG += qt \ |
472 | - warn_on \ |
473 | -Index: qt-everywhere-opensource-src-4.8.4/tools/designer/src/designer/designer.pro |
474 | -=================================================================== |
475 | ---- qt-everywhere-opensource-src-4.8.4.orig/tools/designer/src/designer/designer.pro 2013-01-09 12:40:13.609143632 +0000 |
476 | -+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/designer/designer.pro 2013-01-09 12:40:13.597143632 +0000 |
477 | -@@ -23,7 +23,7 @@ |
478 | - DEFINES += QT_DESIGNER_STATIC |
479 | - } |
480 | - |
481 | --TARGET = designer |
482 | -+TARGET = designer-qt4 |
483 | - |
484 | - include(../../../shared/fontpanel/fontpanel.pri) |
485 | - include(../../../shared/qttoolbardialog/qttoolbardialog.pri) |
486 | -Index: qt-everywhere-opensource-src-4.8.4/tools/linguist/linguist/linguist.pro |
487 | -=================================================================== |
488 | ---- qt-everywhere-opensource-src-4.8.4.orig/tools/linguist/linguist/linguist.pro 2013-01-09 12:40:13.609143632 +0000 |
489 | -+++ qt-everywhere-opensource-src-4.8.4/tools/linguist/linguist/linguist.pro 2013-01-09 12:40:13.601143632 +0000 |
490 | -@@ -69,7 +69,7 @@ |
491 | - |
492 | - contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE |
493 | - DEFINES += QT_KEYWORDS |
494 | --TARGET = linguist |
495 | -+TARGET = linguist-qt4 |
496 | - win32:RC_FILE = linguist.rc |
497 | - mac { |
498 | - static:CONFIG -= global_init_link_order |
499 | -Index: qt-everywhere-opensource-src-4.8.4/tools/qtconfig/qtconfig.pro |
500 | -=================================================================== |
501 | ---- qt-everywhere-opensource-src-4.8.4.orig/tools/qtconfig/qtconfig.pro 2013-01-09 12:40:13.609143632 +0000 |
502 | -+++ qt-everywhere-opensource-src-4.8.4/tools/qtconfig/qtconfig.pro 2013-01-09 12:40:13.601143632 +0000 |
503 | -@@ -19,7 +19,7 @@ |
504 | - RESOURCES = qtconfig.qrc |
505 | - |
506 | - PROJECTNAME = Qt Configuration |
507 | --TARGET = qtconfig |
508 | -+TARGET = qtconfig-qt4 |
509 | - DESTDIR = ../../bin |
510 | - |
511 | - target.path=$$[QT_INSTALL_BINS] |
512 | -Index: qt-everywhere-opensource-src-4.8.4/translations/translations.pro |
513 | -=================================================================== |
514 | ---- qt-everywhere-opensource-src-4.8.4.orig/translations/translations.pro 2013-01-09 12:40:13.609143632 +0000 |
515 | -+++ qt-everywhere-opensource-src-4.8.4/translations/translations.pro 2013-01-09 12:40:13.601143632 +0000 |
516 | -@@ -1,8 +1,8 @@ |
517 | - TRANSLATIONS = $$files(*.ts) |
518 | - |
519 | --qtPrepareTool(LRELEASE, lrelease) |
520 | -+qtPrepareTool(LRELEASE, lrelease-qt4) |
521 | - qtPrepareTool(LCONVERT, lconvert) |
522 | --qtPrepareTool(LUPDATE, lupdate) |
523 | -+qtPrepareTool(LUPDATE, lupdate-qt4) |
524 | - LUPDATE += -locations relative -no-ui-lines |
525 | - |
526 | - TS_TARGETS = |
527 | -@@ -96,7 +96,7 @@ |
528 | - updateqm.output = ${QMAKE_FILE_BASE}.qm |
529 | - isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS |
530 | - updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} |
531 | --silent:updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$updateqm.commands |
532 | -+silent:updateqm.commands = @echo lrelease-qt4 ${QMAKE_FILE_IN} && $$updateqm.commands |
533 | - updateqm.name = LRELEASE ${QMAKE_FILE_IN} |
534 | - updateqm.CONFIG += no_link |
535 | - QMAKE_EXTRA_COMPILERS += updateqm |
536 | -Index: qt-everywhere-opensource-src-4.8.4/mkspecs/features/moc.prf |
537 | -=================================================================== |
538 | ---- qt-everywhere-opensource-src-4.8.4.orig/mkspecs/features/moc.prf 2013-01-09 12:40:13.609143632 +0000 |
539 | -+++ qt-everywhere-opensource-src-4.8.4/mkspecs/features/moc.prf 2013-01-09 12:40:13.601143632 +0000 |
540 | -@@ -1,6 +1,6 @@ |
541 | - |
542 | - #global defaults |
543 | --qtPrepareTool(QMAKE_MOC, moc) |
544 | -+qtPrepareTool(QMAKE_MOC, moc-qt4) |
545 | - isEmpty(MOC_DIR):MOC_DIR = . |
546 | - isEmpty(QMAKE_H_MOD_MOC):QMAKE_H_MOD_MOC = moc_ |
547 | - isEmpty(QMAKE_EXT_CPP_MOC):QMAKE_EXT_CPP_MOC = .moc |
548 | -Index: qt-everywhere-opensource-src-4.8.4/mkspecs/features/uic.prf |
549 | -=================================================================== |
550 | ---- qt-everywhere-opensource-src-4.8.4.orig/mkspecs/features/uic.prf 2013-01-09 12:40:13.609143632 +0000 |
551 | -+++ qt-everywhere-opensource-src-4.8.4/mkspecs/features/uic.prf 2013-01-09 12:40:13.601143632 +0000 |
552 | -@@ -1,6 +1,6 @@ |
553 | - defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf |
554 | - qtPrepareTool(QMAKE_UIC3, uic3) |
555 | --qtPrepareTool(QMAKE_UIC, uic) |
556 | -+qtPrepareTool(QMAKE_UIC, uic-qt4) |
557 | - |
558 | - isEmpty(UI_DIR):UI_DIR = . |
559 | - isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR |
560 | -Index: qt-everywhere-opensource-src-4.8.4/mkspecs/common/linux.conf |
561 | -=================================================================== |
562 | ---- qt-everywhere-opensource-src-4.8.4.orig/mkspecs/common/linux.conf 2013-01-09 12:40:13.609143632 +0000 |
563 | -+++ qt-everywhere-opensource-src-4.8.4/mkspecs/common/linux.conf 2013-01-09 12:40:13.601143632 +0000 |
564 | -@@ -41,8 +41,8 @@ |
565 | - QMAKE_LIBDIR_WAYLAND = |
566 | - QMAKE_DEFINES_WAYLAND = |
567 | - |
568 | --QMAKE_MOC = $$[QT_INSTALL_BINS]/moc |
569 | --QMAKE_UIC = $$[QT_INSTALL_BINS]/uic |
570 | -+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4 |
571 | -+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4 |
572 | - |
573 | - QMAKE_AR = ar cqs |
574 | - QMAKE_OBJCOPY = objcopy |
575 | -Index: qt-everywhere-opensource-src-4.8.4/demos/qtdemo/menumanager.cpp |
576 | -=================================================================== |
577 | ---- qt-everywhere-opensource-src-4.8.4.orig/demos/qtdemo/menumanager.cpp 2013-01-09 12:40:13.609143632 +0000 |
578 | -+++ qt-everywhere-opensource-src-4.8.4/demos/qtdemo/menumanager.cpp 2013-01-09 12:40:13.601143632 +0000 |
579 | -@@ -297,7 +297,7 @@ |
580 | - if (this->assistantProcess.state() != QProcess::Running){ |
581 | - QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator(); |
582 | - #if !defined(Q_OS_MAC) |
583 | -- app += QLatin1String("assistant"); |
584 | -+ app += QLatin1String("assistant-qt4"); |
585 | - #else |
586 | - app += QLatin1String("Assistant.app/Contents/MacOS/Assistant"); |
587 | - #endif |
588 | -Index: qt-everywhere-opensource-src-4.8.4/tools/designer/src/designer/assistantclient.cpp |
589 | -=================================================================== |
590 | ---- qt-everywhere-opensource-src-4.8.4.orig/tools/designer/src/designer/assistantclient.cpp 2013-01-09 12:40:13.609143632 +0000 |
591 | -+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/designer/assistantclient.cpp 2013-01-09 12:40:13.605143632 +0000 |
592 | -@@ -114,7 +114,7 @@ |
593 | - { |
594 | - QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator(); |
595 | - #if !defined(Q_OS_MAC) |
596 | -- app += QLatin1String("assistant"); |
597 | -+ app += QLatin1String("assistant-qt4"); |
598 | - #else |
599 | - app += QLatin1String("Assistant.app/Contents/MacOS/Assistant"); |
600 | - #endif |
601 | -Index: qt-everywhere-opensource-src-4.8.4/tools/designer/src/lib/shared/qdesigner_utils.cpp |
602 | -=================================================================== |
603 | ---- qt-everywhere-opensource-src-4.8.4.orig/tools/designer/src/lib/shared/qdesigner_utils.cpp 2013-01-09 12:40:13.609143632 +0000 |
604 | -+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/lib/shared/qdesigner_utils.cpp 2013-01-09 12:40:13.605143632 +0000 |
605 | -@@ -782,7 +782,7 @@ |
606 | - binary += QDir::separator(); |
607 | - switch (mode) { |
608 | - case UIC_GenerateCode: |
609 | -- binary += QLatin1String("uic"); |
610 | -+ binary += QLatin1String("uic-qt4"); |
611 | - break; |
612 | - case UIC_ConvertV3: |
613 | - binary += QLatin1String("uic3"); |
614 | -Index: qt-everywhere-opensource-src-4.8.4/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp |
615 | -=================================================================== |
616 | ---- qt-everywhere-opensource-src-4.8.4.orig/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp 2013-01-09 12:40:13.609143632 +0000 |
617 | -+++ qt-everywhere-opensource-src-4.8.4/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp 2013-01-09 12:40:13.605143632 +0000 |
618 | -@@ -396,7 +396,7 @@ |
619 | - else { |
620 | - // run moc on this file |
621 | - QProcess proc; |
622 | -- proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text); |
623 | -+ proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text); |
624 | - |
625 | - if (!proc.waitForStarted()) { |
626 | - fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n"); |
627 | -Index: qt-everywhere-opensource-src-4.8.4/mkspecs/hurd-g++/qmake.conf |
628 | -=================================================================== |
629 | ---- qt-everywhere-opensource-src-4.8.4.orig/mkspecs/hurd-g++/qmake.conf 2013-01-09 12:40:13.609143632 +0000 |
630 | -+++ qt-everywhere-opensource-src-4.8.4/mkspecs/hurd-g++/qmake.conf 2013-01-09 12:40:13.605143632 +0000 |
631 | -@@ -42,8 +42,8 @@ |
632 | - QMAKE_LIBS_OPENVG = -lOpenVG |
633 | - QMAKE_LIBS_THREAD = -lpthread |
634 | - |
635 | --QMAKE_MOC = $$[QT_INSTALL_BINS]/moc |
636 | --QMAKE_UIC = $$[QT_INSTALL_BINS]/uic |
637 | -+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4 |
638 | -+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4 |
639 | - |
640 | - QMAKE_AR = ar cqs |
641 | - QMAKE_OBJCOPY = objcopy |
642 | |
643 | === modified file 'debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff' |
644 | --- debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff 2013-01-15 12:31:59 +0000 |
645 | +++ debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff 2013-02-08 06:33:21 +0000 |
646 | @@ -40,7 +40,7 @@ |
647 | @@ -2,7 +2,8 @@ |
648 | TEMPLATE = app |
649 | LANGUAGE = C++ |
650 | - TARGET = assistant-qt4 |
651 | + TARGET = assistant |
652 | -contains(QT_CONFIG, webkit):QT += webkit |
653 | +QT += webkit |
654 | +DEFINES += QT_WEBKIT |
655 | |
656 | === modified file 'debian/patches/series' |
657 | --- debian/patches/series 2013-01-15 12:11:40 +0000 |
658 | +++ debian/patches/series 2013-02-08 06:33:21 +0000 |
659 | @@ -9,7 +9,6 @@ |
660 | # debian patches |
661 | qtdebug_syslog.patch |
662 | buildable_appchooser_states_demos.patch |
663 | -01_debian_append_qt4_suffix.diff |
664 | 02_syncqt_sane_timestamp_for_nonexisting_headers.diff |
665 | 07_trust_dpkg-arch_over_uname-m.diff |
666 | 08_configure_quilt_compat.diff |
667 | |
668 | === modified file 'debian/qdbus.install' |
669 | --- debian/qdbus.install 2011-08-17 20:07:34 +0000 |
670 | +++ debian/qdbus.install 2013-02-08 06:33:21 +0000 |
671 | @@ -1,1 +1,1 @@ |
672 | -usr/bin/qdbus |
673 | +usr/lib/*/qt4/bin/qdbus |
674 | |
675 | === added file 'debian/qt4-default.install' |
676 | --- debian/qt4-default.install 1970-01-01 00:00:00 +0000 |
677 | +++ debian/qt4-default.install 2013-02-08 06:33:21 +0000 |
678 | @@ -0,0 +1,1 @@ |
679 | +usr/share/qtchooser/default.conf |
680 | |
681 | === modified file 'debian/qt4-demos.install' |
682 | --- debian/qt4-demos.install 2011-12-30 17:08:51 +0000 |
683 | +++ debian/qt4-demos.install 2013-02-08 06:33:21 +0000 |
684 | @@ -1,4 +1,4 @@ |
685 | -usr/bin/qtdemo |
686 | +usr/lib/*/qt4/bin/qtdemo |
687 | usr/lib/*/qt4/plugins/designer/libarthurplugin.so |
688 | usr/lib/*/qt4/plugins/designer/libcontainerextension.so |
689 | usr/lib/*/qt4/plugins/designer/libcustomwidgetplugin.so |
690 | |
691 | === modified file 'debian/qt4-designer.install' |
692 | --- debian/qt4-designer.install 2011-11-21 18:30:55 +0000 |
693 | +++ debian/qt4-designer.install 2013-02-08 06:33:21 +0000 |
694 | @@ -1,4 +1,4 @@ |
695 | -usr/bin/designer-qt4 |
696 | +usr/lib/*/qt4/bin/designer |
697 | usr/share/qt4/translations/designer_cs.qm |
698 | usr/share/qt4/translations/designer_de.qm |
699 | usr/share/qt4/translations/designer_fr.qm |
700 | |
701 | === renamed file 'debian/qt4-designer.links' => 'debian/qt4-designer.links.in' |
702 | --- debian/qt4-designer.links 2009-05-06 22:58:25 +0000 |
703 | +++ debian/qt4-designer.links.in 2013-02-08 06:33:21 +0000 |
704 | @@ -1,1 +1,2 @@ |
705 | -usr/bin/designer-qt4 usr/share/qt4/bin/designer |
706 | +usr/lib/MULTIARCH/qt4/bin/designer usr/share/qt4/bin/designer |
707 | +usr/lib/MULTIARCH/qt4/bin/designer usr/bin/designer-qt4 |
708 | |
709 | === modified file 'debian/qt4-designer.menu' |
710 | --- debian/qt4-designer.menu 2009-05-06 22:58:25 +0000 |
711 | +++ debian/qt4-designer.menu 2013-02-08 06:33:21 +0000 |
712 | @@ -2,5 +2,5 @@ |
713 | needs="x11"\ |
714 | section="Applications/Programming"\ |
715 | hints="KDE"\ |
716 | - title="Qt Designer"\ |
717 | - command="/usr/bin/designer-qt4" |
718 | + title="Qt4 Designer"\ |
719 | + command="/usr/lib/*/qt4/bin/designer" |
720 | |
721 | === removed file 'debian/qt4-designer.postinst' |
722 | --- debian/qt4-designer.postinst 2009-05-06 22:58:25 +0000 |
723 | +++ debian/qt4-designer.postinst 1970-01-01 00:00:00 +0000 |
724 | @@ -1,10 +0,0 @@ |
725 | -#!/bin/sh |
726 | - |
727 | -set -e |
728 | - |
729 | -update-alternatives --install \ |
730 | - /usr/bin/designer designer "/usr/bin/designer-qt4" "40" \ |
731 | - --slave /usr/share/man/man1/designer.1.gz designer.1.gz \ |
732 | - "/usr/share/man/man1/designer-qt4.1.gz" |
733 | - |
734 | -#DEBHELPER# |
735 | |
736 | === added file 'debian/qt4-designer.preinst' |
737 | --- debian/qt4-designer.preinst 1970-01-01 00:00:00 +0000 |
738 | +++ debian/qt4-designer.preinst 2013-02-08 06:33:21 +0000 |
739 | @@ -0,0 +1,13 @@ |
740 | +#!/bin/sh |
741 | + |
742 | +set -e |
743 | + |
744 | +case "$1" in |
745 | + upgrade) |
746 | + if dpkg --compare-versions $2 "<<" 4:4.8.5 |
747 | + then |
748 | + update-alternatives --remove designer "/usr/bin/designer-qt4" |
749 | + fi ;; |
750 | +esac |
751 | + |
752 | +#DEBHELPER# |
753 | |
754 | === removed file 'debian/qt4-designer.prerm' |
755 | --- debian/qt4-designer.prerm 2009-05-06 22:58:25 +0000 |
756 | +++ debian/qt4-designer.prerm 1970-01-01 00:00:00 +0000 |
757 | @@ -1,12 +0,0 @@ |
758 | -#!/bin/sh |
759 | - |
760 | -set -e |
761 | - |
762 | -case "$1" in |
763 | - upgrade) ;; |
764 | - remove|failed-upgrade|deconfigure) |
765 | - update-alternatives --remove designer "/usr/bin/designer-qt4" |
766 | - ;; |
767 | -esac |
768 | - |
769 | -#DEBHELPER# |
770 | |
771 | === modified file 'debian/qt4-dev-tools.install' |
772 | --- debian/qt4-dev-tools.install 2011-12-30 17:08:51 +0000 |
773 | +++ debian/qt4-dev-tools.install 2013-02-08 06:33:21 +0000 |
774 | @@ -1,17 +1,17 @@ |
775 | -usr/bin/assistant-qt4 |
776 | -usr/bin/lconvert |
777 | -usr/bin/linguist-qt4 |
778 | -usr/bin/pixeltool |
779 | -usr/bin/qcollectiongenerator |
780 | -usr/bin/qdbusviewer |
781 | -usr/bin/qdoc3 |
782 | -usr/bin/qhelpconverter |
783 | -usr/bin/qhelpgenerator |
784 | -usr/bin/qmlplugindump |
785 | -usr/bin/qttracereplay |
786 | -usr/bin/qvfb |
787 | -usr/bin/xmlpatterns |
788 | -usr/bin/xmlpatternsvalidator |
789 | +usr/lib/*/qt4/bin/assistant |
790 | +usr/lib/*/qt4/bin/lconvert |
791 | +usr/lib/*/qt4/bin/linguist |
792 | +usr/lib/*/qt4/bin/pixeltool |
793 | +usr/lib/*/qt4/bin/qcollectiongenerator |
794 | +usr/lib/*/qt4/bin/qdbusviewer |
795 | +usr/lib/*/qt4/bin/qdoc3 |
796 | +usr/lib/*/qt4/bin/qhelpconverter |
797 | +usr/lib/*/qt4/bin/qhelpgenerator |
798 | +usr/lib/*/qt4/bin/qmlplugindump |
799 | +usr/lib/*/qt4/bin/qttracereplay |
800 | +usr/lib/*/qt4/bin/qvfb |
801 | +usr/lib/*/qt4/bin/xmlpatterns |
802 | +usr/lib/*/qt4/bin/xmlpatternsvalidator |
803 | usr/share/qt4/phrasebooks/* |
804 | usr/share/qt4/translations/assistant_cs.qm |
805 | usr/share/qt4/translations/assistant_da.qm |
806 | |
807 | === added file 'debian/qt4-dev-tools.links.in' |
808 | --- debian/qt4-dev-tools.links.in 1970-01-01 00:00:00 +0000 |
809 | +++ debian/qt4-dev-tools.links.in 2013-02-08 06:33:21 +0000 |
810 | @@ -0,0 +1,2 @@ |
811 | +usr/lib/MULTIARCH/qt4/bin/assistant usr/bin/assistant-qt4 |
812 | +usr/lib/MULTIARCH/qt4/bin/linguist usr/bin/linguist-qt4 |
813 | |
814 | === modified file 'debian/qt4-dev-tools.menu' |
815 | --- debian/qt4-dev-tools.menu 2009-05-06 22:58:25 +0000 |
816 | +++ debian/qt4-dev-tools.menu 2013-02-08 06:33:21 +0000 |
817 | @@ -2,12 +2,12 @@ |
818 | needs="x11"\ |
819 | section="Applications/Programming"\ |
820 | hints="KDE"\ |
821 | - title="Qt Assistant"\ |
822 | - command="/usr/bin/assistant-qt4" |
823 | + title="Qt4 Assistant"\ |
824 | + command="/usr/lib/*/qt4/bin/assistant" |
825 | |
826 | ?package(qt4-dev-tools):\ |
827 | needs="x11"\ |
828 | section="Applications/Programming"\ |
829 | hints="KDE"\ |
830 | - title="Qt Linguist"\ |
831 | - command="/usr/bin/linguist-qt4" |
832 | + title="Qt4 Linguist"\ |
833 | + command="/usr/lib/*/qt4/bin/linguist" |
834 | |
835 | === removed file 'debian/qt4-dev-tools.postinst' |
836 | --- debian/qt4-dev-tools.postinst 2009-05-06 22:58:25 +0000 |
837 | +++ debian/qt4-dev-tools.postinst 1970-01-01 00:00:00 +0000 |
838 | @@ -1,15 +0,0 @@ |
839 | -#!/bin/sh |
840 | - |
841 | -set -e |
842 | - |
843 | -update-alternatives --install \ |
844 | - /usr/bin/assistant assistant "/usr/bin/assistant-qt4" "40" \ |
845 | - --slave /usr/share/man/man1/assistant.1.gz assistant.1.gz \ |
846 | - "/usr/share/man/man1/assistant-qt4.1.gz" |
847 | - |
848 | -update-alternatives --install \ |
849 | - /usr/bin/linguist linguist "/usr/bin/linguist-qt4" "40" \ |
850 | - --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \ |
851 | - "/usr/share/man/man1/linguist-qt4.1.gz" |
852 | - |
853 | -#DEBHELPER# |
854 | |
855 | === added file 'debian/qt4-dev-tools.preinst' |
856 | --- debian/qt4-dev-tools.preinst 1970-01-01 00:00:00 +0000 |
857 | +++ debian/qt4-dev-tools.preinst 2013-02-08 06:33:21 +0000 |
858 | @@ -0,0 +1,14 @@ |
859 | +#!/bin/sh |
860 | + |
861 | +set -e |
862 | + |
863 | +case "$1" in |
864 | + upgrade) |
865 | + if dpkg --compare-versions $2 "<<" 4:4.8.5 |
866 | + then |
867 | + update-alternatives --remove assistant "/usr/bin/assistant-qt4" |
868 | + update-alternatives --remove linguist "/usr/bin/linguist-qt4" |
869 | + fi ;; |
870 | +esac |
871 | + |
872 | +#DEBHELPER# |
873 | |
874 | === removed file 'debian/qt4-dev-tools.prerm' |
875 | --- debian/qt4-dev-tools.prerm 2009-05-06 22:58:25 +0000 |
876 | +++ debian/qt4-dev-tools.prerm 1970-01-01 00:00:00 +0000 |
877 | @@ -1,13 +0,0 @@ |
878 | -#!/bin/sh |
879 | - |
880 | -set -e |
881 | - |
882 | -case "$1" in |
883 | - upgrade) ;; |
884 | - remove|failed-upgrade|deconfigure) |
885 | - update-alternatives --remove assistant "/usr/bin/assistant-qt4" |
886 | - update-alternatives --remove linguist "/usr/bin/linguist-qt4" |
887 | - ;; |
888 | -esac |
889 | - |
890 | -#DEBHELPER# |
891 | |
892 | === modified file 'debian/qt4-linguist-tools.install' |
893 | --- debian/qt4-linguist-tools.install 2011-06-23 13:00:06 +0000 |
894 | +++ debian/qt4-linguist-tools.install 2013-02-08 06:33:21 +0000 |
895 | @@ -1,2 +1,2 @@ |
896 | -usr/bin/lrelease-qt4 |
897 | -usr/bin/lupdate-qt4 |
898 | +usr/lib/*/qt4/bin/lrelease |
899 | +usr/lib/*/qt4/bin/lupdate |
900 | |
901 | === renamed file 'debian/qt4-linguist-tools.links' => 'debian/qt4-linguist-tools.links.in' |
902 | --- debian/qt4-linguist-tools.links 2011-06-23 13:00:06 +0000 |
903 | +++ debian/qt4-linguist-tools.links.in 2013-02-08 06:33:21 +0000 |
904 | @@ -1,2 +1,4 @@ |
905 | -usr/bin/lrelease-qt4 usr/share/qt4/bin/lrelease |
906 | -usr/bin/lupdate-qt4 usr/share/qt4/bin/lupdate |
907 | +usr/lib/MULTIARCH/qt4/bin/lrelease usr/share/qt4/bin/lrelease |
908 | +usr/lib/MULTIARCH/qt4/bin/lupdate usr/share/qt4/bin/lupdate |
909 | +usr/lib/MULTIARCH/qt4/bin/lrelease usr/bin/lrelease-qt4 |
910 | +usr/lib/MULTIARCH/qt4/bin/lupdate usr/bin/lupdate-qt4 |
911 | |
912 | === removed file 'debian/qt4-linguist-tools.postinst' |
913 | --- debian/qt4-linguist-tools.postinst 2011-06-23 13:00:06 +0000 |
914 | +++ debian/qt4-linguist-tools.postinst 1970-01-01 00:00:00 +0000 |
915 | @@ -1,15 +0,0 @@ |
916 | -#!/bin/sh |
917 | - |
918 | -set -e |
919 | - |
920 | -update-alternatives --install \ |
921 | - /usr/bin/lupdate lupdate "/usr/bin/lupdate-qt4" "40" \ |
922 | - --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \ |
923 | - "/usr/share/man/man1/lupdate-qt4.1.gz" |
924 | - |
925 | -update-alternatives --install \ |
926 | - /usr/bin/lrelease lrelease "/usr/bin/lrelease-qt4" "40" \ |
927 | - --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \ |
928 | - "/usr/share/man/man1/lrelease-qt4.1.gz" |
929 | - |
930 | -#DEBHELPER# |
931 | |
932 | === added file 'debian/qt4-linguist-tools.preinst' |
933 | --- debian/qt4-linguist-tools.preinst 1970-01-01 00:00:00 +0000 |
934 | +++ debian/qt4-linguist-tools.preinst 2013-02-08 06:33:21 +0000 |
935 | @@ -0,0 +1,14 @@ |
936 | +#!/bin/sh |
937 | + |
938 | +set -e |
939 | + |
940 | +case "$1" in |
941 | + upgrade) |
942 | + if dpkg --compare-versions $2 "<<" 4:4.8.5 |
943 | + then |
944 | + update-alternatives --remove lupdate "/usr/bin/lupdate-qt4" |
945 | + update-alternatives --remove lrelease "/usr/bin/lrelease-qt4" |
946 | + fi ;; |
947 | +esac |
948 | + |
949 | +#DEBHELPER# |
950 | |
951 | === removed file 'debian/qt4-linguist-tools.prerm' |
952 | --- debian/qt4-linguist-tools.prerm 2011-06-23 13:00:06 +0000 |
953 | +++ debian/qt4-linguist-tools.prerm 1970-01-01 00:00:00 +0000 |
954 | @@ -1,13 +0,0 @@ |
955 | -#!/bin/sh |
956 | - |
957 | -set -e |
958 | - |
959 | -case "$1" in |
960 | - upgrade) ;; |
961 | - remove|failed-upgrade|deconfigure) |
962 | - update-alternatives --remove lupdate "/usr/bin/lupdate-qt4" |
963 | - update-alternatives --remove lrelease "/usr/bin/lrelease-qt4" |
964 | - ;; |
965 | -esac |
966 | - |
967 | -#DEBHELPER# |
968 | |
969 | === modified file 'debian/qt4-qmake.install' |
970 | --- debian/qt4-qmake.install 2009-05-06 22:58:25 +0000 |
971 | +++ debian/qt4-qmake.install 2013-02-08 06:33:21 +0000 |
972 | @@ -1,2 +1,2 @@ |
973 | -usr/bin/qmake-qt4 |
974 | +usr/lib/*/qt4/bin/qmake |
975 | usr/share/qt4/mkspecs/* |
976 | |
977 | === renamed file 'debian/qt4-qmake.links' => 'debian/qt4-qmake.links.in' |
978 | --- debian/qt4-qmake.links 2011-05-31 14:09:36 +0000 |
979 | +++ debian/qt4-qmake.links.in 2013-02-08 06:33:21 +0000 |
980 | @@ -1,1 +1,2 @@ |
981 | -usr/bin/qmake-qt4 usr/share/qt4/bin/qmake |
982 | +usr/lib/MULTIARCH/qt4/bin/qmake usr/share/qt4/bin/qmake |
983 | +usr/lib/MULTIARCH/qt4/bin/qmake usr/bin/qmake-qt4 |
984 | |
985 | === removed file 'debian/qt4-qmake.postinst' |
986 | --- debian/qt4-qmake.postinst 2009-05-06 22:58:25 +0000 |
987 | +++ debian/qt4-qmake.postinst 1970-01-01 00:00:00 +0000 |
988 | @@ -1,10 +0,0 @@ |
989 | -#!/bin/sh |
990 | - |
991 | -set -e |
992 | - |
993 | -update-alternatives --install \ |
994 | - /usr/bin/qmake qmake "/usr/bin/qmake-qt4" "40" \ |
995 | - --slave /usr/share/man/man1/qmake.1.gz qmake.1.gz \ |
996 | - "/usr/share/man/man1/qmake-qt4.1.gz" |
997 | - |
998 | -#DEBHELPER# |
999 | |
1000 | === added file 'debian/qt4-qmake.preinst' |
1001 | --- debian/qt4-qmake.preinst 1970-01-01 00:00:00 +0000 |
1002 | +++ debian/qt4-qmake.preinst 2013-02-08 06:33:21 +0000 |
1003 | @@ -0,0 +1,13 @@ |
1004 | +#!/bin/sh |
1005 | + |
1006 | +set -e |
1007 | + |
1008 | +case "$1" in |
1009 | + upgrade) |
1010 | + if dpkg --compare-versions $2 "<<" 4:4.8.5 |
1011 | + then |
1012 | + update-alternatives --remove qmake "/usr/bin/qmake-qt4" |
1013 | + fi ;; |
1014 | +esac |
1015 | + |
1016 | +#DEBHELPER# |
1017 | |
1018 | === removed file 'debian/qt4-qmake.prerm' |
1019 | --- debian/qt4-qmake.prerm 2009-05-06 22:58:25 +0000 |
1020 | +++ debian/qt4-qmake.prerm 1970-01-01 00:00:00 +0000 |
1021 | @@ -1,12 +0,0 @@ |
1022 | -#!/bin/sh |
1023 | - |
1024 | -set -e |
1025 | - |
1026 | -case "$1" in |
1027 | - upgrade) ;; |
1028 | - remove|failed-upgrade|deconfigure) |
1029 | - update-alternatives --remove qmake "/usr/bin/qmake-qt4" |
1030 | - ;; |
1031 | -esac |
1032 | - |
1033 | -#DEBHELPER# |
1034 | |
1035 | === modified file 'debian/qt4-qmlviewer.install' |
1036 | --- debian/qt4-qmlviewer.install 2010-07-07 03:39:15 +0000 |
1037 | +++ debian/qt4-qmlviewer.install 2013-02-08 06:33:21 +0000 |
1038 | @@ -1,1 +1,1 @@ |
1039 | -usr/bin/qmlviewer |
1040 | +usr/lib/*/qt4/bin/qmlviewer |
1041 | |
1042 | === modified file 'debian/qt4-qtconfig.install' |
1043 | --- debian/qt4-qtconfig.install 2011-11-21 18:30:55 +0000 |
1044 | +++ debian/qt4-qtconfig.install 2013-02-08 06:33:21 +0000 |
1045 | @@ -1,4 +1,4 @@ |
1046 | -usr/bin/qtconfig-qt4 |
1047 | +usr/lib/*/qt4/bin/qtconfig |
1048 | usr/share/qt4/translations/qtconfig_hu.qm |
1049 | usr/share/qt4/translations/qtconfig_ja.qm |
1050 | usr/share/qt4/translations/qtconfig_ko.qm |
1051 | |
1052 | === added file 'debian/qt4-qtconfig.links.in' |
1053 | --- debian/qt4-qtconfig.links.in 1970-01-01 00:00:00 +0000 |
1054 | +++ debian/qt4-qtconfig.links.in 2013-02-08 06:33:21 +0000 |
1055 | @@ -0,0 +1,1 @@ |
1056 | +usr/lib/MULTIARCH/qt4/bin/qtconfig usr/bin/qtconfig-qt4 |
1057 | |
1058 | === modified file 'debian/qt4-qtconfig.menu' |
1059 | --- debian/qt4-qtconfig.menu 2009-05-06 22:58:25 +0000 |
1060 | +++ debian/qt4-qtconfig.menu 2013-02-08 06:33:21 +0000 |
1061 | @@ -4,4 +4,4 @@ |
1062 | title="QtConfig"\ |
1063 | longtitle="Qt Configuration Utility"\ |
1064 | hints="Qt4 config tool"\ |
1065 | - command="/usr/bin/qtconfig-qt4" |
1066 | + command="/usr/lib/*/qt4/bin/qtconfig" |
1067 | |
1068 | === removed file 'debian/qt4-qtconfig.postinst' |
1069 | --- debian/qt4-qtconfig.postinst 2009-05-06 22:58:25 +0000 |
1070 | +++ debian/qt4-qtconfig.postinst 1970-01-01 00:00:00 +0000 |
1071 | @@ -1,10 +0,0 @@ |
1072 | -#!/bin/sh |
1073 | - |
1074 | -set -e |
1075 | - |
1076 | -update-alternatives --install \ |
1077 | - /usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-qt4" "40" \ |
1078 | - --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \ |
1079 | - "/usr/share/man/man1/qtconfig-qt4.1.gz" |
1080 | - |
1081 | -#DEBHELPER# |
1082 | |
1083 | === added file 'debian/qt4-qtconfig.preinst' |
1084 | --- debian/qt4-qtconfig.preinst 1970-01-01 00:00:00 +0000 |
1085 | +++ debian/qt4-qtconfig.preinst 2013-02-08 06:33:21 +0000 |
1086 | @@ -0,0 +1,13 @@ |
1087 | +#!/bin/sh |
1088 | + |
1089 | +set -e |
1090 | + |
1091 | +case "$1" in |
1092 | + upgrade) |
1093 | + if dpkg --compare-versions $2 "<<" 4:4.8.5 |
1094 | + then |
1095 | + update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt4" |
1096 | + fi ;; |
1097 | +esac |
1098 | + |
1099 | +#DEBHELPER# |
1100 | |
1101 | === removed file 'debian/qt4-qtconfig.prerm' |
1102 | --- debian/qt4-qtconfig.prerm 2009-05-06 22:58:25 +0000 |
1103 | +++ debian/qt4-qtconfig.prerm 1970-01-01 00:00:00 +0000 |
1104 | @@ -1,12 +0,0 @@ |
1105 | -#!/bin/sh |
1106 | - |
1107 | -set -e |
1108 | - |
1109 | -case "$1" in |
1110 | - upgrade) ;; |
1111 | - remove|failed-upgrade|deconfigure) |
1112 | - update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt4" |
1113 | - ;; |
1114 | -esac |
1115 | - |
1116 | -#DEBHELPER# |
1117 | |
1118 | === modified file 'debian/rules' |
1119 | --- debian/rules 2013-01-15 12:05:40 +0000 |
1120 | +++ debian/rules 2013-02-08 06:33:21 +0000 |
1121 | @@ -125,7 +125,7 @@ |
1122 | |
1123 | ./configure -confirm-license \ |
1124 | -prefix "/usr" \ |
1125 | - -bindir "/usr/bin" \ |
1126 | + -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin" \ |
1127 | -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \ |
1128 | -docdir "/usr/share/qt4/doc" \ |
1129 | -headerdir "/usr/include/qt4" \ |
1130 | @@ -291,6 +291,12 @@ |
1131 | find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.prl' \ |
1132 | -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \; |
1133 | |
1134 | + # Add symlinks for the -qt4 binaries still used by some |
1135 | + for links_file in debian/libqt4-dev-bin.links debian/qt4-designer.links debian/qt4-dev-tools.links debian/qt4-linguist-tools.links debian/qt4-qmake.links debian/qt4-qtconfig.links ; do \ |
1136 | + cat $$links_file.in > $$links_file ; \ |
1137 | + sed -i 's/MULTIARCH/$(DEB_HOST_MULTIARCH)/' $$links_file ; \ |
1138 | + done |
1139 | + |
1140 | install -D -p -m0644 debian/collection/qtdemo.qhc \ |
1141 | debian/qt4-demos/usr/lib/qt4/demos/qtdemo/qtdemo.qhc |
1142 | |
1143 | @@ -326,6 +332,12 @@ |
1144 | rm -f debian/tmp/usr/lib/*/pkgconfig/phonon.pc |
1145 | rm -rf debian/tmp/usr/include/qt4/phonon |
1146 | |
1147 | + # Add a configuration for qtchooser |
1148 | + mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser |
1149 | + echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4.conf |
1150 | + echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4.conf |
1151 | + ln -s /usr/share/qtchooser/qt4.conf $(CURDIR)/debian/tmp/usr/share/qtchooser/default.conf |
1152 | + |
1153 | # Remove leftover directories |
1154 | find $(CURDIR)/debian/tmp/usr/lib/qt4 -depth -type d \( -false \ |
1155 | -o -name .moc\* \ |
1156 | @@ -376,7 +388,7 @@ |
1157 | override_dh_shlibdeps: |
1158 | # Kubuntu: assistant-qt4 links against libQtWebkit which we don't package in qt4-x11 |
1159 | # dependencies are manually added in debian/control |
1160 | - dh_shlibdeps -pqt4-dev-tools -Xusr/bin/assistant-qt4 |
1161 | + dh_shlibdeps -pqt4-dev-tools -Xusr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin/assistant |
1162 | dh_shlibdeps -pqt4-demos \ |
1163 | -Xusr/lib/qt4/examples/webkit/webplugin/webplugin \ |
1164 | -Xusr/lib/qt4/examples/webkit/simpleselector/simpleselector \ |
Excellent work, thanks for cleaning the latest mile! :)