Ubuntu
upstart package

Merge lp:~robert-ancell/ubuntu/wily/upstart/json-c into lp:ubuntu/wily/upstart

  1. Wily (15.10)
  2. json-c
  3. Merge into wily
Proposed by Robert Ancell
Status: Merged
Merged at revision: 1620
Proposed branch: lp:~robert-ancell/ubuntu/wily/upstart/json-c
Merge into: lp:ubuntu/wily/upstart
Diff against target: 21 lines (+2/-2)
1 file modified
debian/control (+2/-2)
To merge this branch: bzr merge lp:~robert-ancell/ubuntu/wily/upstart/json-c
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+266498@code.launchpad.net

Commit message

Depend on libjson-c instead of transitional libjson0 which symlinks to the same thing anyway.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Then we can also get rid of the hardcoded libjson0 dependency, as libjson-c2 always installed into /lib.

review: Approve

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 2015-04-03 12:11:32 +0000
3+++ debian/control 2015-07-31 00:45:18 +0000
4@@ -5,7 +5,7 @@
5 XSBC-Orig-Maintainer: Steve Langasek <vorlon@debian.org>
6 Uploaders: Scott James Remnant <scott@netsplit.com>, James Hunt <james.hunt@ubuntu.com>
7 Standards-Version: 3.9.6
8-Build-Depends: debhelper (>= 9), pkg-config (>= 0.22), libnih-dev (>= 1.0.3), libnih-dbus-dev (>= 1.0.3), nih-dbus-tool (>= 1.0.3), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 151-5), libjson0-dev (>= 0.10), dbus, bash-completion, dh-autoreconf, autopoint, python3:any, automake (>= 1.12), libdconf-dev, libselinux1-dev [linux-any], libcgmanager-dev [linux-any]
9+Build-Depends: debhelper (>= 9), pkg-config (>= 0.22), libnih-dev (>= 1.0.3), libnih-dbus-dev (>= 1.0.3), nih-dbus-tool (>= 1.0.3), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 151-5), libjson-c-dev (>= 0.10), dbus, bash-completion, dh-autoreconf, autopoint, python3:any, automake (>= 1.12), libdconf-dev, libselinux1-dev [linux-any], libcgmanager-dev [linux-any]
10 X-Python3-Version: >= 3.2
11 Vcs-Bzr: lp:ubuntu/upstart
12 XS-Debian-Vcs-Bzr: nosmart+http://bzr.debian.org/bzr/collab-maint/upstart/trunk/
13@@ -15,7 +15,7 @@
14
15 Package: upstart
16 Architecture: any
17-Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, init-system-helpers (>= 1.22ubuntu6), initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
18+Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, init-system-helpers (>= 1.22ubuntu6), initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson-c2 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
19 Suggests: python3, graphviz, bash-completion, upstart-monitor
20 Replaces: upstart-job, sysvinit, startup-tasks, system-services, upstart-bin (<< 1.13.2-0ubuntu10~)
21 Conflicts: upstart-job, sysvinit, startup-tasks, system-services, lxcguest

Subscribers

People subscribed via source and target branches

to all changes: