Merge lp:~ldgoodridge95/ubuntu/vivid/upstart/rm-libjson0 into lp:ubuntu/vivid/upstart

[Lance Goodridge]

Changed libjson0 to libjson-c2 in Build Dependencies

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine, but the Build-Depends should probably be libjson-c-dev instead.

Note; I'm looking at the upstart binary package and it looks like it probably doesn't need to Depends on libjson at all, and the upstart-bin package appears to already Depends on libjson-c2 via shlibs:Depends, so you might as well remove it from there too :)

With these changes made I think things will be just fine to merge and upload.

review: Needs Fixing

[Lance Goodridge (ldgoodridge95)]

Hello Mr Trudel-Lapierre,

Thank you for reviewing my patch! I have removed the two libjson0-dev
dependencies per your suggestion and have a submitted a new merge
request.

Lance

On Mon, Feb 16, 2015 at 6:01 PM, Mathieu Trudel-Lapierre
<email address hidden> wrote:
> Review: Needs Fixing
>
> Looks fine, but the Build-Depends should probably be libjson-c-dev instead.
>
> Note; I'm looking at the upstart binary package and it looks like it probably doesn't need to Depends on libjson at all, and the upstart-bin package appears to already Depends on libjson-c2 via shlibs:Depends, so you might as well remove it from there too :)
>
> With these changes made I think things will be just fine to merge and upload.
> --
> https://code.launchpad.net/~ldgoodridge95/ubuntu/vivid/upstart/rm-libjson0/+merge/247526
> You are the owner of lp:~ldgoodridge95/ubuntu/vivid/upstart/rm-libjson0.

[Mathieu Trudel-Lapierre (cyphermox)]

Closing as Rejected; superseded by https://code.launchpad.net/~ldgoodridge95/ubuntu/vivid/upstart/rm-libjson0-dev/+merge/250522

review: Disapprove

Unmerged revisions

1607. By Lance Goodridge on 2015-01-24

Replaced libjson0-dev with libjson-c2 in Dependencies.

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-20 10:55:02 +0000
+++ debian/changelog	2015-01-24 23:55:29 +0000
@@ -1,3 +1,9 @@
+upstart (1.13.2-0ubuntu8) vivid; urgency=medium
+
+  * Replaced libjson0-dev with libjson-c2 in Dependencies.
+
+ -- Lance Goodridge <[e-mail]>  Sat, 24 Jan 2015 17:16:37 +0000
+
 upstart (1.13.2-0ubuntu7) vivid; urgency=medium
 
   * Correct upstart-udev-bridge session job start/stop on conditions.

=== modified file 'debian/control'
--- debian/control	2015-01-17 01:04:09 +0000
+++ debian/control	2015-01-24 23:55:29 +0000
@@ -5,7 +5,7 @@
 XSBC-Orig-Maintainer: Steve Langasek <[e-mail]>
 Uploaders: Scott James Remnant <[e-mail]>, James Hunt <[e-mail]>
 Standards-Version: 3.9.5
-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]
+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-c2, dbus, bash-completion, dh-autoreconf, autopoint, python3:any, automake (>= 1.12), libdconf-dev, libselinux1-dev [linux-any], libcgmanager-dev [linux-any]
 X-Python3-Version: >= 3.2
 Vcs-Bzr: lp:ubuntu/upstart
 XS-Debian-Vcs-Bzr: nosmart+http://bzr.debian.org/bzr/collab-maint/upstart/trunk/
@@ -15,7 +15,7 @@
 
 Package: upstart
 Architecture: any
-Depends: upstart-bin (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
+Depends: upstart-bin (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson-c2, debianutils (>= 4)
 Suggests: python3, graphviz, bash-completion, upstart-monitor
 Replaces: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services
 Conflicts: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services, lxcguest
@@ -31,7 +31,7 @@
 
 Package: upstart-bin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
+Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, libjson-c2, debianutils (>= 4)
 Suggests: python3, graphviz, bash-completion, upstart-monitor
 Replaces: upstart (<< 1.13.2-0ubuntu6)
 Breaks: upstart (<< 1.13.2-0ubuntu6)