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

Proposed by Daniel Holbach
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 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
=== modified file 'debian/control'
--- debian/control 2014-10-01 09:45:07 +0000
+++ debian/control 2014-12-09 17:45:27 +0000
@@ -11,27 +11,28 @@
11 qtbase5-dev-tools,11 qtbase5-dev-tools,
12 qtdeclarative5-dev,12 qtdeclarative5-dev,
13 qtdeclarative5-dev-tools,13 qtdeclarative5-dev-tools,
14 qtdeclarative5-ubuntu-ui-toolkit-plugin,14 qtdeclarative5-ubuntu-ui-toolkit-plugin
15Standards-Version: 3.9.515Standards-Version: 3.9.6
16Section: misc16Section: misc
17Homepage: https://launchpad.net/ubuntu-weather-app17Homepage: https://launchpad.net/ubuntu-weather-app
18Vcs-Bzr: https://code.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk18Vcs-Bzr: https://code.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk
1919
20Package: ubuntu-weather-app20Package: ubuntu-weather-app
21Architecture: all21Architecture: any
22Depends: qmlscene,22Depends: qmlscene,
23 qtdeclarative5-localstorage-plugin,23 qtdeclarative5-localstorage-plugin,
24 qtdeclarative5-qtquick2-plugin,24 qtdeclarative5-qtquick2-plugin,
25 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,25 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
26 qtdeclarative5-ubuntuweather-timezone-plugin1.0 (>= ${source:Version}),
26 suru-icon-theme | ubuntu-mobile-icons,27 suru-icon-theme | ubuntu-mobile-icons,
27 qtdeclarative5-ubuntuweather-timezone-plugin1.0 (>= ${source:Version}),28 ${misc:Depends},
28 ${misc:Depends}29 ${shlibs:Depends}
29Description: Weather application30Description: Weather application
30 Core Weather application31 Core Weather application
3132
32Package: qtdeclarative5-ubuntuweather-timezone-plugin1.033Package: qtdeclarative5-ubuntuweather-timezone-plugin1.0
33Architecture: any34Architecture: any
34Depends: ${shlibs:Depends}, ${misc:Depends}35Depends: ${misc:Depends}, ${shlibs:Depends}
35Description: Timezone plugin, used by the Ubuntu Weather app36Description: Timezone plugin, used by the Ubuntu Weather app
36 This package contains the timezone plugin written for the Ubuntu37 This package contains the timezone plugin written for the Ubuntu
37 Weather app.38 Weather app.
3839
=== modified file 'debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install'
--- debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install 2014-12-09 15:32:39 +0000
+++ debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install 2014-12-09 17:45:27 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/1usr/lib/*/TimeZone/*

Subscribers

People subscribed via source and target branches