Merge lp:~mitya57/ubuntu/saucy/qtdeclarative-opensource-src/merge into lp:ubuntu/saucy/qtdeclarative-opensource-src
- Saucy (13.10)
- merge
- Merge into saucy
Proposed by
Dmitry Shachnev
Status: | Merged |
---|---|
Merged at revision: | 7 |
Proposed branch: | lp:~mitya57/ubuntu/saucy/qtdeclarative-opensource-src/merge |
Merge into: | lp:ubuntu/saucy/qtdeclarative-opensource-src |
Diff against target: |
423 lines (+190/-37) 6 files modified
debian/changelog (+80/-0) debian/control (+52/-29) debian/copyright (+42/-2) debian/qtdeclarative5-doc-html.install (+2/-0) debian/qtdeclarative5-doc.install (+2/-0) debian/rules (+12/-6) |
To merge this branch: | bzr merge lp:~mitya57/ubuntu/saucy/qtdeclarative-opensource-src/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Timo Jyrinki | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+172054@code.launchpad.net |
Commit message
Description of the change
This is a merge from Debian, started by Timo and finished by me. This is needed to unblock landing of new qtdoc package.
The only difference from what is in bzr now is a "dch -r" call.
To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote : | # |
Addendum: I added two cherry-picked patches requested by Florian on top of the packaging branch lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src - those were tested to be functional (https:/
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2013-06-20 15:24:17 +0000 | |||
3 | +++ debian/changelog 2013-06-28 14:52:14 +0000 | |||
4 | @@ -1,3 +1,83 @@ | |||
5 | 1 | qtdeclarative-opensource-src (5.0.2-6ubuntu1) saucy; urgency=low | ||
6 | 2 | |||
7 | 3 | [ Timo Jyrinki ] | ||
8 | 4 | * Resync with Debian, remaining changes: | ||
9 | 5 | - Keep cherry-picked patches, and symbols | ||
10 | 6 | - Keep debian/patches/rendering_performance_fix_lp1092358.patch | ||
11 | 7 | - Add Vcs-Bzr field | ||
12 | 8 | |||
13 | 9 | [ Dmitry Shachnev ] | ||
14 | 10 | * Merge with Debian 5.0.2-6 to bring in documentation packages. | ||
15 | 11 | * Note: architecture restrictions have been dropped from this upload, | ||
16 | 12 | as requested by the Release Team. | ||
17 | 13 | |||
18 | 14 | -- Dmitry Shachnev <mitya57@ubuntu.com> Fri, 28 Jun 2013 18:32:07 +0400 | ||
19 | 15 | |||
20 | 16 | qtdeclarative-opensource-src (5.0.2-6) experimental; urgency=low | ||
21 | 17 | |||
22 | 18 | * Update symbols files. | ||
23 | 19 | |||
24 | 20 | -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 26 Jun 2013 18:29:51 -0300 | ||
25 | 21 | |||
26 | 22 | qtdeclarative-opensource-src (5.0.2-5) experimental; urgency=low | ||
27 | 23 | |||
28 | 24 | [ Lisandro Damián Nicanor Pérez Meyer ] | ||
29 | 25 | * Make every package that ships a binary managed by qtchooser depend on it. | ||
30 | 26 | * Build the documentation shipped with this submodule as a build-indep task: | ||
31 | 27 | - Add the necessary indep build dependencies: | ||
32 | 28 | * qttools5-dev-tools to use qhelpgenerator. | ||
33 | 29 | * libqt5sql5-sqlite to generate qch doc. | ||
34 | 30 | - Build and create packages for qch and HTML doc formats. | ||
35 | 31 | * Update symbols files. | ||
36 | 32 | * Set qtdeclarative5-dbg as M-A same, so it can be coinstalled with other | ||
37 | 33 | archs debugging symbols. | ||
38 | 34 | |||
39 | 35 | [ Timo Jyrinki ] | ||
40 | 36 | * Depend on libgl1-mesa-dri from the qtquick2 QML plugin | ||
41 | 37 | - Not depending may cause crashes due to lack of VBO support | ||
42 | 38 | (https://bugs.launchpad.net/bugs/1176199) | ||
43 | 39 | |||
44 | 40 | -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 19 Jun 2013 21:33:20 -0300 | ||
45 | 41 | |||
46 | 42 | qtdeclarative-opensource-src (5.0.2-4) experimental; urgency=low | ||
47 | 43 | |||
48 | 44 | [ Pino Toscano ] | ||
49 | 45 | * debian/control: remove extra ${misc:Pre-Depends} from qmlscene and | ||
50 | 46 | qtdeclarative5-dev-tools. | ||
51 | 47 | * Update symbols files. | ||
52 | 48 | * Fix Vcs-* headers. | ||
53 | 49 | |||
54 | 50 | [ Lisandro Damián Nicanor Pérez Meyer ] | ||
55 | 51 | * Update symbols with amd64 build. | ||
56 | 52 | |||
57 | 53 | -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Sat, 18 May 2013 21:25:40 -0300 | ||
58 | 54 | |||
59 | 55 | qtdeclarative-opensource-src (5.0.2-3) experimental; urgency=low | ||
60 | 56 | |||
61 | 57 | [ Pino Toscano ] | ||
62 | 58 | * Update symbols files. | ||
63 | 59 | |||
64 | 60 | [ Lisandro Damián Nicanor Pérez Meyer ] | ||
65 | 61 | * Update symbols files. | ||
66 | 62 | |||
67 | 63 | -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Mon, 06 May 2013 14:53:19 -0300 | ||
68 | 64 | |||
69 | 65 | qtdeclarative-opensource-src (5.0.2-2) experimental; urgency=low | ||
70 | 66 | |||
71 | 67 | [ Lisandro Damián Nicanor Pérez Meyer ] | ||
72 | 68 | * Fix wrong permissions of examples. | ||
73 | 69 | |||
74 | 70 | [ Pino Toscano ] | ||
75 | 71 | * Update symbols files. | ||
76 | 72 | * qtdeclarative5-localstorage-plugin: depend on libqt5sql5-sqlite, as it is | ||
77 | 73 | used directly. | ||
78 | 74 | * Remove extra ${shlibs:Depends} from qtdeclarative5-private-dev. | ||
79 | 75 | * Bump the libqt5v8-5-private-dev and libqt5xmlpatterns5-private-dev build | ||
80 | 76 | dependencies to 5.0.2~. | ||
81 | 77 | * rules: use $(DEB_HOST_MULTIARCH) everywhere. | ||
82 | 78 | |||
83 | 79 | -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Tue, 30 Apr 2013 20:45:49 -0300 | ||
84 | 80 | |||
85 | 1 | qtdeclarative-opensource-src (5.0.2-1ubuntu2) saucy; urgency=low | 81 | qtdeclarative-opensource-src (5.0.2-1ubuntu2) saucy; urgency=low |
86 | 2 | 82 | ||
87 | 3 | [ Timo Jyrinki ] | 83 | [ Timo Jyrinki ] |
88 | 4 | 84 | ||
89 | === modified file 'debian/control' | |||
90 | --- debian/control 2013-04-29 16:27:13 +0000 | |||
91 | +++ debian/control 2013-06-28 14:52:14 +0000 | |||
92 | @@ -11,18 +11,20 @@ | |||
93 | 11 | Timo Jyrinki <timo@debian.org> | 11 | Timo Jyrinki <timo@debian.org> |
94 | 12 | Build-Depends: debhelper (>= 9), | 12 | Build-Depends: debhelper (>= 9), |
95 | 13 | dpkg-dev (>= 1.16.1), | 13 | dpkg-dev (>= 1.16.1), |
98 | 14 | libqt5v8-5-private-dev (>= 5.0.1~), | 14 | libqt5v8-5-private-dev (>= 5.0.2~), |
99 | 15 | libqt5xmlpatterns5-private-dev (>= 5.0.1~), | 15 | libqt5xmlpatterns5-private-dev (>= 5.0.2~), |
100 | 16 | pkg-kde-tools, | 16 | pkg-kde-tools, |
101 | 17 | qtbase5-private-dev (>= 5.0.2~) | 17 | qtbase5-private-dev (>= 5.0.2~) |
102 | 18 | Build-Depends-Indep: libqt5sql5-sqlite, | ||
103 | 19 | qttools5-dev-tools (>= 5.0.2~) | ||
104 | 18 | Standards-Version: 3.9.4 | 20 | Standards-Version: 3.9.4 |
105 | 19 | Homepage: http://qt-project.org/ | 21 | Homepage: http://qt-project.org/ |
108 | 20 | Vcs-Git: git://git.debian.org/pkg-kde/qt/qtdeclarative.git | 22 | Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git |
109 | 21 | Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=summary | 23 | Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtdeclarative.git;a=summary |
110 | 22 | Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src | 24 | Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src |
111 | 23 | 25 | ||
112 | 24 | Package: libqt5qml5 | 26 | Package: libqt5qml5 |
114 | 25 | Architecture: amd64 i386 armhf | 27 | Architecture: any |
115 | 26 | Multi-Arch: same | 28 | Multi-Arch: same |
116 | 27 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 29 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
117 | 28 | Depends: ${misc:Depends}, ${shlibs:Depends} | 30 | Depends: ${misc:Depends}, ${shlibs:Depends} |
118 | @@ -37,7 +39,7 @@ | |||
119 | 37 | QML code with JavaScript and C++. | 39 | QML code with JavaScript and C++. |
120 | 38 | 40 | ||
121 | 39 | Package: libqt5quick5 | 41 | Package: libqt5quick5 |
123 | 40 | Architecture: amd64 i386 armhf | 42 | Architecture: any |
124 | 41 | Multi-Arch: same | 43 | Multi-Arch: same |
125 | 42 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 44 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
126 | 43 | Depends: ${misc:Depends}, ${shlibs:Depends} | 45 | Depends: ${misc:Depends}, ${shlibs:Depends} |
127 | @@ -51,7 +53,7 @@ | |||
128 | 51 | boxes and other portable devices. | 53 | boxes and other portable devices. |
129 | 52 | 54 | ||
130 | 53 | Package: libqt5quickparticles5 | 55 | Package: libqt5quickparticles5 |
132 | 54 | Architecture: amd64 i386 armhf | 56 | Architecture: any |
133 | 55 | Multi-Arch: same | 57 | Multi-Arch: same |
134 | 56 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 58 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
135 | 57 | Depends: ${misc:Depends}, ${shlibs:Depends} | 59 | Depends: ${misc:Depends}, ${shlibs:Depends} |
136 | @@ -62,7 +64,7 @@ | |||
137 | 62 | This package contains the Qt Quick Particles support library. | 64 | This package contains the Qt Quick Particles support library. |
138 | 63 | 65 | ||
139 | 64 | Package: libqt5quicktest5 | 66 | Package: libqt5quicktest5 |
141 | 65 | Architecture: amd64 i386 armhf | 67 | Architecture: any |
142 | 66 | Multi-Arch: same | 68 | Multi-Arch: same |
143 | 67 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 69 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
144 | 68 | Depends: ${misc:Depends}, ${shlibs:Depends} | 70 | Depends: ${misc:Depends}, ${shlibs:Depends} |
145 | @@ -73,7 +75,7 @@ | |||
146 | 73 | This package contains the Qt Quick Test library for QtDeclarative module. | 75 | This package contains the Qt Quick Test library for QtDeclarative module. |
147 | 74 | 76 | ||
148 | 75 | Package: qtdeclarative5-folderlistmodel-plugin | 77 | Package: qtdeclarative5-folderlistmodel-plugin |
150 | 76 | Architecture: amd64 i386 armhf | 78 | Architecture: any |
151 | 77 | Multi-Arch: same | 79 | Multi-Arch: same |
152 | 78 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 80 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
153 | 79 | Depends: ${misc:Depends}, ${shlibs:Depends} | 81 | Depends: ${misc:Depends}, ${shlibs:Depends} |
154 | @@ -84,10 +86,10 @@ | |||
155 | 84 | The FolderListModel provides a model of the contents of a file system folder. | 86 | The FolderListModel provides a model of the contents of a file system folder. |
156 | 85 | 87 | ||
157 | 86 | Package: qtdeclarative5-localstorage-plugin | 88 | Package: qtdeclarative5-localstorage-plugin |
159 | 87 | Architecture: amd64 i386 armhf | 89 | Architecture: any |
160 | 88 | Multi-Arch: same | 90 | Multi-Arch: same |
161 | 89 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 91 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
163 | 90 | Depends: ${misc:Depends}, ${shlibs:Depends} | 92 | Depends: ${misc:Depends}, ${shlibs:Depends}, libqt5sql5-sqlite |
164 | 91 | Description: Qt 5 localstorage QML plugin | 93 | Description: Qt 5 localstorage QML plugin |
165 | 92 | Qt is a cross-platform C++ application framework. Qt's primary feature | 94 | Qt is a cross-platform C++ application framework. Qt's primary feature |
166 | 93 | is its rich set of widgets that provide standard GUI functionality. | 95 | is its rich set of widgets that provide standard GUI functionality. |
167 | @@ -95,7 +97,7 @@ | |||
168 | 95 | This is a singleton type for reading and writing to SQLite databases. | 97 | This is a singleton type for reading and writing to SQLite databases. |
169 | 96 | 98 | ||
170 | 97 | Package: qtdeclarative5-particles-plugin | 99 | Package: qtdeclarative5-particles-plugin |
172 | 98 | Architecture: amd64 i386 armhf | 100 | Architecture: any |
173 | 99 | Multi-Arch: same | 101 | Multi-Arch: same |
174 | 100 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 102 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
175 | 101 | Depends: ${misc:Depends}, ${shlibs:Depends} | 103 | Depends: ${misc:Depends}, ${shlibs:Depends} |
176 | @@ -106,7 +108,7 @@ | |||
177 | 106 | This QML module contains a particle system for Qt Quick. | 108 | This QML module contains a particle system for Qt Quick. |
178 | 107 | 109 | ||
179 | 108 | Package: qtdeclarative5-qtquick2-plugin | 110 | Package: qtdeclarative5-qtquick2-plugin |
181 | 109 | Architecture: amd64 i386 armhf | 111 | Architecture: any |
182 | 110 | Multi-Arch: same | 112 | Multi-Arch: same |
183 | 111 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 113 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
184 | 112 | Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends} | 114 | Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends} |
185 | @@ -117,7 +119,7 @@ | |||
186 | 117 | This package contains the Qt Quick 2 QML plugin for Qt declarative. | 119 | This package contains the Qt Quick 2 QML plugin for Qt declarative. |
187 | 118 | 120 | ||
188 | 119 | Package: qtdeclarative5-test-plugin | 121 | Package: qtdeclarative5-test-plugin |
190 | 120 | Architecture: amd64 i386 armhf | 122 | Architecture: any |
191 | 121 | Multi-Arch: same | 123 | Multi-Arch: same |
192 | 122 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 124 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
193 | 123 | Depends: ${misc:Depends}, ${shlibs:Depends} | 125 | Depends: ${misc:Depends}, ${shlibs:Depends} |
194 | @@ -128,7 +130,7 @@ | |||
195 | 128 | This package contains the test QML plugin for Qt declarative. | 130 | This package contains the test QML plugin for Qt declarative. |
196 | 129 | 131 | ||
197 | 130 | Package: qtdeclarative5-window-plugin | 132 | Package: qtdeclarative5-window-plugin |
199 | 131 | Architecture: amd64 i386 armhf | 133 | Architecture: any |
200 | 132 | Multi-Arch: same | 134 | Multi-Arch: same |
201 | 133 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 135 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
202 | 134 | Depends: ${misc:Depends}, ${shlibs:Depends} | 136 | Depends: ${misc:Depends}, ${shlibs:Depends} |
203 | @@ -140,7 +142,7 @@ | |||
204 | 140 | accessing screen information. | 142 | accessing screen information. |
205 | 141 | 143 | ||
206 | 142 | Package: qtdeclarative5-xmllistmodel-plugin | 144 | Package: qtdeclarative5-xmllistmodel-plugin |
208 | 143 | Architecture: amd64 i386 armhf | 145 | Architecture: any |
209 | 144 | Multi-Arch: same | 146 | Multi-Arch: same |
210 | 145 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 147 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
211 | 146 | Depends: ${misc:Depends}, ${shlibs:Depends} | 148 | Depends: ${misc:Depends}, ${shlibs:Depends} |
212 | @@ -152,7 +154,7 @@ | |||
213 | 152 | 154 | ||
214 | 153 | Package: qtdeclarative5-dev | 155 | Package: qtdeclarative5-dev |
215 | 154 | Section: libdevel | 156 | Section: libdevel |
217 | 155 | Architecture: amd64 i386 armhf | 157 | Architecture: any |
218 | 156 | Pre-Depends: dpkg (>= 1.15.6~) | 158 | Pre-Depends: dpkg (>= 1.15.6~) |
219 | 157 | Depends: libqt5qml5 (= ${binary:Version}), | 159 | Depends: libqt5qml5 (= ${binary:Version}), |
220 | 158 | libqt5quick5 (= ${binary:Version}), | 160 | libqt5quick5 (= ${binary:Version}), |
221 | @@ -168,12 +170,11 @@ | |||
222 | 168 | Qt 5 applications using Qt 5 declarative headers. | 170 | Qt 5 applications using Qt 5 declarative headers. |
223 | 169 | 171 | ||
224 | 170 | Package: qtdeclarative5-private-dev | 172 | Package: qtdeclarative5-private-dev |
226 | 171 | Architecture: amd64 i386 armhf | 173 | Architecture: any |
227 | 172 | Section: libdevel | 174 | Section: libdevel |
228 | 173 | Pre-Depends: dpkg (>= 1.15.6~) | 175 | Pre-Depends: dpkg (>= 1.15.6~) |
229 | 174 | Depends: qtdeclarative5-dev (= ${binary:Version}), | 176 | Depends: qtdeclarative5-dev (= ${binary:Version}), |
230 | 175 | ${misc:Depends}, | 177 | ${misc:Depends}, |
231 | 176 | ${shlibs:Depends} | ||
232 | 177 | Description: Qt 5 declarative private development files | 178 | Description: Qt 5 declarative private development files |
233 | 178 | Qt is a cross-platform C++ application framework. Qt's primary feature | 179 | Qt is a cross-platform C++ application framework. Qt's primary feature |
234 | 179 | is its rich set of widgets that provide standard GUI functionality. | 180 | is its rich set of widgets that provide standard GUI functionality. |
235 | @@ -184,12 +185,11 @@ | |||
236 | 184 | Use at your own risk. | 185 | Use at your own risk. |
237 | 185 | 186 | ||
238 | 186 | Package: qtdeclarative5-dev-tools | 187 | Package: qtdeclarative5-dev-tools |
240 | 187 | Architecture: amd64 i386 armhf | 188 | Architecture: any |
241 | 188 | Multi-Arch: foreign | 189 | Multi-Arch: foreign |
242 | 189 | Section: devel | 190 | Section: devel |
246 | 190 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 191 | Pre-Depends: dpkg (>= 1.15.6~) |
247 | 191 | Depends: ${misc:Depends}, ${shlibs:Depends} | 192 | Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends} |
245 | 192 | Recommends: qtchooser | ||
248 | 193 | Description: Qt 5 declarative development programs | 193 | Description: Qt 5 declarative development programs |
249 | 194 | Qt is a cross-platform C++ application framework. Qt's primary feature | 194 | Qt is a cross-platform C++ application framework. Qt's primary feature |
250 | 195 | is its rich set of widgets that provide standard GUI functionality. | 195 | is its rich set of widgets that provide standard GUI functionality. |
251 | @@ -198,12 +198,11 @@ | |||
252 | 198 | declarative applications. | 198 | declarative applications. |
253 | 199 | 199 | ||
254 | 200 | Package: qmlscene | 200 | Package: qmlscene |
256 | 201 | Architecture: amd64 i386 armhf | 201 | Architecture: any |
257 | 202 | Multi-Arch: foreign | 202 | Multi-Arch: foreign |
258 | 203 | Section: devel | 203 | Section: devel |
262 | 204 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 204 | Pre-Depends: dpkg (>= 1.15.6~) |
263 | 205 | Depends: ${misc:Depends}, ${shlibs:Depends} | 205 | Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends} |
261 | 206 | Recommends: qtchooser | ||
264 | 207 | Description: Qt 5 QML scene viewer | 206 | Description: Qt 5 QML scene viewer |
265 | 208 | Qt is a cross-platform C++ application framework. Qt's primary feature | 207 | Qt is a cross-platform C++ application framework. Qt's primary feature |
266 | 209 | is its rich set of widgets that provide standard GUI functionality. | 208 | is its rich set of widgets that provide standard GUI functionality. |
267 | @@ -211,7 +210,7 @@ | |||
268 | 211 | This package contains the QML viewer for Qt Quick 2. | 210 | This package contains the QML viewer for Qt Quick 2. |
269 | 212 | 211 | ||
270 | 213 | Package: qtdeclarative5-examples | 212 | Package: qtdeclarative5-examples |
272 | 214 | Architecture: amd64 i386 armhf | 213 | Architecture: any |
273 | 215 | Multi-Arch: same | 214 | Multi-Arch: same |
274 | 216 | Section: x11 | 215 | Section: x11 |
275 | 217 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} | 216 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
276 | @@ -224,7 +223,8 @@ | |||
277 | 224 | 223 | ||
278 | 225 | Package: qtdeclarative5-dbg | 224 | Package: qtdeclarative5-dbg |
279 | 226 | Priority: extra | 225 | Priority: extra |
281 | 227 | Architecture: amd64 i386 armhf | 226 | Architecture: any |
282 | 227 | Multi-Arch: same | ||
283 | 228 | Section: debug | 228 | Section: debug |
284 | 229 | Pre-Depends: dpkg (>= 1.15.6~) | 229 | Pre-Depends: dpkg (>= 1.15.6~) |
285 | 230 | Depends: libqt5qml5 (= ${binary:Version}), | 230 | Depends: libqt5qml5 (= ${binary:Version}), |
286 | @@ -239,3 +239,26 @@ | |||
287 | 239 | is its rich set of widgets that provide standard GUI functionality. | 239 | is its rich set of widgets that provide standard GUI functionality. |
288 | 240 | . | 240 | . |
289 | 241 | This package contains the debugging symbols for the Qt 5 declarative libraries. | 241 | This package contains the debugging symbols for the Qt 5 declarative libraries. |
290 | 242 | |||
291 | 243 | Package: qtdeclarative5-doc | ||
292 | 244 | Priority: extra | ||
293 | 245 | Architecture: all | ||
294 | 246 | Section: doc | ||
295 | 247 | Depends: ${misc:Depends} | ||
296 | 248 | Description: Qt 5 declarative documentation | ||
297 | 249 | Qt is a cross-platform C++ application framework. Qt's primary feature | ||
298 | 250 | is its rich set of widgets that provide standard GUI functionality. | ||
299 | 251 | . | ||
300 | 252 | This package contains the documentation for the Qt 5 declarative libraries. | ||
301 | 253 | |||
302 | 254 | Package: qtdeclarative5-doc-html | ||
303 | 255 | Priority: extra | ||
304 | 256 | Architecture: all | ||
305 | 257 | Section: doc | ||
306 | 258 | Depends: ${misc:Depends} | ||
307 | 259 | Description: Qt 5 declarative HTML documentation | ||
308 | 260 | Qt is a cross-platform C++ application framework. Qt's primary feature | ||
309 | 261 | is its rich set of widgets that provide standard GUI functionality. | ||
310 | 262 | . | ||
311 | 263 | This package contains the HTML documentation for the Qt 5 declarative | ||
312 | 264 | libraries. | ||
313 | 242 | 265 | ||
314 | === modified file 'debian/copyright' | |||
315 | --- debian/copyright 2013-04-29 16:27:13 +0000 | |||
316 | +++ debian/copyright 2013-06-28 14:52:14 +0000 | |||
317 | @@ -17,8 +17,48 @@ | |||
318 | 17 | 2012-2013 Timo Jyrinki <timo.jyrinki@canonical.com> | 17 | 2012-2013 Timo Jyrinki <timo.jyrinki@canonical.com> |
319 | 18 | License: LGPL-2.1 | 18 | License: LGPL-2.1 |
320 | 19 | 19 | ||
323 | 20 | Files: examples/* src/qml/doc/snippets/* src/quick/doc/snippets/* tests/auto/qmltest/listview/tst_listview.qml tests/auto/qmltest/listview/tst_listview.qml tests/auto/qmltest/image/tst_image.qml tests/auto/qmltest/image/tst_image.qml tests/auto/qmltest/text/tst_text.qml tests/auto/qmltest/text/tst_text.qml tests/auto/qmltest/animatedimage/tst_animatedimage.qml tests/auto/qmltest/animatedimage/tst_animatedimage.qml tests/auto/qmltest/gradient/tst_gradient.qml tests/auto/qmltest/gradient/tst_gradient.qml tests/auto/qmltest/textinput/tst_textinput.qml tests/auto/qmltest/textinput/tst_textinput.qml tests/auto/qmltest/rectangle/tst_rectangle.qml tests/auto/qmltest/rectangle/tst_rectangle.qml tests/auto/qmltest/textedit/tst_textedit.qml tests/auto/qmltest/textedit/tst_textedit.qml tests/auto/qmltest/listmodel/tst_listmodel.qml tests/auto/qmltest/listmodel/tst_listmodel.qml tests/auto/qmltest/fontloader/tst_fontloader.qml tests/auto/qmltest/fontloader/tst_fontloader.qml tests/benchmarks/qml/holistic/data/ | 20 | Files: examples/* |
324 | 21 | largeTargets/gridview-example.qml tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml tests/testapplications/listview/sections.qml tests/testapplications/listview/sections.qml tests/testapplications/listview/onRemove.qml tests/testapplications/listview/onRemove.qml tests/testapplications/listview/alteredViews.qml tests/testapplications/listview/alteredViews.qml tests/testapplications/listview/viewTransitions.qml tests/testapplications/listview/viewTransitions.qml tests/testapplications/animatedsprite/animatedsprite.qml tests/testapplications/animatedsprite/animatedsprite.qml tests/testapplications/animatedsprite/animatedspriteadvance.qml tests/testapplications/animatedsprite/animatedspriteadvance.qml | 21 | src/qml/doc/snippets/* |
325 | 22 | src/quick/doc/snippets/* | ||
326 | 23 | tests/auto/qmltest/listview/tst_listview.qml | ||
327 | 24 | tests/auto/qmltest/listview/tst_listview.qml | ||
328 | 25 | tests/auto/qmltest/image/tst_image.qml | ||
329 | 26 | tests/auto/qmltest/image/tst_image.qml | ||
330 | 27 | tests/auto/qmltest/text/tst_text.qml | ||
331 | 28 | tests/auto/qmltest/text/tst_text.qml | ||
332 | 29 | tests/auto/qmltest/animatedimage/tst_animatedimage.qml | ||
333 | 30 | tests/auto/qmltest/animatedimage/tst_animatedimage.qml | ||
334 | 31 | tests/auto/qmltest/gradient/tst_gradient.qml | ||
335 | 32 | tests/auto/qmltest/gradient/tst_gradient.qml | ||
336 | 33 | tests/auto/qmltest/textinput/tst_textinput.qml | ||
337 | 34 | tests/auto/qmltest/textinput/tst_textinput.qml | ||
338 | 35 | tests/auto/qmltest/rectangle/tst_rectangle.qml | ||
339 | 36 | tests/auto/qmltest/rectangle/tst_rectangle.qml | ||
340 | 37 | tests/auto/qmltest/textedit/tst_textedit.qml | ||
341 | 38 | tests/auto/qmltest/textedit/tst_textedit.qml | ||
342 | 39 | tests/auto/qmltest/listmodel/tst_listmodel.qml | ||
343 | 40 | tests/auto/qmltest/listmodel/tst_listmodel.qml | ||
344 | 41 | tests/auto/qmltest/fontloader/tst_fontloader.qml | ||
345 | 42 | tests/auto/qmltest/fontloader/tst_fontloader.qml | ||
346 | 43 | tests/benchmarks/qml/holistic/data/ | ||
347 | 44 | largeTargets/gridview-example.qml | ||
348 | 45 | tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml | ||
349 | 46 | tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml | ||
350 | 47 | tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml | ||
351 | 48 | tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml | ||
352 | 49 | tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml | ||
353 | 50 | tests/testapplications/listview/sections.qml | ||
354 | 51 | tests/testapplications/listview/sections.qml | ||
355 | 52 | tests/testapplications/listview/onRemove.qml | ||
356 | 53 | tests/testapplications/listview/onRemove.qml | ||
357 | 54 | tests/testapplications/listview/alteredViews.qml | ||
358 | 55 | tests/testapplications/listview/alteredViews.qml | ||
359 | 56 | tests/testapplications/listview/viewTransitions.qml | ||
360 | 57 | tests/testapplications/listview/viewTransitions.qml | ||
361 | 58 | tests/testapplications/animatedsprite/animatedsprite.qml | ||
362 | 59 | tests/testapplications/animatedsprite/animatedsprite.qml | ||
363 | 60 | tests/testapplications/animatedsprite/animatedspriteadvance.qml | ||
364 | 61 | tests/testapplications/animatedsprite/animatedspriteadvance.qml | ||
365 | 22 | Copyright: 2012 Digia Plc and/or its subsidiary(-ies) | 62 | Copyright: 2012 Digia Plc and/or its subsidiary(-ies) |
366 | 23 | License: BSD-3-clause | 63 | License: BSD-3-clause |
367 | 24 | 64 | ||
368 | 25 | 65 | ||
369 | === added file 'debian/qtdeclarative5-doc-html.install' | |||
370 | --- debian/qtdeclarative5-doc-html.install 1970-01-01 00:00:00 +0000 | |||
371 | +++ debian/qtdeclarative5-doc-html.install 2013-06-28 14:52:14 +0000 | |||
372 | @@ -0,0 +1,2 @@ | |||
373 | 1 | usr/share/qt5/doc/qtqml/ | ||
374 | 2 | usr/share/qt5/doc/qtquick/ | ||
375 | 0 | 3 | ||
376 | === added file 'debian/qtdeclarative5-doc.install' | |||
377 | --- debian/qtdeclarative5-doc.install 1970-01-01 00:00:00 +0000 | |||
378 | +++ debian/qtdeclarative5-doc.install 2013-06-28 14:52:14 +0000 | |||
379 | @@ -0,0 +1,2 @@ | |||
380 | 1 | usr/share/qt5/doc/qtquick.qch | ||
381 | 2 | usr/share/qt5/doc/qtqml.qch | ||
382 | 0 | 3 | ||
383 | === modified file 'debian/rules' | |||
384 | --- debian/rules 2013-04-29 16:27:13 +0000 | |||
385 | +++ debian/rules 2013-06-28 14:52:14 +0000 | |||
386 | @@ -14,25 +14,31 @@ | |||
387 | 14 | override_dh_auto_configure: | 14 | override_dh_auto_configure: |
388 | 15 | qmake | 15 | qmake |
389 | 16 | 16 | ||
391 | 17 | override_dh_auto_install: | 17 | override_dh_auto_build-indep: |
392 | 18 | dh_auto_build -Smakefile -- docs | ||
393 | 19 | |||
394 | 20 | override_dh_auto_install-arch: | ||
395 | 18 | dh_auto_install | 21 | dh_auto_install |
396 | 19 | 22 | ||
397 | 20 | # Fix wrong path in pkgconfig files | 23 | # Fix wrong path in pkgconfig files |
399 | 21 | find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \ | 24 | find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \ |
400 | 22 | -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \; | 25 | -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \; |
401 | 23 | 26 | ||
402 | 27 | # Remove libtool-like files | ||
403 | 28 | rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la | ||
404 | 29 | |||
405 | 24 | # Fix wrong permissions in examples. | 30 | # Fix wrong permissions in examples. |
407 | 25 | find $(CURDIR)/debian/tmp/usr/lib/*/qt5/examples/ -type f \( \ | 31 | find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ -type f \( \ |
408 | 26 | -name '*.png' \ | 32 | -name '*.png' \ |
409 | 27 | -o -name '*.php' \ | 33 | -o -name '*.php' \ |
410 | 28 | -o -name '*.xsl' \ | 34 | -o -name '*.xsl' \ |
411 | 29 | -o -name '*.xml' \ | 35 | -o -name '*.xml' \ |
412 | 30 | -o -name '*.js' \ | 36 | -o -name '*.js' \ |
413 | 31 | -o -name '*.jpg' \ | 37 | -o -name '*.jpg' \ |
415 | 32 | \) -print0 | xargs -0 chmod 644 | 38 | \) -print0 | xargs -0 chmod a-x |
416 | 33 | 39 | ||
419 | 34 | # Remove libtool-like files | 40 | override_dh_auto_install-indep: |
420 | 35 | rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la | 41 | make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs |
421 | 36 | 42 | ||
422 | 37 | override_dh_install: | 43 | override_dh_install: |
423 | 38 | dh_install --fail-missing | 44 | dh_install --fail-missing |
Looks good, the documentation packages will be very welcome.