Ubuntu
upstart package

Merge lp:~jpds/ubuntu/trusty/upstart/selinux-enable into lp:ubuntu/trusty/upstart

  1. Trusty (14.04)
  2. selinux-enable
  3. Merge into trusty
Proposed by Jonathan Davies
Status: Merged
Merged at revision: 1521
Proposed branch: lp:~jpds/ubuntu/trusty/upstart/selinux-enable
Merge into: lp:ubuntu/trusty/upstart
Diff against target: 40 lines (+6/-2)
3 files modified
debian/changelog (+4/-0)
debian/control (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~jpds/ubuntu/trusty/upstart/selinux-enable
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Ubuntu branches Pending
Review via email: mp+193960@code.launchpad.net

Description of the change

Turn on SELinux support by passing --enable-selinux to configure options.

To post a comment you must log in.
lp:~jpds/ubuntu/trusty/upstart/selinux-enable updated
1524. By Jonathan Davies

debian/control: Removed [linux-any] constraint on libselinux1-dev part.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-11-03 02:27:44 +0000
3+++ debian/changelog 2013-11-05 17:09:59 +0000
4@@ -3,6 +3,10 @@
5 * If check target fails, cat test-suite log files to standard output
6 such that they are saved as part of build-log.
7
8+ [ Jonathan Davies ]
9+ * debian/rules: Set --enable-selinux in configure flags.
10+ * debian/control: Set build-dependency on libselinux1-dev.
11+
12 -- Dmitrijs Ledkovs <xnox@ubuntu.com> Sun, 03 Nov 2013 02:27:30 +0000
13
14 upstart (1.10-0ubuntu8) trusty; urgency=low
15
16=== modified file 'debian/control'
17--- debian/control 2013-10-12 06:31:50 +0000
18+++ debian/control 2013-11-05 17:09:59 +0000
19@@ -4,7 +4,7 @@
20 Maintainer: James Hunt <james.hunt@ubuntu.com>
21 Uploaders: Scott James Remnant <scott@ubuntu.com>
22 Standards-Version: 3.8.4
23-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
24+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
25 X-Python3-Version: 3.3
26 XS-Debian-Vcs-Bzr: nosmart+http://bzr.debian.org/bzr/collab-maint/upstart/trunk/
27 XS-Debian-Vcs-Browser: http://anonscm.debian.org/loggerhead/collab-maint/upstart/trunk/
28
29=== modified file 'debian/rules'
30--- debian/rules 2013-11-03 03:10:43 +0000
31+++ debian/rules 2013-11-05 17:09:59 +0000
32@@ -18,7 +18,7 @@
33 dh $@ --with bash-completion,autoreconf,python3
34
35 override_dh_auto_configure:
36- dh_auto_configure -- --exec-prefix= --disable-silent-rules --disable-abi-check
37+ dh_auto_configure -- --exec-prefix= --disable-silent-rules --disable-abi-check --enable-selinux
38
39 override_dh_auto_build:
40 dh_auto_build --parallel

Subscribers

People subscribed via source and target branches