Merge lp:~whzhang-kylin/indicator-china-weather/indicator-china-weather into lp:indicator-china-weather

Proposed by weihua zhang
Status: Merged
Merged at revision: 4
Proposed branch: lp:~whzhang-kylin/indicator-china-weather/indicator-china-weather
Merge into: lp:indicator-china-weather
Diff against target: 58 lines (+8/-8)
5 files modified
debian/changelog (+1/-1)
debian/compat (+1/-1)
debian/control (+2/-2)
debian/copyright (+3/-3)
src/weather.conf (+1/-1)
To merge this branch: bzr merge lp:~whzhang-kylin/indicator-china-weather/indicator-china-weather
Reviewer Review Type Date Requested Status
weihua zhang Approve
Review via email: mp+146267@code.launchpad.net

Description of the change

correct name of project/package in debian/control, change compat from 8 to 9

To post a comment you must log in.
Revision history for this message
weihua zhang (whzhang-kylin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-02-02 08:57:23 +0000
+++ debian/changelog 2013-02-02 14:50:30 +0000
@@ -1,4 +1,4 @@
1indicator-china-weather (0.1.0-1) raring; urgency=low1indicator-china-weather (1.0.0-0ubuntu1) raring; urgency=low
22
3 * Initial release.3 * Initial release.
44
55
=== modified file 'debian/compat'
--- debian/compat 2013-02-02 08:57:23 +0000
+++ debian/compat 2013-02-02 14:50:30 +0000
@@ -1,1 +1,1 @@
1819
22
=== modified file 'debian/control'
--- debian/control 2013-02-02 08:57:23 +0000
+++ debian/control 2013-02-02 14:50:30 +0000
@@ -7,10 +7,10 @@
7 python (>= 2.6.6-3~)7 python (>= 2.6.6-3~)
8X-Python-Version: >= 2.68X-Python-Version: >= 2.6
9Standards-Version: 3.9.39Standards-Version: 3.9.3
10Homepage: https://launchpad.net/chinese-indicator-weather10Homepage: https://launchpad.net/indicator-china-weather
1111
12Package: indicator-china-weather12Package: indicator-china-weather
13Architecture: all13Architecture: any
14Depends: ${shlibs:Depends},${misc:Depends}14Depends: ${shlibs:Depends},${misc:Depends}
15Recommends: python-apport15Recommends: python-apport
16Description: An indicator that displays China weather informationfrom16Description: An indicator that displays China weather informationfrom
1717
=== modified file 'debian/copyright'
--- debian/copyright 2013-02-02 08:57:23 +0000
+++ debian/copyright 2013-02-02 14:50:30 +0000
@@ -1,7 +1,7 @@
1Format: http://dep.debian.net/deps/dep51Format: http://dep.debian.net/deps/dep5/
2Upstream-Name: chinese-indicator-weather2Upstream-Name: indicator-china-weather
3Upstream-Contact: Ubuntu Kylin Team <ubuntukylin-members@lists.launchpad.net>3Upstream-Contact: Ubuntu Kylin Team <ubuntukylin-members@lists.launchpad.net>
4Source: https://launchpad.net/chinese-indicator-weather4Source: https://launchpad.net/indicator-china-weather
55
6Files: *6Files: *
7Copyright: 2010, Mehdi Rejraji <mehd36@gmail.com>7Copyright: 2010, Mehdi Rejraji <mehd36@gmail.com>
88
=== modified file 'src/weather.conf'
--- src/weather.conf 2013-02-02 08:57:23 +0000
+++ src/weather.conf 2013-02-02 14:50:30 +0000
@@ -1,3 +1,3 @@
1city_id = 1city_id =
2update_time = 102update_time = 10
3show_temperature = 13show_temperature = 0
4\ No newline at end of file4\ No newline at end of file

Subscribers

People subscribed via source and target branches