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
=== modified file 'debian/control'
--- debian/control 2013-03-11 12:59:43 +0000
+++ debian/control 2013-08-14 03:23:02 +0000
@@ -5,17 +5,17 @@
5Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>5Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
6Build-Depends: debhelper (>= 9),6Build-Depends: debhelper (>= 9),
7 dh-autoreconf,7 dh-autoreconf,
8 quilt,
9 python-all-dev,8 python-all-dev,
9 at-spi2-core,
10 cli-common-dev (>= 0.5.7),10 cli-common-dev (>= 0.5.7),
11 gobject-introspection,11 gobject-introspection,
12 intltool,12 intltool,
13 gnome-doc-utils,
14 gtk-doc-tools,13 gtk-doc-tools,
14 libxml2-utils,
15 libnunit-cil-dev,15 libnunit-cil-dev,
16 dbus-test-runner,16 dbus-test-runner,
17 xvfb,17 xvfb,
18 valac-0.16,18 valac,
19 mono-devel (>= 2.4.3),19 mono-devel (>= 2.4.3),
20 libglib2.0-dev (>= 2.35.4),20 libglib2.0-dev (>= 2.35.4),
21 libgtk-3-dev (>= 2.91.3),21 libgtk-3-dev (>= 2.91.3),
@@ -30,9 +30,6 @@
30 libdbusmenu-gtk-dev (>= 0.5.90),30 libdbusmenu-gtk-dev (>= 0.5.90),
31 libdbusmenu-gtk3-dev (>= 0.5.90),31 libdbusmenu-gtk3-dev (>= 0.5.90),
32 libgirepository1.0-dev,32 libgirepository1.0-dev,
33 gir1.2-glib-2.0,
34 gir1.2-gtk-2.0,
35 gir1.2-gtk-3.0,
36Standards-Version: 3.9.133Standards-Version: 3.9.1
37Homepage: https://launchpad.net/libappindicator34Homepage: https://launchpad.net/libappindicator
38# If you aren't a member of ~indicator-applet-developers but need to upload35# If you aren't a member of ~indicator-applet-developers but need to upload
@@ -69,7 +66,7 @@
69 This package contains shared libraries to be used by applications.66 This package contains shared libraries to be used by applications.
7067
71Package: gir1.2-appindicator-0.168Package: gir1.2-appindicator-0.1
72Section: libs69Section: introspection
73Architecture: any70Architecture: any
74Depends: ${misc:Depends},71Depends: ${misc:Depends},
75 ${gir:Depends},72 ${gir:Depends},
@@ -83,6 +80,7 @@
83Architecture: any80Architecture: any
84Depends: ${shlibs:Depends},81Depends: ${shlibs:Depends},
85 ${misc:Depends},82 ${misc:Depends},
83 gir1.2-appindicator-0.1 (= ${binary:Version}),
86 libdbusmenu-glib-dev (>= 0.1.8),84 libdbusmenu-glib-dev (>= 0.1.8),
87 libdbus-glib-1-dev (>= 0.76),85 libdbus-glib-1-dev (>= 0.76),
88 libappindicator1 (= ${binary:Version}),86 libappindicator1 (= ${binary:Version}),
@@ -120,6 +118,7 @@
120Architecture: any118Architecture: any
121Depends: ${shlibs:Depends},119Depends: ${shlibs:Depends},
122 ${misc:Depends},120 ${misc:Depends},
121 gir1.2-appindicator3-0.1 (= ${binary:Version}),
123 libdbusmenu-glib-dev (>= 0.1.8),122 libdbusmenu-glib-dev (>= 0.1.8),
124 libdbus-glib-1-dev (>= 0.76),123 libdbus-glib-1-dev (>= 0.76),
125 libappindicator3-1 (= ${binary:Version}),124 libappindicator3-1 (= ${binary:Version}),
@@ -130,7 +129,7 @@
130 This package contains files that are needed to build applications.129 This package contains files that are needed to build applications.
131130
132Package: gir1.2-appindicator3-0.1131Package: gir1.2-appindicator3-0.1
133Section: libs132Section: introspection
134Architecture: any133Architecture: any
135Depends: ${misc:Depends},134Depends: ${misc:Depends},
136 ${gir:Depends},135 ${gir:Depends},

Subscribers

People subscribed via source and target branches