Bug#769498: unblock: rtkit/0.11-2

[Felipe Sateler <fsateler@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear release team,

I write to ask if the attached diff would be an appropriate upload to
unstable that would be granted an unblock request. It fixes two severity
important bugs:

#696900 Wrong build-dependency on libpolkit-backend-1-dev
#747568 [rtkit-daemon.service:32] Unknown lvalue 'ControlGroup'

The first should avoid a FTBFS when polkit is updated in unstable
(probably soon after jessie is released), the second avoids a warning
during boot on systemd systems.

Please find attached the diff of the proposed upload against 0.11-1.



-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff --git a/debian/changelog b/debian/changelog
index c32f5f7..8dc7726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rtkit (0.11-2) unstable; urgency=medium
+
+  * Remove build dependency on libpolkit-backend-1-dev, it is not used
+    (Closes: #696900)
+  * Drop removed ControlGroup stanza (Closes: #747568)
+
+ -- Felipe Sateler <fsateler@debian.org>  Thu, 13 Nov 2014 23:56:19 -0300
+
 rtkit (0.11-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 7e6ae4c..b9c317d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends:
  debhelper (>= 7.0.50~),
  libcap-dev,
  libdbus-1-dev,
- libpolkit-backend-1-dev
 Standards-Version: 3.9.5
 Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-multimedia/rtkit.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/rtkit.git
diff --git a/debian/patches/0002-Drop-Removed-ControlGroup-stanza.patch b/debian/patches/0002-Drop-Removed-ControlGroup-stanza.patch
new file mode 100644
index 0000000..763953b
--- /dev/null
+++ b/debian/patches/0002-Drop-Removed-ControlGroup-stanza.patch
@@ -0,0 +1,17 @@
+Description: Drop removed ControlGroup stanza
+ Systemd >= 205 do not have this directive anymore.
+ This is not a problem for us because the debian kernel does not have
+ CONFIG_RT_GROUP_SCHED enabled, so rt budgets are not per-cgroup
+Bug-Debian: 747568
+--- a/rtkit-daemon.service.in
++++ b/rtkit-daemon.service.in
+@@ -27,9 +27,5 @@ CapabilityBoundingSet=CAP_SYS_NICE CAP_D
+ PrivateTmp=yes
+ PrivateNetwork=yes
+ 
+-# Work around the fact that the Linux currently doesn't assign any RT
+-# budget to CPU control groups that have none configured explicitly
+-ControlGroup=cpu:/
+-
+ [Install]
+ WantedBy=graphical.target
diff --git a/debian/patches/series b/debian/patches/series
index cf9a390..1558bca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-SECURITY-Pass-uid-of-caller-to-polkit.patch
+0002-Drop-Removed-ControlGroup-stanza.patch