Merge lp:~droetker/ubuntu/saucy/bumblebee/fix-for-1250745 into lp:ubuntu/saucy/bumblebee

[Christian González]

removes virtualgl package recommendation

[Martin Pitt (pitti)]

I won't merge this as the alternative recommends: is fine. No need to introduce a delta to Debian for this. Thanks!

review: Disapprove

Unmerged revisions

6. By Christian González on 2013-11-13

remove non-existent 'virtualgl' recommendation (LP: #1250745)

5. By Vincent Cheng on 2013-08-20

* Use dh-systemd (for systemd-specific additions to maintscripts).
  (Closes: #715270)
* Add bumblebee group as system group (gid in between 100-999) instead
  of a regular group in postinst. (Closes: #718772)

=== modified file 'debian/bumblebee.postinst'
--- debian/bumblebee.postinst	2013-05-03 03:04:38 +0000
+++ debian/bumblebee.postinst	2013-11-13 07:51:09 +0000
@@ -20,7 +20,7 @@
     # default group and if the group is missing
     if grep -qx ServerGroup=$BB_GROUP /etc/bumblebee/bumblebee.conf &&
         ! getent group $BB_GROUP > /dev/null; then
-        groupadd $BB_GROUP
+        groupadd --system $BB_GROUP
         users=$(getent group $USE_GROUPS | cut -d: -f4 | tr , '\n' | sort -u)
         echo "Adding members from group(s) '$USE_GROUPS' to '$BB_GROUP':"
         echo $users

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-11 01:18:07 +0000
+++ debian/changelog	2013-11-13 07:51:09 +0000
@@ -1,3 +1,18 @@
+bumblebee (3.2.1-4ubuntu2) UNRELEASED; urgency=low
+
+  * remove non-existent 'virtualgl' recommendation (LP: #1250745)
+
+ -- Christian A. Reiter <christian@aragorn>  Wed, 13 Nov 2013 08:37:49 +0100
+
+bumblebee (3.2.1-4) unstable; urgency=low
+
+  * Use dh-systemd (for systemd-specific additions to maintscripts).
+    (Closes: #715270)
+  * Add bumblebee group as system group (gid in between 100-999) instead
+    of a regular group in postinst. (Closes: #718772)
+
+ -- Vincent Cheng <[e-mail]>  Tue, 20 Aug 2013 02:35:34 -0700
+
 bumblebee (3.2.1-3) unstable; urgency=low
 
   * Append /usr/lib/primus to CONF_PRIMUS_LD_PATH in d/rules to ease

=== modified file 'debian/control'
--- debian/control	2013-07-11 01:18:07 +0000
+++ debian/control	2013-11-13 07:51:09 +0000
@@ -1,13 +1,14 @@
 Source: bumblebee
 Section: utils
 Priority: extra
-Maintainer: Debian NVIDIA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian NVIDIA Maintainers <[e-mail]>
 Uploaders: 
  Aron Xu <[e-mail]>, 
  Vincent Cheng <[e-mail]>,
  Yunqiang Su <[e-mail]>
 Build-Depends: debhelper (>= 9), libbsd-dev (>= 0.2.0), pkg-config,
- libx11-dev, libglib2.0-dev, help2man
+ libx11-dev, libglib2.0-dev, help2man, dh-systemd (>= 1.4)
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/~bumblebee
 Vcs-Git: git://anonscm.debian.org/pkg-nvidia/bumblebee.git
@@ -16,7 +17,7 @@
 Package: bumblebee
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, bbswitch-dkms | bbswitch-source
-Recommends: virtualgl | primus
+Recommends: primus
 Suggests: bumblebee-nvidia (= ${binary:Version})
 Description: NVIDIA Optimus support for Linux
  Bumblebee is an effort to make NVIDIA Optimus enabled laptops work in

=== modified file 'debian/rules'
--- debian/rules	2013-07-11 01:18:07 +0000
+++ debian/rules	2013-11-13 07:51:09 +0000
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@ --with systemd
 
 override_dh_auto_configure:
 # Ubuntu and Debian's packaging of nvidia's proprietary driver differ greatly