diff -Nru bumblebee-3.2.1/debian/bumblebee.modprobe bumblebee-3.2.1/debian/bumblebee.modprobe --- bumblebee-3.2.1/debian/bumblebee.modprobe 2014-01-06 09:02:22.000000000 +0000 +++ bumblebee-3.2.1/debian/bumblebee.modprobe 2014-04-08 21:08:55.000000000 +0000 @@ -31,3 +31,11 @@ blacklist nvidia-331 blacklist nvidia-331-updates blacklist nvidia-experimental-331 +# 334 +blacklist nvidia-334 +blacklist nvidia-334-updates +blacklist nvidia-experimental-334 +# 337 +blacklist nvidia-337 +blacklist nvidia-337-updates +blacklist nvidia-experimental-337 diff -Nru bumblebee-3.2.1/debian/changelog bumblebee-3.2.1/debian/changelog --- bumblebee-3.2.1/debian/changelog 2014-01-06 09:25:55.000000000 +0000 +++ bumblebee-3.2.1/debian/changelog 2014-04-08 21:08:55.000000000 +0000 @@ -1,46 +1,12 @@ -bumblebee (3.2.1-5) unstable; urgency=medium +bumblebee (3.2.1-90~trustyppa1) trusty; urgency=low - * Allow more nvidia flavours to satisfy bumblebee-nvidia's dependencies - (relevant only for Ubuntu). (LP: #1261180) - * Update Standards version to 3.9.5, no changes required. + * Bump version number for PPA to override distro version + * Add support for nvidia-334 and nvidia-337 - -- Vincent Cheng Mon, 06 Jan 2014 01:24:33 -0800 + -- Bruno Pagani Tue, 08 Apr 2014 22:59:18 +0200 -bumblebee (3.2.1-4) unstable; urgency=low +bumblebee (3.2.1-1~trustyppa1) trusty; 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) + * Initial release for Trusty - -- Vincent Cheng 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 - pre-multiarch backports. (Closes: #712665) - * Have bumblebee depend on bbswitch-dkms | bbswitch-source, and - bumblebee-nvidia depend on all possible m-a built nvidia modules. - * Add support for nvidia-325 packaged in Ubuntu (not relevant for Debian). - - -- Vincent Cheng Thu, 11 Jul 2013 01:18:07 -0700 - -bumblebee (3.2.1-2) unstable; urgency=low - - * Allow more nvidia flavours to satisfy bumblebee-nvidia's dependencies - (relevant for Ubuntu). - - -- Vincent Cheng Wed, 29 May 2013 01:45:35 -0700 - -bumblebee (3.2.1-1) unstable; urgency=low - - [ Aron Xu ] - * Initial release (Closes: #659440). - * Thanks to Peter Lekensteyn and Bruno Pagani, most stuff taken from the - packaging for Ubuntu PPA. - - [ Vincent Cheng ] - * Thanks to Igor Urazov for lots of the Debian-specific portions of the - packaging. - - -- Vincent Cheng Fri, 03 May 2013 03:04:38 -0700 + -- Bruno Pagani Mon, 13 Jan 2014 20:20:20 +0100 diff -Nru bumblebee-3.2.1/debian/control bumblebee-3.2.1/debian/control --- bumblebee-3.2.1/debian/control 2014-01-06 09:26:02.000000000 +0000 +++ bumblebee-3.2.1/debian/control 2014-04-08 21:08:55.000000000 +0000 @@ -1,38 +1,30 @@ Source: bumblebee Section: utils Priority: extra -Maintainer: Debian NVIDIA Maintainers -Uploaders: - Aron Xu , - Vincent Cheng , - Yunqiang Su +Maintainer: The Bumblebee Project +Uploaders: Peter Lekensteyn , + Bruno Pagani Build-Depends: debhelper (>= 9), libbsd-dev (>= 0.2.0), pkg-config, libx11-dev, libglib2.0-dev, help2man, dh-systemd (>= 1.4) Standards-Version: 3.9.5 Homepage: https://launchpad.net/~bumblebee -Vcs-Git: git://anonscm.debian.org/pkg-nvidia/bumblebee.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-nvidia/bumblebee.git +Vcs-Browser: https://github.com/Bumblebee-Project/Bumblebee +Vcs-Git: git://github.com/Bumblebee-Project/Bumblebee.git Package: bumblebee -Architecture: linux-any +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, bbswitch-dkms | bbswitch-source -Recommends: virtualgl | primus -Suggests: bumblebee-nvidia (= ${binary:Version}) -Description: NVIDIA Optimus support for Linux - Bumblebee is an effort to make NVIDIA Optimus enabled laptops work in - GNU/Linux systems. These laptops are built in such a way that the NVIDIA - graphics card can be used on demand so that battery life is improved and - temperature is kept low. - . - It disables the discrete graphics card if no client is detected, and start - an X server making use of NVIDIA card if requested then let software GL - implementations (such as VirtualGL) copy frames to the visible display that - runs on the intergrated graphics. The ability to use discrete graphics - depends on the driver: open source nouveau and proprietary nvidia. +Recommends: bumblebee-nvidia (= ${binary:Version}), virtualgl | primus +Description: NVIDIA Optimus support + Bumblebee aims to provide support for NVIDIA Optimus laptops. These laptops + are built in such a way that the NVIDIA graphics card can usually not be used. + With Bumblebee, a X server for the NVIDIA card is started and frames are + transferred to the Intel GPU using VirtualGL. Power saving is accomplished with + the bbswitch kernel module. Supported drivers are nvidia and nouveau. Package: bumblebee-nvidia -Architecture: amd64 i386 Section: contrib/utils +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, bumblebee (= ${binary:Version}), # proprietary NVIDIA packages in Debian nvidia-driver | nvidia-glx | nvidia-kernel-dkms | nvidia-kernel-amd64 | @@ -44,14 +36,16 @@ nvidia-313 | nvidia-313-updates | nvidia-experimental-313 | nvidia-319 | nvidia-319-updates | nvidia-experimental-319 | nvidia-325 | nvidia-325-updates | nvidia-experimental-325 | - nvidia-331 | nvidia-331-updates | nvidia-experimental-331 + nvidia-331 | nvidia-331-updates | nvidia-experimental-331 | + nvidia-334 | nvidia-334-updates | nvidia-experimental-334 | + nvidia-337 | nvidia-337-updates | nvidia-experimental-337 Description: NVIDIA Optimus support using the proprietary NVIDIA driver This metapackage ensures that the proprietary NVIDIA driver is installed in a way such that 3D acceleration does not break. It does so by configuring the OpenGL library path to use the Mesa graphics library. Package: bumblebee-dbg -Architecture: linux-any +Architecture: i386 amd64 Section: debug Depends: ${misc:Depends}, bumblebee (= ${binary:Version}) Description: NVIDIA Optimus support - debugging symbols diff -Nru bumblebee-3.2.1/debian/copyright bumblebee-3.2.1/debian/copyright --- bumblebee-3.2.1/debian/copyright 2014-01-06 09:02:22.000000000 +0000 +++ bumblebee-3.2.1/debian/copyright 2014-04-08 21:08:55.000000000 +0000 @@ -8,10 +8,7 @@ Files: debian/* Copyright: 2011-2013 Peter Lekensteyn - 2011-2013 Bruno Pagani - 2012 Igor Urazov - 2013 Aron Xu - 2013 Vincent Cheng + 2011-2014 Bruno Pagani License: GPL-3.0+ License: GPL-3.0+ diff -Nru bumblebee-3.2.1/debian/README.Debian bumblebee-3.2.1/debian/README.Debian --- bumblebee-3.2.1/debian/README.Debian 2014-01-06 09:02:22.000000000 +0000 +++ bumblebee-3.2.1/debian/README.Debian 2014-04-08 21:08:55.000000000 +0000 @@ -11,4 +11,4 @@ switch to using virtualgl by using upstream's PPAs. Follow the instructions at: https://launchpad.net/~bumblebee/+archive/stable - -- Vincent Cheng Wed, 27 Feb 2013 01:07:57 -0800 + -- Vincent Cheng Wed, 27 Feb 2013 01:07:57 -0800