Merge lp:~dholbach/ubuntu-weather-app/packaging-fixes into lp:~flscogna/ubuntu-weather-app/reorganization-and-native-launcher

Proposed by Daniel Holbach on 2014-12-09
Status: Merged
Merged at revision: 391
Proposed branch: lp:~dholbach/ubuntu-weather-app/packaging-fixes
Merge into: lp:~flscogna/ubuntu-weather-app/reorganization-and-native-launcher
Diff against target: 45 lines (+8/-7)
2 files modified
debian/control (+7/-6)
debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install (+1/-1)
To merge this branch: bzr merge lp:~dholbach/ubuntu-weather-app/packaging-fixes
Reviewer Review Type Date Requested Status
Filippo Scognamiglio 2014-12-09 Pending
Review via email: mp+244189@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-10-01 09:45:07 +0000
3+++ debian/control 2014-12-09 17:45:27 +0000
4@@ -11,27 +11,28 @@
5 qtbase5-dev-tools,
6 qtdeclarative5-dev,
7 qtdeclarative5-dev-tools,
8- qtdeclarative5-ubuntu-ui-toolkit-plugin,
9-Standards-Version: 3.9.5
10+ qtdeclarative5-ubuntu-ui-toolkit-plugin
11+Standards-Version: 3.9.6
12 Section: misc
13 Homepage: https://launchpad.net/ubuntu-weather-app
14 Vcs-Bzr: https://code.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk
15
16 Package: ubuntu-weather-app
17-Architecture: all
18+Architecture: any
19 Depends: qmlscene,
20 qtdeclarative5-localstorage-plugin,
21 qtdeclarative5-qtquick2-plugin,
22 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
23+ qtdeclarative5-ubuntuweather-timezone-plugin1.0 (>= ${source:Version}),
24 suru-icon-theme | ubuntu-mobile-icons,
25- qtdeclarative5-ubuntuweather-timezone-plugin1.0 (>= ${source:Version}),
26- ${misc:Depends}
27+ ${misc:Depends},
28+ ${shlibs:Depends}
29 Description: Weather application
30 Core Weather application
31
32 Package: qtdeclarative5-ubuntuweather-timezone-plugin1.0
33 Architecture: any
34-Depends: ${shlibs:Depends}, ${misc:Depends}
35+Depends: ${misc:Depends}, ${shlibs:Depends}
36 Description: Timezone plugin, used by the Ubuntu Weather app
37 This package contains the timezone plugin written for the Ubuntu
38 Weather app.
39
40=== modified file 'debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install'
41--- debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install 2014-12-09 15:32:39 +0000
42+++ debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install 2014-12-09 17:45:27 +0000
43@@ -1,1 +1,1 @@
44-usr/lib/*/
45+usr/lib/*/TimeZone/*

Subscribers

People subscribed via source and target branches