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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-02 08:57:23 +0000
3+++ debian/changelog 2013-02-02 14:50:30 +0000
4@@ -1,4 +1,4 @@
5-indicator-china-weather (0.1.0-1) raring; urgency=low
6+indicator-china-weather (1.0.0-0ubuntu1) raring; urgency=low
7
8 * Initial release.
9
10
11=== modified file 'debian/compat'
12--- debian/compat 2013-02-02 08:57:23 +0000
13+++ debian/compat 2013-02-02 14:50:30 +0000
14@@ -1,1 +1,1 @@
15-8
16+9
17
18=== modified file 'debian/control'
19--- debian/control 2013-02-02 08:57:23 +0000
20+++ debian/control 2013-02-02 14:50:30 +0000
21@@ -7,10 +7,10 @@
22 python (>= 2.6.6-3~)
23 X-Python-Version: >= 2.6
24 Standards-Version: 3.9.3
25-Homepage: https://launchpad.net/chinese-indicator-weather
26+Homepage: https://launchpad.net/indicator-china-weather
27
28 Package: indicator-china-weather
29-Architecture: all
30+Architecture: any
31 Depends: ${shlibs:Depends},${misc:Depends}
32 Recommends: python-apport
33 Description: An indicator that displays China weather informationfrom
34
35=== modified file 'debian/copyright'
36--- debian/copyright 2013-02-02 08:57:23 +0000
37+++ debian/copyright 2013-02-02 14:50:30 +0000
38@@ -1,7 +1,7 @@
39-Format: http://dep.debian.net/deps/dep5
40-Upstream-Name: chinese-indicator-weather
41+Format: http://dep.debian.net/deps/dep5/
42+Upstream-Name: indicator-china-weather
43 Upstream-Contact: Ubuntu Kylin Team <ubuntukylin-members@lists.launchpad.net>
44-Source: https://launchpad.net/chinese-indicator-weather
45+Source: https://launchpad.net/indicator-china-weather
46
47 Files: *
48 Copyright: 2010, Mehdi Rejraji <mehd36@gmail.com>
49
50=== modified file 'src/weather.conf'
51--- src/weather.conf 2013-02-02 08:57:23 +0000
52+++ src/weather.conf 2013-02-02 14:50:30 +0000
53@@ -1,3 +1,3 @@
54 city_id =
55 update_time = 10
56-show_temperature = 1
57+show_temperature = 0
58\ No newline at end of file

Subscribers

People subscribed via source and target branches