Merge lp:~robru/youker-assistant/packaging into lp:youker-assistant

Proposed by Robert Bruce Park
Status: Merged
Merged at revision: 91
Proposed branch: lp:~robru/youker-assistant/packaging
Merge into: lp:youker-assistant
Diff against target: 65 lines (+15/-11)
4 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/compat (+1/-1)
debian/control (+11/-9)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~robru/youker-assistant/packaging
Reviewer Review Type Date Requested Status
Jack Yu Approve
Review via email: mp+180937@code.launchpad.net

Description of the change

Saw your request for packaging review in email, so here are some minor fixes for you. It was mostly good already.

To post a comment you must log in.
Revision history for this message
Jack Yu (jackyu) wrote :

seems better, thanks:).

review: Approve
Revision history for this message
Robert Bruce Park (robru) wrote :

Oh, you didn't merge this properly... you have to use bzr tool to merge the branch in.

If you look at trunk, this hasn't actually been merged at all.

Revision history for this message
Jack Yu (jackyu) wrote :

I manually merged this into trunk at revision 87.

Revision history for this message
Jack Yu (jackyu) wrote :

Redone using bzr merge:).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2013-08-19 20:08:47 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'debian/compat'
10--- debian/compat 2013-07-02 01:17:47 +0000
11+++ debian/compat 2013-08-19 20:08:47 +0000
12@@ -1,1 +1,1 @@
13-8
14+9
15
16=== modified file 'debian/control'
17--- debian/control 2013-08-19 16:29:56 +0000
18+++ debian/control 2013-08-19 20:08:47 +0000
19@@ -1,25 +1,27 @@
20 Source: youker-assistant
21-Section: gnome
22+Section: misc
23 Priority: optional
24 Maintainer: UbuntuKylin Team <ubuntukylin-members@list.launchpad.net>
25 Build-Depends: debhelper (>= 9),
26 dh-translations,
27+ libphonon-dev,
28+ libqt4-dev,
29 pkg-config,
30+ python (>= 2.6.6-3~),
31+ qt4-default,
32 qtchooser,
33- libqt4-dev,
34- qt4-default,
35- libphonon-dev,
36- python (>= 2.6.6-3~),
37 Standards-Version: 3.9.4
38 Homepage: https://launchpad.net/youker-assistant
39+Vcs-Bzr: https://code.launchpad.net/~ubuntukylin-members/youker-assistant/trunk
40
41 Package: youker-assistant
42 Architecture: any
43-Depends: ${shlibs:Depends},
44- ${misc:Depends},
45- libphonon-dev,
46+Multi-Arch: same
47+Depends: libphonon-dev,
48 python,
49 python-dbus,
50 python-support (>= 0.90),
51+ ${misc:Depends},
52+ ${shlibs:Depends},
53 Description: It is a system assistant tool.
54- aimed at helping all users to manage their linux system conveniently.
55+ Helps all users manage their linux system conveniently.
56
57=== modified file 'debian/rules'
58--- debian/rules 2013-07-02 01:17:47 +0000
59+++ debian/rules 2013-08-19 20:08:47 +0000
60@@ -10,4 +10,4 @@
61 youker-assistant.pro
62
63 %:
64- dh $@ --with translations
65+ dh $@ --with translations --fail-missing

Subscribers

People subscribed via source and target branches