Merge lp:~jbicha/libappindicator/misc-debian-control-fixes into lp:libappindicator/13.10

Proposed by Jeremy Bícha
Status: Merged
Approved by: Francis Ginther
Approved revision: 266
Merged at revision: 266
Proposed branch: lp:~jbicha/libappindicator/misc-debian-control-fixes
Merge into: lp:libappindicator/13.10
Diff against target: 68 lines (+7/-8)
1 file modified
debian/control (+7/-8)
To merge this branch: bzr merge lp:~jbicha/libappindicator/misc-debian-control-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mathieu Trudel-Lapierre Approve
Review via email: mp+180032@code.launchpad.net

Commit message

- Build using default vala
- Build-depend on at-spi2-core to avoid test failure
- Build-depend on libxml2-utils
- Don't explicitly build-depend on gir packages, gnome-doc-utils, or quilt
- Have -dev packages depend on their gir- packages

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

Odd failure. Kicking Jenkins to try it again.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Identical failure. alesage, could you take a look at what Jenkins is doing here?

Revision history for this message
Jeremy Bícha (jbicha) wrote :

ping

Revision history for this message
Ted Gould (ted) wrote :

Let's try again.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Added cli-common-dev to armhf builders, re-approving.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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 2013-03-11 12:59:43 +0000
3+++ debian/control 2013-08-14 03:23:02 +0000
4@@ -5,17 +5,17 @@
5 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
6 Build-Depends: debhelper (>= 9),
7 dh-autoreconf,
8- quilt,
9 python-all-dev,
10+ at-spi2-core,
11 cli-common-dev (>= 0.5.7),
12 gobject-introspection,
13 intltool,
14- gnome-doc-utils,
15 gtk-doc-tools,
16+ libxml2-utils,
17 libnunit-cil-dev,
18 dbus-test-runner,
19 xvfb,
20- valac-0.16,
21+ valac,
22 mono-devel (>= 2.4.3),
23 libglib2.0-dev (>= 2.35.4),
24 libgtk-3-dev (>= 2.91.3),
25@@ -30,9 +30,6 @@
26 libdbusmenu-gtk-dev (>= 0.5.90),
27 libdbusmenu-gtk3-dev (>= 0.5.90),
28 libgirepository1.0-dev,
29- gir1.2-glib-2.0,
30- gir1.2-gtk-2.0,
31- gir1.2-gtk-3.0,
32 Standards-Version: 3.9.1
33 Homepage: https://launchpad.net/libappindicator
34 # If you aren't a member of ~indicator-applet-developers but need to upload
35@@ -69,7 +66,7 @@
36 This package contains shared libraries to be used by applications.
37
38 Package: gir1.2-appindicator-0.1
39-Section: libs
40+Section: introspection
41 Architecture: any
42 Depends: ${misc:Depends},
43 ${gir:Depends},
44@@ -83,6 +80,7 @@
45 Architecture: any
46 Depends: ${shlibs:Depends},
47 ${misc:Depends},
48+ gir1.2-appindicator-0.1 (= ${binary:Version}),
49 libdbusmenu-glib-dev (>= 0.1.8),
50 libdbus-glib-1-dev (>= 0.76),
51 libappindicator1 (= ${binary:Version}),
52@@ -120,6 +118,7 @@
53 Architecture: any
54 Depends: ${shlibs:Depends},
55 ${misc:Depends},
56+ gir1.2-appindicator3-0.1 (= ${binary:Version}),
57 libdbusmenu-glib-dev (>= 0.1.8),
58 libdbus-glib-1-dev (>= 0.76),
59 libappindicator3-1 (= ${binary:Version}),
60@@ -130,7 +129,7 @@
61 This package contains files that are needed to build applications.
62
63 Package: gir1.2-appindicator3-0.1
64-Section: libs
65+Section: introspection
66 Architecture: any
67 Depends: ${misc:Depends},
68 ${gir:Depends},

Subscribers

People subscribed via source and target branches