commit 1c1cc25d3993e0068b265ea65215b1f74dd73976
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Jan 16 17:07:26 2015 +0100

    Add support for systemd

diff --git a/debian/control b/debian/control
index e682213..fe9dccc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: nvidia-prime
 Section: admin
 Priority: optional
 Maintainer: Alberto Milone <alberto.milone@canonical.com>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0), dh-systemd
 Standards-Version: 3.9.2
 Vcs-Git: git://github.com/tseliot/nvidia-prime.git
 Vcs-Browser: http://github.com/tseliot/nvidia-prime
diff --git a/debian/dirs.in b/debian/dirs.in
index c152495..dd43bd5 100644
--- a/debian/dirs.in
+++ b/debian/dirs.in
@@ -3,3 +3,4 @@
 #MISC_DIR#
 #LIGHTDM_LEGACY_CONF_DIR#
 #LIGHTDM_CONF_DIR#
+/lib/systemd/system
diff --git a/debian/install.in b/debian/install.in
index ef60317..58088af 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -6,3 +6,4 @@ get-quirk-options /sbin
 prime-select /usr/bin
 prime-supported /usr/bin
 oem /usr/lib/ubiquity/dm-scripts
+debian/nvidia-prime.service /lib/systemd/system
diff --git a/debian/nvidia-prime.service b/debian/nvidia-prime.service
new file mode 100644
index 0000000..65ba708
--- /dev/null
+++ b/debian/nvidia-prime.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Enable NVIDIA GPU for PRIME on Shutdown
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=-/bin/sh -c 'echo ON > /proc/acpi/bbswitch'
+
+[Install]
+WantedBy=shutdown.target
+
diff --git a/debian/rules b/debian/rules
index c4cb45b..e876c47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,15 @@ regen-from-templates:
 		$$i.in > $$i; \
 	done
 
+override_dh_install:
+	dh_install --fail-missing -Xlib/systemd
+
+	# on architectures where we build gpu-manager, install the systemd unit
+	if [ -d debian/tmp/lib/systemd ]; then \
+		dh_systemd_enable; \
+		dh_install -p nvidia-prime lib/systemd; \
+	fi
+
 override_dh_auto_clean:
 	for i in $(CURDIR)/debian/install \
 	     $(CURDIR)/debian/dirs \

commit 7619006f838cb70c86985c2f19d62b32b370af3f
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Jan 16 16:59:10 2015 +0100

    Start work on 0.7

diff --git a/debian/changelog b/debian/changelog
index f8cad29..a572e68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.7) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 16 Jan 2015 16:58:53 +0100
+
 nvidia-prime (0.6.6) utopic; urgency=medium
 
   * prime-select:

commit 14e4e5a7e6950e30ef253f85892797537a814539
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Jun 19 15:50:43 2014 +0200

    Release 0.6.6

diff --git a/debian/changelog b/debian/changelog
index fdfd507..f8cad29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-nvidia-prime (0.6.6) UNRELEASED; urgency=medium
+nvidia-prime (0.6.6) utopic; urgency=medium
 
-  * 
+  * prime-select:
+    - Simplify the logic for enablement. The simplified logic
+      should also be more robust and try harder instead of
+      complaining and aborting early (LP: #1310023).
+      This is now possible thanks to the fact that we allow
+      installing only one binary driver at the time. This is
+      not the case in Ubuntu <= 12.04.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Thu, 19 Jun 2014 11:52:59 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 19 Jun 2014 15:48:06 +0200
 
 nvidia-prime (0.6.5) utopic; urgency=medium
 

commit 772eb51f3cf3b5b196303f0e1194effcdff4a615
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Jun 19 15:13:33 2014 +0200

    prime-select: simplify the logic for enablement
    
    This is now possible thanks to the fact that we allow installing
    only one binary driver at the time.
    
    This is not the case in Ubuntu <= 12.04.

diff --git a/prime-select b/prime-select
index 643080d..a56fe36 100755
--- a/prime-select
+++ b/prime-select
@@ -251,12 +251,37 @@ class Switcher(object):
         settings.write('%s\n' % nvidia_power)
         settings.close()
 
+    def _supports_prime(self):
+        '''See if there are alternatives that support PRIME'''
+        alternatives = self._get_gl_alternatives_list()
+        for alternative in alternatives:
+            if 'prime' in alternative:
+                return True
+        return False
+
+    def _find_alternative_by_name(self, name, ignore_pattern=''):
+        '''Find the alternative name that matches a generic name pattern'''
+        alternatives = self._get_gl_alternatives_list()
+
+        for alternative in alternatives:
+            if name in alternative:
+                if ignore_pattern and ignore_pattern in alternative:
+                    continue
+                return alternative
+        return None
 
     def enable_profile(self, profile):
         current_driver = ''
         current_profile = ''
         alternatives = self._get_current_alternative()
 
+        sys.stdout.write('Info: the current alternatives in use are: %s\n' % str(alternatives))
+
+        # Make sure that the installed packages support PRIME
+        if not self._supports_prime():
+            sys.stderr.write('Error: the installed packages do not support PRIME\n')
+            return False
+
         try:
             alternative = str(alternatives[0])
             alternative_other = str(alternatives[1])
@@ -265,60 +290,23 @@ class Switcher(object):
             sys.stderr.write('Error: the required alternatives do not exist\n')
             return False
 
-        # The alternatives we are looking for are both provided by
-        # an nvidia package
-        if (alternative == alternative_other and
-            'nvidia' in alternative):
-            # The driver in use
-            current_driver = alternative
-            # The profile in use
-            if 'prime' in alternative:
-                current_profile = 'intel'
-            else:
-                current_profile = 'nvidia'
-                # Check that the alternative for the intel profile
-                # exists. If it doesn't, then the driver does not
-                # support power management with PRIME
-                alt_driver = '%s-prime' % current_driver
-                if (not self._gl_switcher.get_alternative_by_name(alt_driver) or
-                    not self._gl_switcher_other.get_alternative_by_name(alt_driver)):
-                    sys.stderr.write('Error: %s does not support PRIME power management\n')
-                    return False
-
-            # Are alternatives in "auto" or in "manual" mode?
-            status = self._get_current_alternative_status()
-
-            # No need to do anything if we're already using the desired
-            # profile, provided that alternatives are not in "auto" mode
-            if profile == current_profile and 'auto' not in status:
+        if alternative == alternative_other:
+            if ((profile == 'intel' and 'prime' in alternative) or
+                (profile == 'nvidia' and 'prime' not in alternative and
+                 'nvidia' in alternative)):
+                # No need to do anything if we're already using the desired
+                # profile
                 sys.stdout.write('Info: the %s profile is already in use\n' % (profile))
                 return True
-        elif (alternative != alternative_other and
-            'nvidia' in alternative):
-            # Something's wrong here
-            # e.g. nvidia-319 on x86_64 and mesa on i386
-            sys.stdout.write('Info: the alternatives do not match\n')
-            # The first alternative shows the driver in use
-            current_driver = alternative
-
-            if 'prime' not in alternative:
-                # Check that the alternative for the intel profile
-                # exists. If it doesn't, then the driver does not
-                # support power management with PRIME
-                alt_driver = '%s-prime' % current_driver
-                if (not self._gl_switcher.get_alternative_by_name(alt_driver) or
-                    not self._gl_switcher_other.get_alternative_by_name(alt_driver)):
-                    sys.stderr.write('Error: %s does not support PRIME power management\n')
-                    return False
-        else:
-            sys.stderr.write('Error: alternatives are not set up properly\n')
-            return False
 
         # Enable the desired alternative
         if profile == 'intel':
-            target_driver = '%s-prime' % current_driver
+            target_driver = self._find_alternative_by_name('prime')
         else:
-            target_driver = current_driver.replace('-prime', '')
+            # Make sure to get nvidia-$flavour instead of nvidia-$flavour-prime
+            target_driver = self._find_alternative_by_name('nvidia', ignore_pattern='prime')
+
+        sys.stdout.write('Info: selecting %s for the %s profile\n' % (target_driver, profile))
 
         if self.enable_alternative(target_driver):
             # Write the settings to the config file

commit 0e1769e5ee89cf215d1556436016a06127da6a97
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Jun 19 11:53:09 2014 +0200

    Start work on 0.6.6

diff --git a/debian/changelog b/debian/changelog
index 387182a..fdfd507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.6.6) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 19 Jun 2014 11:52:59 +0200
+
 nvidia-prime (0.6.5) utopic; urgency=medium
 
   * debian/dirs.in, debian/install.in, oem/00-prime-offload:

commit dfeaf0f116acddf1ea954caff33f6ac8b59d8b14
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 22 15:55:45 2014 +0200

    Release 0.6.5

diff --git a/debian/changelog b/debian/changelog
index 9d6144d..387182a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-nvidia-prime (0.6.5) UNRELEASED; urgency=medium
+nvidia-prime (0.6.5) utopic; urgency=medium
 
-  * 
+  * debian/dirs.in, debian/install.in, oem/00-prime-offload:
+    - Add support for offloading rendering to NVIDIA when using
+      the OEM installer.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Thu, 22 May 2014 15:01:32 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 22 May 2014 15:54:58 +0200
 
 nvidia-prime (0.6.4) utopic; urgency=medium
 

commit d7842c6f495405191f0ff029d6381db0f3bd4aea
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 22 15:22:40 2014 +0200

    Add support for offloading when using the OEM installer

diff --git a/debian/dirs.in b/debian/dirs.in
index b03e70a..c152495 100644
--- a/debian/dirs.in
+++ b/debian/dirs.in
@@ -1,4 +1,5 @@
 /etc/X11
+/usr/lib/ubiquity/dm-scripts
 #MISC_DIR#
 #LIGHTDM_LEGACY_CONF_DIR#
 #LIGHTDM_CONF_DIR#
diff --git a/debian/install.in b/debian/install.in
index b23f31c..ef60317 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -5,3 +5,4 @@ prime-switch /sbin
 get-quirk-options /sbin
 prime-select /usr/bin
 prime-supported /usr/bin
+oem /usr/lib/ubiquity/dm-scripts
diff --git a/oem/00-prime-offload b/oem/00-prime-offload
new file mode 100755
index 0000000..d217311
--- /dev/null
+++ b/oem/00-prime-offload
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# Call prime-offload on the OEM installer so that offloading
+# can temporarily work without Lightdm
+#
+
+/sbin/prime-offload

commit ce3289f6b6c9319c34d55b054f2079505e14b11a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 22 15:01:49 2014 +0200

    Start work on 0.6.5

diff --git a/debian/changelog b/debian/changelog
index 09922c9..9d6144d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.6.5) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 22 May 2014 15:01:32 +0200
+
 nvidia-prime (0.6.4) utopic; urgency=medium
 
   * prime-quirks:

commit f0017bcb9d000caebd6e53f60964861f293aca0e
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 16 13:18:18 2014 +0200

    Release 0.6.4

diff --git a/debian/changelog b/debian/changelog
index 50c31d6..09922c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-nvidia-prime (0.6.4) UNRELEASED; urgency=medium
+nvidia-prime (0.6.4) utopic; urgency=medium
 
-  * 
+  * prime-quirks:
+    - Remove quirk for "Vostro 20 3015". We were really getting
+      a false positive in the gpu-manager (LP: #1310516).
 
- -- Alberto Milone <alberto.milone@canonical.com>  Fri, 16 May 2014 13:16:04 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 16 May 2014 13:16:57 +0200
 
 nvidia-prime (0.6.3) utopic; urgency=medium
 

commit 1d2d5aa379b0c7a977d2414772bc7a5fb93eac3f
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 16 13:16:37 2014 +0200

    Revert "prime-quirks: add quirk for "Vostro 20 3015""
    
    This reverts commit 88d8f367fc88ef77ec41417c9c07acf2d0ac8146.

diff --git a/prime-quirks b/prime-quirks
index 3f1ea1b..d7d551d 100644
--- a/prime-quirks
+++ b/prime-quirks
@@ -6,4 +6,3 @@
 #
 "ThinkPad T410" "skip_optimus_dsm=1"
 "ThinkPad T410s" "skip_optimus_dsm=1"
-"Vostro 20 3015" "skip_optimus_dsm=1"

commit 03757b9154746b006c710d9e544ccac4a9a7407a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 16 13:16:27 2014 +0200

    Start work on 0.6.4

diff --git a/debian/changelog b/debian/changelog
index 6f2a753..50c31d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.6.4) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 16 May 2014 13:16:04 +0200
+
 nvidia-prime (0.6.3) utopic; urgency=medium
 
   * prime-quirks:

commit 0722865a57962fdb36efdc382907c4935835f9df
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 12 15:48:24 2014 +0200

    Release 0.6.3

diff --git a/debian/changelog b/debian/changelog
index ea10104..6f2a753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-nvidia-prime (0.6.3) UNRELEASED; urgency=medium
+nvidia-prime (0.6.3) utopic; urgency=medium
 
-  * 
+  * prime-quirks:
+    - Add quirk for "Vostro 20 3015" (LP: #1310516).
 
- -- Alberto Milone <alberto.milone@canonical.com>  Mon, 12 May 2014 15:43:10 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 12 May 2014 15:47:15 +0200
 
 nvidia-prime (0.6.2) trusty; urgency=medium
 

commit 88d8f367fc88ef77ec41417c9c07acf2d0ac8146
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 12 15:45:41 2014 +0200

    prime-quirks: add quirk for "Vostro 20 3015"
    
    This should fix LP: #1310516 as soon as ubuntu-drivers-common
    provides support for matching dmi product names.

diff --git a/prime-quirks b/prime-quirks
index d7d551d..3f1ea1b 100644
--- a/prime-quirks
+++ b/prime-quirks
@@ -6,3 +6,4 @@
 #
 "ThinkPad T410" "skip_optimus_dsm=1"
 "ThinkPad T410s" "skip_optimus_dsm=1"
+"Vostro 20 3015" "skip_optimus_dsm=1"

commit 227a01fef04278b30151129973bdb03f38a7b195
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 12 15:43:28 2014 +0200

    Start work on 0.6.3

diff --git a/debian/changelog b/debian/changelog
index 9bb3bfc..ea10104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.6.3) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 12 May 2014 15:43:10 +0200
+
 nvidia-prime (0.6.2) trusty; urgency=medium
 
   * prime-supported:

commit b18001c809a811c1120cd7b3e80fae0a1b5da9db
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Mar 31 17:15:01 2014 +0200

    Release 0.6.2

diff --git a/debian/changelog b/debian/changelog
index 9af1ec1..9bb3bfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-nvidia-prime (0.6.2) UNRELEASED; urgency=medium
+nvidia-prime (0.6.2) trusty; urgency=medium
 
-  * 
+  * prime-supported:
+    - Check /var/lib/ubuntu-drivers-common/requires_offloading to
+      know if we need to offload rendering. There's no need to do
+      hardware detection again when the gpu-manager already does
+      all the work.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Fri, 14 Mar 2014 16:15:37 +0100
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 31 Mar 2014 17:13:37 +0200
 
 nvidia-prime (0.6.1) trusty; urgency=medium
 

commit eb03cd832d0bc00e6b87cd29848df9925b121cc9
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Mar 14 17:59:01 2014 +0100

    prime-supported: check /var/lib/ubuntu-drivers-common/requires_offloading
    
    This allows us to know if we need to offload rendering.

diff --git a/prime-supported b/prime-supported
index 1203646..e9a710c 100755
--- a/prime-supported
+++ b/prime-supported
@@ -18,7 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 LOG=/var/log/prime-supported.log
-force_prime=/etc/force-prime
 
 if [ -n "$1" ]; then
     LOG="$1"
@@ -32,57 +31,11 @@ if [ -f $LOG ]; then
     rm -f $LOG
 fi
 
-# We only support laptops by default,
-# you can override this check by creating
-# the /etc/force-prime file
-if [ -f "$force_prime" ]; then
-    echo "Force mode enabled. Skipping laptop check" >> $LOG 2>&1
+if [ -e "/var/lib/ubuntu-drivers-common/requires_offloading" ]; then
+    echo "Requires offloading" >> $LOG 2>&1
+    echo "yes"
 else
-    if [ -n "`ls -A /sys/class/power_supply/`" ] && \
-       [ -d "/proc/acpi/button/lid" ]; then
-        echo "Laptop detected" >> $LOG 2>&1
-    else
-        echo "Sorry but we only support laptops" >> $LOG 2>&1
-        exit 0
-    fi
-fi
-
-# We only support intel + nvidia
-cards="$(lspci -n)"
-# the different classes as per pci.ids
-# Syntax:
-# C class   class_name
-#   subclass    subclass_name       <-- single tab
-#       prog-if  prog-if_name   <-- two tabs
-#C 03  Display controller
-#    00  VGA compatible controller
-#        00  VGA controller
-#        01  8514 controller
-#    01  XGA compatible controller
-#    02  3D controller
-#    80  Display controller
-gfx_300="$(echo "$cards" | grep 300)"
-gfx_301="$(echo "$cards" | grep 301)"
-gfx_302="$(echo "$cards" | grep 302)"
-
-has_nvidia=false
-has_intel=false
-
-for gfx_class in "$gfx_300" "$gfx_301" "$gfx_302"; do
-    if echo "$gfx_class" | egrep -q "8086"; then
-      # Intel detected
-      has_intel=true
-    fi
-    if echo "$gfx_class" | egrep -q "10de"; then
-      # Nvidia detected
-      has_nvidia=true
-    fi
-done
-
-if ! $has_intel || ! $has_nvidia; then
-    echo "Sorry we only support Intel+Nvidia" \
-         >> $LOG 2>&1
+    echo "No offloading required. Abort" >> $LOG 2>&1
     exit 0
 fi
 
-echo "yes"

commit 2fdefeb5ea85a043af93c1e107ff6019551a15a4
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Mar 14 16:16:42 2014 +0100

    prime-supported: do not check pci class 0x0380

diff --git a/prime-supported b/prime-supported
index c7c7274..1203646 100755
--- a/prime-supported
+++ b/prime-supported
@@ -64,12 +64,11 @@ cards="$(lspci -n)"
 gfx_300="$(echo "$cards" | grep 300)"
 gfx_301="$(echo "$cards" | grep 301)"
 gfx_302="$(echo "$cards" | grep 302)"
-gfx_380="$(echo "$cards" | grep 380)"
 
 has_nvidia=false
 has_intel=false
 
-for gfx_class in "$gfx_300" "$gfx_301" "$gfx_302" "$gfx_380"; do
+for gfx_class in "$gfx_300" "$gfx_301" "$gfx_302"; do
     if echo "$gfx_class" | egrep -q "8086"; then
       # Intel detected
       has_intel=true

commit 4e745a9035bfbe6c4ea774bd85f9d9cc34b67467
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Mar 14 16:15:47 2014 +0100

    Start work on 0.6.2

diff --git a/debian/changelog b/debian/changelog
index add2854..9af1ec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.6.2) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 14 Mar 2014 16:15:37 +0100
+
 nvidia-prime (0.6.1) trusty; urgency=medium
 
   * debian/preinst.in, debian/rules:

commit d2ae6bc77c0bd1fa51e2bbdc380941962913682f
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Mar 13 17:14:24 2014 +0100

    Release 0.6.1

diff --git a/debian/changelog b/debian/changelog
index d2b4f1f..add2854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-nvidia-prime (0.6.1) UNRELEASED; urgency=medium
+nvidia-prime (0.6.1) trusty; urgency=medium
 
-  * 
+  * debian/preinst.in, debian/rules:
+    - Move the lightdm configuration file from /etc to /usr/share.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Thu, 13 Mar 2014 16:47:32 +0100
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 13 Mar 2014 17:13:50 +0100
 
 nvidia-prime (0.6) trusty; urgency=low
 

commit 47bb099e78250014fa4361b74840fad2b62049b2
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Mar 13 17:02:54 2014 +0100

    Move the lightdm configuration file from /etc to /usr/share

diff --git a/debian/preinst.in b/debian/preinst.in
index 5da893a..5fbef15 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -83,6 +83,12 @@ case "$1" in
             fi
         fi
 
+        # Remove the lightdm config file from /etc
+        if dpkg-maintscript-helper supports rm_conffile; then
+            dpkg-maintscript-helper rm_conffile \
+            /etc/lightdm/lightdm.conf.d/90-nvidia.conf 0.6.1~ -- "$@"
+        fi
+
         if [ ! -f /etc/prime-discrete ]; then
             echo "on" > /etc/prime-discrete
         fi
diff --git a/debian/rules b/debian/rules
index 9e2f291..c4cb45b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ misc_dir := /usr/share/$(PKG_name)
 
 # New snippets for Lightdm in Ubuntu >= 13.04
 PKG_lightdm_config_filename := 90-nvidia.conf
-PKG_lightdm_config_dir := /etc/lightdm/lightdm.conf.d
+PKG_lightdm_config_dir := /usr/share/lightdm/lightdm.conf.d
 PKG_lightdm_config_file := $(PKG_lightdm_config_dir)/$(PKG_lightdm_config_filename)
 
 XORG_CONF := /etc/X11/xorg.conf

commit dfb41442c9a869ddee74978e53f77d47b6c09d77
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Mar 13 16:48:12 2014 +0100

    Start work on 0.6.1

diff --git a/debian/changelog b/debian/changelog
index 3e825d0..d2b4f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.6.1) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 13 Mar 2014 16:47:32 +0100
+
 nvidia-prime (0.6) trusty; urgency=low
 
   * debian/control:

commit ec18994a2e9dc6ce09e986e419f0212042b62696
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Mar 6 09:23:55 2014 +0100

    Release 0.6

diff --git a/debian/changelog b/debian/changelog
index 01b1b5a..3e825d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-nvidia-prime (0.6) UNRELEASED; urgency=low
+nvidia-prime (0.6) trusty; urgency=low
 
-  * 
+  * debian/control:
+    - Breaks: ubuntu-drivers-common (<< 1:0.2.89).
+  * Add support for the new ubuntu-drivers-common. The gpu-manager
+    will take care of most of the work. We only need to tell
+    lightdm that we want to offload rendering, and to run the
+    gpu-manager on log out.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Tue, 04 Mar 2014 16:27:22 +0100
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 06 Mar 2014 09:19:12 +0100
 
 nvidia-prime (0.5.7) trusty; urgency=low
 

commit 6691d60338caeb4bb0c9b5376e7402e8201bc160
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Mar 6 09:18:35 2014 +0100

    debian/control: Breaks: ubuntu-drivers-common (<< 1:0.2.89)

diff --git a/debian/control b/debian/control
index 5d9a4cb..e682213 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Depends: lightdm (>= 1.9.1) | gdm | kdm, upstart, bbswitch-dkms,
 Conflicts: hybrid-graphics
 Replaces: hybrid-graphics
 Provides: hybrid-graphics
+Breaks: ubuntu-drivers-common (<< 1:0.2.89)
 Description: Tools to enable NVIDIA's Prime
  This is a set of tools which will enable
  NVIDIA's Prime on MUXless systems.

commit 83e1c9b58b2b23ef30a42903a2e25bab21f7301b
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Mar 4 16:54:51 2014 +0100

    Add support for the new ubuntu-drivers-common

diff --git a/debian/install.in b/debian/install.in
index 283a066..b23f31c 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,10 +1,7 @@
 #LIGHTDM_CONF_FILENAME# #LIGHTDM_CONF_DIR#
-xorg.template #MISC_DIR#
-xorg_legacy.template #MISC_DIR#
 prime-quirks #MISC_DIR#
 prime-offload /sbin
 prime-switch /sbin
-prime-xconfig /sbin
 get-quirk-options /sbin
 prime-select /usr/bin
 prime-supported /usr/bin
diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index fc4a2d7..18cc643 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -5,10 +5,6 @@
 #
 # NVIDIA PRIME - Power Saving Mode
 #
-# We need to make sure that bbswitch is loaded and
-# that the NVIDIA card is disabled before lightdm
-# starts X if system settings require so.
-#
 # On system shutdown we remove bbswitch and re-enable
 # the NVIDIA card.
 #
@@ -24,9 +20,6 @@ emits bbswitch-ready
 
 script
     LOG=/var/log/nvidia-prime-upstart.log
-    prime_settings=/etc/prime-discrete
-    prime_power=/proc/acpi/bbswitch
-    force_prime=/etc/force-prime
     prime_supported=/usr/bin/prime-supported
 
     # Remove any previous logs
@@ -43,75 +36,6 @@ script
         /usr/bin/start-nvidia-persistenced
         exit 0
     fi
-
-    if lsmod | grep nouveau > /dev/null; then
-        # exit if nouveau is in use
-        echo "Sorry but nvidia-prime does not work with the nouveau driver" \
-             >> $LOG 2>&1
-        exit 0
-    fi
-
-    if [ ! -e $prime_settings ]; then
-        echo "No settings for nvidia-prime can be found in $prime_settings" \
-         >> $LOG 2>&1
-        exit 0
-    fi
-
-    if [ ! -e $prime_power ]; then
-        echo "No bbswitch can be found 1st attempt" \
-         >> $LOG 2>&1
-        opts="`/sbin/get-quirk-options`"
-        # Load bbswitch
-        /sbin/modprobe bbswitch load_state=-1 unload_state=1 "$opts" || true
-        # Try again
-        if [ ! -e $prime_power ]; then
-            echo "No bbswitch can be found 2nd attempt" \
-                  >> $LOG 2>&1
-            exit 0
-        fi
-    fi
-
-    nvidia_status="`cat $prime_power | cut -d " " -f2`"
-    action="`cat $prime_settings`"
-
-    # We support both uppercase and lowercase
-    action="$(echo "$action" | /usr/bin/tr '[:upper:]' '[:lower:]')"
-
-    if [ "$action" = "on" ]; then
-        echo "Configuring xorg.conf" \
-         >> $LOG 2>&1
-        /sbin/prime-xconfig on
-        echo "Configuring alternatives" \
-         >> $LOG 2>&1
-        # Make sure the alternatives are in sync
-        /usr/bin/prime-select nvidia  \
-         >> $LOG 2>&1
-    elif [ "$action" = "off" ]; then
-        echo "Moving xorg.conf away" \
-         >> $LOG 2>&1
-        /sbin/prime-xconfig off
-        echo "Configuring alternatives" \
-         >> $LOG 2>&1
-        # Make sure the alternatives are in sync
-        /usr/bin/prime-select intel  \
-         >> $LOG 2>&1
-
-        # Do we need to take action?
-        if [ "$action" = "$nvidia_status" ]; then
-            echo "No action required to get nvidia-prime to work" \
-             >> $LOG 2>&1
-            exit 0
-        fi
-
-        # Disable the card
-        echo "Disabling the NVIDIA card" \
-         >> $LOG 2>&1
-        # Tell nvidia-persistenced the nvidia card is about
-        # to be switched off
-        /sbin/initctl emit nvidia-off
-        /sbin/rmmod nvidia || true
-        echo "OFF" > /proc/acpi/bbswitch
-    fi
 end script
 
 pre-stop script
diff --git a/prime-switch b/prime-switch
index b419daf..c645f55 100755
--- a/prime-switch
+++ b/prime-switch
@@ -17,100 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-LOG=/var/log/prime-switch.log
-prime_settings=/etc/prime-discrete
-prime_power=/proc/acpi/bbswitch
-force_prime=/etc/force-prime
-prime_supported=/usr/bin/prime-supported
-
-# Remove any previous logs
-rm -f $LOG
-
-# Check hardware support here
-supported="`$prime_supported`"
-if [ -z "$supported" ]; then
-    echo "Sorry but your hardware configuration is not supported" \
-         >> $LOG 2>&1
-    exit 0
-fi
-
-if lsmod | grep nouveau > /dev/null; then
-    # Exit if nouveau is in use
-    echo "Sorry but nvidia-prime does not work with the nouveau driver" \
-         >> $LOG 2>&1
-    exit 0
-fi
-
-if [ ! -e $prime_settings ]; then
-    echo "No settings for prime can be found in $prime_settings" \
-         >> $LOG 2>&1
-    exit 0
-fi
-
-if ! lsmod | grep bbswitch > /dev/null; then
-    opts="`/sbin/get-quirk-options`"
-    # Try to load bbswitch
-    /sbin/modprobe bbswitch load_state=-1 unload_state=1 "$opts" || true
-fi
-
-if [ ! -e $prime_power ]; then
-    # If we get here there is no bbswitch module
-    echo "No bbswitch can be found" \
-         >> $LOG 2>&1
-    exit 0
-fi
-
-nvidia_status="`cat $prime_power | cut -d " " -f2`"
-action="`cat $prime_settings`"
-# We support both uppercase and lowercase
-action="$(echo "$action" | /usr/bin/tr '[:upper:]' '[:lower:]')"
-
-# Always set up xorg.conf
-if [ "$action" = "on" ]; then
-    echo "Configuring xorg.conf" \
-     >> $LOG 2>&1
-    /sbin/prime-xconfig on
-    echo "Configuring alternatives" \
-     >> $LOG 2>&1
-    # Make sure the alternatives are in sync
-    /usr/bin/prime-select nvidia
-elif [ "$action" = "off" ]; then
-    echo "Moving xorg.conf away" \
-     >> $LOG 2>&1
-    /sbin/prime-xconfig off
-    echo "Configuring alternatives" \
-     >> $LOG 2>&1
-    # Make sure the alternatives are in sync
-    /usr/bin/prime-select intel
-fi
-
-# Do we need to call bbswitch?
-if [ "$action" = "$nvidia_status" ]; then
-    echo "No action required to get PRIME to work" \
-         >> $LOG 2>&1
-    exit 0
-fi
-
-if [ "$action" = "on" ]; then
-    echo "Enabling the NVIDIA card" \
-         >> $LOG 2>&1
-    echo "ON" > /proc/acpi/bbswitch
-    /sbin/modprobe nvidia || true
-    # Tell nvidia-persistence bbswitch is ready
-    /sbin/initctl emit bbswitch-ready
-    exit 0
-elif [ "$action" = "off" ]; then
-    echo "Disabling the NVIDIA card" \
-         >> $LOG 2>&1
-    # Tell nvidia-persistenced the nvidia-card is about
-    # to be switched off
-    /sbin/initctl emit nvidia-off
-    /sbin/rmmod nvidia || true
-    echo "OFF" > /proc/acpi/bbswitch
-    exit 0
-else
-    echo "\"$action\" is not a valid action for PRIME" \
-         >> $LOG 2>&1
-    exit 0
-fi
 
+# Call the GPU manager
+/usr/bin/gpu-manager --log /var/log/gpu-manager.log
+exit 0
diff --git a/prime-xconfig b/prime-xconfig
deleted file mode 100755
index e8f50a7..0000000
--- a/prime-xconfig
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2013 Canonical Ltd.
-#
-# Author: Alberto Milone <alberto.milone@canonical.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-nv_get_id() {
-    bus_id=""
-    nvidia_id=""
-    pattern="10de"
-    for devclass in "300" "301" "302" "380"; do
-        nvidia_id="$(lspci -Dn | grep $devclass | grep $pattern | cut -d" " -f1 | sed s/\\./:/g)"
-        if [ -n "$nvidia_id" ]; then
-            # We have found the device
-            break
-        fi
-    done
-
-    id_0="$(echo $nvidia_id | cut -d: -f1)"
-    id_1="$(echo $nvidia_id | cut -d: -f2)"
-    id_2="$(echo $nvidia_id | cut -d: -f3)"
-    id_3="$(echo $nvidia_id | cut -d: -f4)"
-
-    id_0="${id_0:-0}"
-    id_1="${id_1:-0}"
-    id_2="${id_2:-0}"
-    id_3="${id_3:-0}"
-
-    # lspci -Dn reports: domain:bus:slot.function, with all values in hex
-    # xf86ParsePciBusString expects: bus@domain:slot:function, in decimal
-
-    printf "PCI:%d@%d:%d:%d\n" "0x${id_1}" "0x${id_0}" "0x${id_2}" "0x${id_3}"
-}
-
-# The first nvidia series which works when no displays are
-# connected when X starts
-empty_initial_ver=331
-
-# Check the nvidia driver series in use
-current_ver="`update-alternatives --query x86_64-linux-gnu_gl_conf | \
-             grep ^Value | sed 's/[^0-9]//g'`"
-
-if [ -n "$current_ver" ] && \
-   [ $current_ver -ge $empty_initial_ver ]; then
-   template="xorg.template"
-else
-   template="xorg_legacy.template"
-fi
-
-xorg_conf="/etc/X11/xorg.conf"
-xorg_template="/usr/share/nvidia-prime/$template"
-
-action="$1"
-
-if [ "$action" = "on" ]; then
-    # Get the BusID of NVIDIA
-    bus_id=$(nv_get_id)
-    # Set up a xorg.conf
-    sed -e "s|#BUSID#|$bus_id|g" \
-    $xorg_template > $xorg_conf
-elif [ "$action" = "off" ]; then
-    # Move away xorg.conf
-    now=$(date +"%m%d%Y")
-    if [ -f "$xorg_conf" ]; then
-        mv $xorg_conf $xorg_conf.$now
-    fi
-fi
diff --git a/xorg.template b/xorg.template
deleted file mode 100644
index 8d7273d..0000000
--- a/xorg.template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
-
-Section "ServerLayout"
-    Identifier "layout"
-    Screen 0 "nvidia"
-    Inactive "intel"
-EndSection
-
-Section "Device"
-    Identifier "nvidia"
-    Driver "nvidia"
-    BusID "#BUSID#"
-EndSection
-
-Section "Screen"
-    Identifier "nvidia"
-    Device "nvidia"
-    # The internal display might not be connected
-    # to the nvidia card but we definitely want
-    # to be able to connect external displays later
-    #Option "AllowEmptyInitialConfiguration" "on"
-    Option "UseDisplayDevice" "none"
-EndSection
-
-Section "Device"
-    Identifier "intel"
-    Driver "modesetting"
-EndSection
-
-Section "Screen"
-    Identifier "intel"
-    Device "intel"
-EndSection
diff --git a/xorg_legacy.template b/xorg_legacy.template
deleted file mode 100644
index 5af010b..0000000
--- a/xorg_legacy.template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
-
-Section "ServerLayout"
-    Identifier "layout"
-    Screen 0 "nvidia"
-    Inactive "intel"
-EndSection
-
-Section "Device"
-    Identifier "nvidia"
-    Driver "nvidia"
-    BusID "#BUSID#"
-EndSection
-
-Section "Screen"
-    Identifier "nvidia"
-    Device "nvidia"
-    # Uncomment this line if your computer has no display devices connected to
-    # the NVIDIA GPU.  Leave it commented if you have display devices
-    # connected to the NVIDIA GPU that you would like to use.
-    Option "UseDisplayDevice" "none"
-EndSection
-
-Section "Device"
-    Identifier "intel"
-    Driver "modesetting"
-EndSection
-
-Section "Screen"
-    Identifier "intel"
-    Device "intel"
-EndSection

commit 1be1c2623ba31571b9f8f9eb038c68a0f753809a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Mar 4 16:27:35 2014 +0100

    Start work on 0.6

diff --git a/debian/changelog b/debian/changelog
index 4c0053c..01b1b5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.6) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 04 Mar 2014 16:27:22 +0100
+
 nvidia-prime (0.5.7) trusty; urgency=low
 
   * debian/preinst.in:

commit ab5cf418506e0509ba63d70de54f9911013172a6
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Feb 21 14:50:37 2014 +0100

    Release 0.5.7

diff --git a/debian/changelog b/debian/changelog
index 676dacc..4c0053c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-nvidia-prime (0.5.7) UNRELEASED; urgency=low
+nvidia-prime (0.5.7) trusty; urgency=low
 
-  * 
+  * debian/preinst.in:
+    - Do not remove the lightdm configuration file.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Fri, 21 Feb 2014 13:56:52 +0100
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 21 Feb 2014 14:49:59 +0100
 
 nvidia-prime (0.5.6) trusty; urgency=low
 

commit d14dd56ff148c983486ddc7d9d94ed875a3c76d1
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Feb 21 14:33:04 2014 +0100

    debian/preinst.in: do not remove the configuration file

diff --git a/debian/preinst.in b/debian/preinst.in
index a7a17a2..5da893a 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -83,10 +83,6 @@ case "$1" in
             fi
         fi
 
-        # Clean up the old configuration file
-        # that we used to ship in /etc
-        rm -f /etc/lightdm/lightdm.conf.d/90-nvidia.conf
-
         if [ ! -f /etc/prime-discrete ]; then
             echo "on" > /etc/prime-discrete
         fi

commit 37e15890e0c3359126f5a96247b69f7fad6a0b3a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Feb 21 13:57:05 2014 +0100

    Start work on 0.5.7

diff --git a/debian/changelog b/debian/changelog
index 87b89d4..676dacc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.5.7) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 21 Feb 2014 13:56:52 +0100
+
 nvidia-prime (0.5.6) trusty; urgency=low
 
   [ Daniel Dadap ]

commit 0b25ad6639efa7ec4d9cdcdfb9064292bebd691a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Feb 21 09:54:20 2014 +0100

    Release 0.5.6

diff --git a/debian/changelog b/debian/changelog
index 4c46297..87b89d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,28 @@
-nvidia-prime (0.5.6) UNRELEASED; urgency=low
+nvidia-prime (0.5.6) trusty; urgency=low
 
-  * 
-
- -- Alberto Milone <alberto.milone@canonical.com>  Fri, 21 Feb 2014 09:46:07 +0100
+  [ Daniel Dadap ]
+  * prime-xconfig:
+    - Format the BusID string correctly (LP: #1282796).
+      The BusID string created by prime-xconfig had several problems:
+      1) It was missing the bus type "PCI", as recommended by
+         xorg.conf(5).
+      2) Values were written in hexadecimal, as reported by lspci,
+         instead of decimal, as expected by the server. (See the
+         comment at the top of xf86ParsePciBusString().)
+      3) The PCI domain was not specified.
+      Giving the BusID string in the wrong format could cause the X
+      server to fail to parse the BusID, or to parse numbers in the
+      wrong base. On systems with more than one PCI domain, `lspci -n`
+      output would include the domain number, which is omitted by
+      default on systems with only one PCI domain. nv_get_id()
+      expects the bus number to be the first field, which would not be
+      correct when `lspci -n` reports the domain, as it does on
+      systems with multiple domains.
+      Fix these issues by always reporting the domain with `lspci -Dn`
+      and using it in the BusID string, prepending "PCI:" to the
+      BusID string, and printing all numeric values in decimal.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 21 Feb 2014 09:50:34 +0100
 
 nvidia-prime (0.5.5) trusty; urgency=low
 

commit bfce702c2a8af7ea0313a477e44645ccf294f233
Author: Daniel Dadap <ddadap@nvidia.com>
Date:   Thu Feb 20 10:58:20 2014 -0600

    prime-xconfig: format the BusID string correctly
    
    The BusID string created by prime-xconfig had several problems:
    
    1) It was missing the bus type "PCI", as recommended by xorg.conf(5).
    2) Values were written in hexadecimal, as reported by lspci, instead
       of decimal, as expected by the server. (See the comment at the top
       of xf86ParsePciBusString().)
    3) The PCI domain was not specified.
    
    Giving the BusID string in the wrong format could cause the X server
    to fail to parse the BusID, or to parse numbers in the wrong base.
    On systems with more than one PCI domain, `lspci -n` output would
    include the domain number, which is omitted by default on systems
    with only one PCI domain. nv_get_id() expects the bus number to be
    the first field, which would not be correct when `lspci -n` reports
    the domain, as it does on systems with multiple domains.
    
    Fix these issues by always reporting the domain with `lspci -Dn`
    and using it in the BusID string, prepending "PCI:" to the BusID
    string, and printing all numeric values in decimal.
    
    Signed-off-by: Daniel Dadap <ddadap@nvidia.com>
    Reviewed-by:   Aaron Plattner <aplattner@nvidia.com>
    Reviewed-by:   Robert Morell <rmorell@nvidia.com>

diff --git a/prime-xconfig b/prime-xconfig
index 287218e..e8f50a7 100755
--- a/prime-xconfig
+++ b/prime-xconfig
@@ -23,7 +23,7 @@ nv_get_id() {
     nvidia_id=""
     pattern="10de"
     for devclass in "300" "301" "302" "380"; do
-        nvidia_id="$(lspci -n | grep $devclass | grep $pattern | cut -d" " -f1 | sed s/\\./:/g)"
+        nvidia_id="$(lspci -Dn | grep $devclass | grep $pattern | cut -d" " -f1 | sed s/\\./:/g)"
         if [ -n "$nvidia_id" ]; then
             # We have found the device
             break
@@ -33,12 +33,17 @@ nv_get_id() {
     id_0="$(echo $nvidia_id | cut -d: -f1)"
     id_1="$(echo $nvidia_id | cut -d: -f2)"
     id_2="$(echo $nvidia_id | cut -d: -f3)"
+    id_3="$(echo $nvidia_id | cut -d: -f4)"
 
     id_0="${id_0:-0}"
     id_1="${id_1:-0}"
     id_2="${id_2:-0}"
+    id_3="${id_3:-0}"
 
-    printf "%x:%x:%x\n" "0x${id_0}" "0x${id_1}" "0x${id_2}"
+    # lspci -Dn reports: domain:bus:slot.function, with all values in hex
+    # xf86ParsePciBusString expects: bus@domain:slot:function, in decimal
+
+    printf "PCI:%d@%d:%d:%d\n" "0x${id_1}" "0x${id_0}" "0x${id_2}" "0x${id_3}"
 }
 
 # The first nvidia series which works when no displays are

commit 3faa7623154771739d2eb9b29ec9342bdebf26fb
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Feb 21 09:46:22 2014 +0100

    Start work on 0.5.6

diff --git a/debian/changelog b/debian/changelog
index 645869b..4c46297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.5.6) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 21 Feb 2014 09:46:07 +0100
+
 nvidia-prime (0.5.5) trusty; urgency=low
 
   * debian/rules:

commit 3050aa94ae9ed8b99be276543451d76d221baa7f
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Jan 31 16:12:59 2014 +0100

    Release 0.5.5

diff --git a/debian/changelog b/debian/changelog
index faa468d..645869b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-nvidia-prime (0.5.5) UNRELEASED; urgency=low
+nvidia-prime (0.5.5) trusty; urgency=low
 
-  * 
+  * debian/rules:
+    - Fix path to lightdm configuration files.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Wed, 29 Jan 2014 13:21:35 +0100
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 31 Jan 2014 16:12:44 +0100
 
 nvidia-prime (0.5.4) trusty; urgency=low
 

commit df58ac9b5150c135cf1ed3f02574eb7f9236ab65
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Jan 31 15:58:25 2014 +0100

    debian/rules: fix path to lightdm configuration files

diff --git a/debian/rules b/debian/rules
index 4178a9b..9e2f291 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ misc_dir := /usr/share/$(PKG_name)
 
 # New snippets for Lightdm in Ubuntu >= 13.04
 PKG_lightdm_config_filename := 90-nvidia.conf
-PKG_lightdm_config_dir := /usr/share/lightdm.conf.d
+PKG_lightdm_config_dir := /etc/lightdm/lightdm.conf.d
 PKG_lightdm_config_file := $(PKG_lightdm_config_dir)/$(PKG_lightdm_config_filename)
 
 XORG_CONF := /etc/X11/xorg.conf

commit 69cfa435d8971f01296a2a20dd6d16e07f020042
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Jan 29 13:22:54 2014 +0100

    Start work on 0.5.5

diff --git a/debian/changelog b/debian/changelog
index 593681a..faa468d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.5.5) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 29 Jan 2014 13:21:35 +0100
+
 nvidia-prime (0.5.4) trusty; urgency=low
 
   * Do not touch lightdm.conf any more on anything newer than Precise.

commit 8923846e4150ea6b1acd14ac1e5a876be3533a16
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Jan 28 17:34:37 2014 +0100

    Release 0.5.4

diff --git a/debian/changelog b/debian/changelog
index 3343df7..593681a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-nvidia-prime (0.5.4) UNRELEASED; urgency=low
-
-  * 
-
- -- Alberto Milone <alberto.milone@canonical.com>  Tue, 28 Jan 2014 12:05:37 +0100
+nvidia-prime (0.5.4) trusty; urgency=low
+
+  * Do not touch lightdm.conf any more on anything newer than Precise.
+    90-nvidia.conf now contains only the relevant settings for PRIME
+    (LP: #1267442).
+  * Also remove any previous lightdm.conf that nvidia-prime might
+    have messed up.
+  * Major packaging clean-up. The variable in debian/rules and in
+    templates have clearer names now.
+  * Clean up the old 90-nvidia.conf that we used to ship in /etc.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 28 Jan 2014 17:30:43 +0100
 
 nvidia-prime (0.5.3) trusty; urgency=low
 

commit cc24849eea6545d75090fed5686d690c5c5553b1
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Jan 28 17:18:05 2014 +0100

    debian/preinst.in: clean up the old configuration file that we used to ship in /etc

diff --git a/debian/preinst.in b/debian/preinst.in
index 5da893a..a7a17a2 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -83,6 +83,10 @@ case "$1" in
             fi
         fi
 
+        # Clean up the old configuration file
+        # that we used to ship in /etc
+        rm -f /etc/lightdm/lightdm.conf.d/90-nvidia.conf
+
         if [ ! -f /etc/prime-discrete ]; then
             echo "on" > /etc/prime-discrete
         fi

commit 8dbe70666a2e6cf07371b5179c6996aebcfc02be
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Jan 28 16:27:24 2014 +0100

    Major packaging clean-up
    
    The variable in debian/rules and in templates have clearer names now

diff --git a/debian/dirs.in b/debian/dirs.in
index ba4c782..b03e70a 100644
--- a/debian/dirs.in
+++ b/debian/dirs.in
@@ -1,4 +1,4 @@
 /etc/X11
-#LIGHTDM_CUSTOM_CONF_DIR#
+#MISC_DIR#
+#LIGHTDM_LEGACY_CONF_DIR#
 #LIGHTDM_CONF_DIR#
-#LIGHTDM_CONF_DIR_D#
diff --git a/debian/install.in b/debian/install.in
index 2a0a108..283a066 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,7 +1,7 @@
-#LIGHTDM_CONF_FILENAME_D# #LIGHTDM_CONF_DIR_D#
-xorg.template #LIGHTDM_CUSTOM_CONF_DIR#
-xorg_legacy.template #LIGHTDM_CUSTOM_CONF_DIR#
-prime-quirks #LIGHTDM_CUSTOM_CONF_DIR#
+#LIGHTDM_CONF_FILENAME# #LIGHTDM_CONF_DIR#
+xorg.template #MISC_DIR#
+xorg_legacy.template #MISC_DIR#
+prime-quirks #MISC_DIR#
 prime-offload /sbin
 prime-switch /sbin
 prime-xconfig /sbin
diff --git a/debian/postrm.in b/debian/postrm.in
index 2ab5f3f..38c9162 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -20,11 +20,12 @@ set -e
 
 xorg_conf="#XORG_CONF#"
 now=$(date +"%m%d%Y")
-lightdm_orig_conf=#LIGHTDM_CONF_FILE#
+lightdm_orig_conf=#LIGHTDM_LEGACY_CONF_FILE#
 host_arch_main=#HOST_ARCH_MAIN#
 host_arch_other=#HOST_ARCH_OTHER#
 
 remove_hybrid_script () {
+    # Precise only!
     if [ -s "$lightdm_orig_conf" ]; then
         # Get the file
         lightdm_orig="$(cat $lightdm_orig_conf)"
@@ -65,15 +66,17 @@ case "$1" in
         fi
 
         if [ ! "$1" = "upgrade" ]; then
-            # Remove the display-setup-script line
-            remove_hybrid_script
+            if [ "$os_release" = "precise" ]; then
+                # Remove the display-setup-script line
+                remove_hybrid_script
+            fi
 
             # Remove the settings
             rm -f /etc/prime-discrete
 
             # Restore the alternatives to a non prime
             # configuration, if possible
-            os_release="$(lsb_release -c | cut -d: -f2 | sed "s/\t//g")"
+            os_release="$(lsb_release -cs)"
             main_arch=""$host_arch_main"_gl_conf"
             other_arch=""$host_arch_other"_gl_conf"
             main_alternative="$(get_current_alternative "$main_arch")"
diff --git a/debian/preinst.in b/debian/preinst.in
index fd9f26e..5da893a 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -13,7 +13,7 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-lightdm_orig_conf=#LIGHTDM_CONF_FILE#
+lightdm_orig_conf=#LIGHTDM_LEGACY_CONF_FILE#
 default_display_manager_file=/etc/X11/default-display-manager
 
 add_hybrid_script () {
diff --git a/debian/rules b/debian/rules
index c486962..4178a9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,21 +10,21 @@
 #export DH_VERBOSE=1
 
 PKG_name = $(shell dh_listpackages)
-TMP     = $(CURDIR)/debian/tmp
-PKG_lightdm_config_dir := /etc/lightdm
-PKG_lightdm_config_file := $(PKG_lightdm_config_dir)/lightdm.conf
-LIGHTDM_CONF_DIR := $(TMP)$(PKG_lightdm_config_dir)
-PKG_lightdm_custom_config_dir := /usr/share/$(PKG_name)
-PKG_lightdm_custom_config_file := $(PKG_lightdm_custom_config_dir)/lightdm.conf
-LIGHTDM_CUSTOM_CONF_DIR := $(TMP)$(PKG_lightdm_custom_config_dir)
-# This doesn't work in Precise but it's harmless
-# We need it to disable XMir
-PKG_lightdm_config_filename_d := 90-nvidia.conf
-PKG_lightdm_config_dir_d := $(PKG_lightdm_config_dir)/lightdm.conf.d
-PKG_lightdm_config_file_d := $(PKG_lightdm_config_dir_d)/$(PKG_lightdm_config_filename_d)
+
+# Legacy configuration file for Lightdm
+# useful only in Precise
+PKG_lightdm_legacy_config_dir := /etc/lightdm
+PKG_lightdm_legacy_config_file := $(PKG_lightdm_legacy_config_dir)/lightdm.conf
+
+misc_dir := /usr/share/$(PKG_name)
+
+# New snippets for Lightdm in Ubuntu >= 13.04
+PKG_lightdm_config_filename := 90-nvidia.conf
+PKG_lightdm_config_dir := /usr/share/lightdm.conf.d
+PKG_lightdm_config_file := $(PKG_lightdm_config_dir)/$(PKG_lightdm_config_filename)
 
 XORG_CONF := /etc/X11/xorg.conf
-XORG_TEMPLATE := $(PKG_lightdm_custom_config_dir)/xorg.template
+XORG_TEMPLATE := $(misc_dir)/xorg.template
 
 HOST_ARCH_MAIN ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 # If the host is i386 set OTHER_ARCH to x86_64 and vice versa
@@ -44,14 +44,12 @@ regen-from-templates:
 		sed -e 's|#XORG_CONF#|$(XORG_CONF)|g' \
 			-e 's|#XORG_TEMPLATE#|$(XORG_TEMPLATE)|g' \
 			-e 's|#PKGNAME#|$(PKG_name)|g' \
+			-e "s|#LIGHTDM_LEGACY_CONF_FILE#|$(PKG_lightdm_legacy_config_file)|g" \
+			-e "s|#LIGHTDM_LEGACY_CONF_DIR#|$(PKG_lightdm_legacy_config_dir)|g" \
+			-e "s|#MISC_DIR#|$(misc_dir)|g" \
 			-e "s|#LIGHTDM_CONF_FILE#|$(PKG_lightdm_config_file)|g" \
 			-e "s|#LIGHTDM_CONF_DIR#|$(PKG_lightdm_config_dir)|g" \
-			-e "s|#LIGHTDM_CUSTOM_CONF_FILE#|$(PKG_lightdm_custom_config_file)|g" \
-			-e "s|#LIGHTDM_CUSTOM_CONF_DIR#|$(PKG_lightdm_custom_config_dir)|g" \
-			-e "s|#LIGHTDM_CONF_FILE_D#|$(PKG_lightdm_config_file_d)|g" \
-			-e "s|#LIGHTDM_CONF_DIR_D#|$(PKG_lightdm_config_dir_d)|g" \
-			-e "s|#LIGHTDM_CONF_FILENAME_D#|$(PKG_lightdm_config_filename_d)|g" \
-			-e "s|#PRIME_DIR#|$(PKG_lightdm_config_filename_d)|g" \
+			-e "s|#LIGHTDM_CONF_FILENAME#|$(PKG_lightdm_config_filename)|g" \
 			-e "s|#HOST_ARCH_MAIN#|$(HOST_ARCH_MAIN)|g" \
 			-e "s|#HOST_ARCH_OTHER#|$(HOST_ARCH_OTHER)|g" \
 		$$i.in > $$i; \

commit c21739a716ea638c23349cc93e950a78b999d4a2
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Jan 28 13:08:32 2014 +0100

    debian/preinst.in: do not touch lightdm.conf any more on anything newer than Precise
    
    Also remove any previous lightdm.conf that nvidia-prime might have messed up.
    
    90-nvidia.conf now contains the relevant settings for PRIME.

diff --git a/90-nvidia.conf b/90-nvidia.conf
index fe7bf1f..6ed970f 100644
--- a/90-nvidia.conf
+++ b/90-nvidia.conf
@@ -1,3 +1,6 @@
 [SeatDefaults]
 # Force using traditional X
 type=xlocal
+# Scripts to handle PRIME
+display-setup-script=/sbin/prime-offload
+display-stopped-script=/sbin/prime-switch
diff --git a/debian/preinst.in b/debian/preinst.in
index a120bbd..fd9f26e 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -17,54 +17,57 @@ lightdm_orig_conf=#LIGHTDM_CONF_FILE#
 default_display_manager_file=/etc/X11/default-display-manager
 
 add_hybrid_script () {
-    if [ -s "$lightdm_orig_conf" ]; then
-        # Get the file
-        lightdm_orig="$(cat $lightdm_orig_conf)"
+    if [ "`lsb_release -r -s`" = "12.04" ]; then
+        # Precise does not support separate config files
+        if [ -s "$lightdm_orig_conf" ]; then
+            # Get the file
+            lightdm_orig="$(cat $lightdm_orig_conf)"
 
-        # See if a display setup script is already
-        # in use
-        if echo "$lightdm_orig" | \
-             grep "display-setup-script"; then
-            echo "$lightdm_orig" | \
-            sed "s/.*display-setup-script.*/\
+            # See if a display setup script is already
+            # in use
+            if echo "$lightdm_orig" | \
+                 grep "display-setup-script"; then
+                echo "$lightdm_orig" | \
+                sed "s/.*display-setup-script.*/\
 display-setup-script\=\/sbin\/prime-offload/g" \
-            > "$lightdm_orig_conf"
-        else
-            # Add a line after the pattern
-            echo "$lightdm_orig" | \
-            sed '/.*user-session.*/ a\
+                > "$lightdm_orig_conf"
+            else
+                # Add a line after the pattern
+                echo "$lightdm_orig" | \
+                sed '/.*user-session.*/ a\
 display-setup-script\=\/sbin\/prime-offload' \
-            > "$lightdm_orig_conf"
-        fi
+                > "$lightdm_orig_conf"
+            fi
 
-        # Read the file again
-        lightdm_orig="$(cat $lightdm_orig_conf)"
+            # Read the file again
+            lightdm_orig="$(cat $lightdm_orig_conf)"
 
-        # See if a display stopped script is already
-        # in use
-        if echo "$lightdm_orig" | \
-             grep "display-stopped-script"; then
-            echo "$lightdm_orig" | \
-            sed "s/.*display-stopped-script.*/\
+            # See if a display stopped script is already
+            # in use
+            if echo "$lightdm_orig" | \
+                 grep "display-stopped-script"; then
+                echo "$lightdm_orig" | \
+                sed "s/.*display-stopped-script.*/\
 display-stopped-script\=\/sbin\/prime-switch/g" \
-            > "$lightdm_orig_conf"
-        else
-            # Add a line after the pattern
-            echo "$lightdm_orig" | \
-            sed '/.*display-setup-script.*/ a\
+                > "$lightdm_orig_conf"
+            else
+                # Add a line after the pattern
+                echo "$lightdm_orig" | \
+                sed '/.*display-setup-script.*/ a\
 display-stopped-script\=\/sbin\/prime-switch' \
-            > "$lightdm_orig_conf"
+                > "$lightdm_orig_conf"
+            fi
         fi
     else
-        # Let's create a configuration file
-        # from scratch
-        cat > $lightdm_orig_conf <<EOF
-[SeatDefaults]
-greeter-session=unity-greeter
-user-session=ubuntu
-display-setup-script=/sbin/prime-offload
-display-stopped-script=/sbin/prime-switch
-EOF
+        # Remove any configuration files that
+        # nvidia-prime might have changed in previous
+        # releases
+        if [ -s "$lightdm_orig_conf" ]; then
+            grep -e "display-setup-script=/sbin/prime-offload"  \
+                 -e "display-stopped-script=/sbin/prime-switch" \
+                 -q $lightdm_orig_conf && rm -f $lightdm_orig_conf \
+                 || true
+        fi
     fi
 }
 

commit 1299c7182a2320fb33a977174f474a18681e227e
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Jan 28 12:05:50 2014 +0100

    Start work on 0.5.4

diff --git a/debian/changelog b/debian/changelog
index d3ce4be..3343df7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.5.4) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 28 Jan 2014 12:05:37 +0100
+
 nvidia-prime (0.5.3) trusty; urgency=low
 
   * debian/postrm.in, debian/rules:

commit 0b0c361fa552c485598c1662aa8fef0527d49b99
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Jan 10 14:42:17 2014 +0100

    Release 0.5.3

diff --git a/debian/changelog b/debian/changelog
index 341ef1f..d3ce4be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-nvidia-prime (0.5.3) UNRELEASED; urgency=low
+nvidia-prime (0.5.3) trusty; urgency=low
 
-  * 
+  * debian/postrm.in, debian/rules:
+    - Avoid calling dpkg-architecture (LP: #1264611).
+  * prime-xconfig:
+    - Properly format hexadecimal parameters (LP: #1252667).
 
- -- Alberto Milone <alberto.milone@canonical.com>  Mon, 06 Jan 2014 18:45:15 +0100
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 10 Jan 2014 14:41:22 +0100
 
 nvidia-prime (0.5.2) trusty; urgency=low
 

commit 4705db63365c2e30ed8d711a03f92851183b70fc
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Jan 7 09:57:50 2014 +0100

    debian/postrm.in, debian/rules: avoid calling dpkg-architecture
    
    Fixes LP: #1264611

diff --git a/debian/postrm.in b/debian/postrm.in
index 10d7d14..2ab5f3f 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -21,6 +21,8 @@ set -e
 xorg_conf="#XORG_CONF#"
 now=$(date +"%m%d%Y")
 lightdm_orig_conf=#LIGHTDM_CONF_FILE#
+host_arch_main=#HOST_ARCH_MAIN#
+host_arch_other=#HOST_ARCH_OTHER#
 
 remove_hybrid_script () {
     if [ -s "$lightdm_orig_conf" ]; then
@@ -72,13 +74,6 @@ case "$1" in
             # Restore the alternatives to a non prime
             # configuration, if possible
             os_release="$(lsb_release -c | cut -d: -f2 | sed "s/\t//g")"
-            host_arch_main=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-            host_arch_other=$( (echo "$host_arch_main" | \
-                                grep "i386" >/dev/null) && \
-                                echo "$host_arch_main" | \
-                                sed "s/i386/x86_64/" || \
-                                echo "$host_arch_main" | \
-                                sed "s/x86_64/i386/")
             main_arch=""$host_arch_main"_gl_conf"
             other_arch=""$host_arch_other"_gl_conf"
             main_alternative="$(get_current_alternative "$main_arch")"
diff --git a/debian/rules b/debian/rules
index bd04abf..c486962 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,12 @@ PKG_lightdm_config_file_d := $(PKG_lightdm_config_dir_d)/$(PKG_lightdm_config_fi
 XORG_CONF := /etc/X11/xorg.conf
 XORG_TEMPLATE := $(PKG_lightdm_custom_config_dir)/xorg.template
 
+HOST_ARCH_MAIN ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# If the host is i386 set OTHER_ARCH to x86_64 and vice versa
+HOST_ARCH_OTHER := $(shell (echo "$(HOST_ARCH_MAIN)" | grep i386 >/dev/null) && \
+		echo "$(HOST_ARCH_MAIN)" | sed s/i386/x86_64/ || \
+		echo "$(HOST_ARCH_MAIN)" | sed s/x86_64/i386/)
+
 %:
 	dh $@
 
@@ -46,6 +52,8 @@ regen-from-templates:
 			-e "s|#LIGHTDM_CONF_DIR_D#|$(PKG_lightdm_config_dir_d)|g" \
 			-e "s|#LIGHTDM_CONF_FILENAME_D#|$(PKG_lightdm_config_filename_d)|g" \
 			-e "s|#PRIME_DIR#|$(PKG_lightdm_config_filename_d)|g" \
+			-e "s|#HOST_ARCH_MAIN#|$(HOST_ARCH_MAIN)|g" \
+			-e "s|#HOST_ARCH_OTHER#|$(HOST_ARCH_OTHER)|g" \
 		$$i.in > $$i; \
 	done
 

commit 8ea17f1220367d2b37d16b658096f6f9da6abc36
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Jan 6 18:52:09 2014 +0100

    prime-xconfig: properly format hexadecimal parameters
    
    Fixes LP: #1252667

diff --git a/prime-xconfig b/prime-xconfig
index 37248d6..287218e 100755
--- a/prime-xconfig
+++ b/prime-xconfig
@@ -34,7 +34,11 @@ nv_get_id() {
     id_1="$(echo $nvidia_id | cut -d: -f2)"
     id_2="$(echo $nvidia_id | cut -d: -f3)"
 
-    printf "%d:%d:%d\n" "${id_0#0}" "${id_1#0}" "${id_2#0}"
+    id_0="${id_0:-0}"
+    id_1="${id_1:-0}"
+    id_2="${id_2:-0}"
+
+    printf "%x:%x:%x\n" "0x${id_0}" "0x${id_1}" "0x${id_2}"
 }
 
 # The first nvidia series which works when no displays are

commit 9ca609f92a0061945edeff44200c39cb76ed80bb
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Jan 6 18:45:31 2014 +0100

    Start work on 0.5.3

diff --git a/debian/changelog b/debian/changelog
index a4aed86..341ef1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.5.3) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 06 Jan 2014 18:45:15 +0100
+
 nvidia-prime (0.5.2) trusty; urgency=low
 
   * debian/control:

commit dbf700b9b3a83a2566ad52b1b79433713147d63e
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Dec 20 16:13:59 2013 +0100

    Release 0.5.2

diff --git a/debian/changelog b/debian/changelog
index 23f7267..a4aed86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
-nvidia-prime (0.5.2) UNRELEASED; urgency=low
+nvidia-prime (0.5.2) trusty; urgency=low
 
-  * 
+  * debian/control:
+    - Add an alternative dependency on gdm and kdm
+      so that gdm or kdm users are not forced to install
+      lightdm now that nvidia depends on nvidia-prime.
+      This fixes only the single graphics card use case
+      (hybrid graphics won't still work without lightdm)
+      but it's a step in the right direction (LP: #1262068).
+  * debian/preinst.in:
+    - Set the lightdm configuration bits only if lightdm
+      is the default display manager.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Fri, 20 Dec 2013 12:49:46 +0100
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 20 Dec 2013 15:43:58 +0100
 
 nvidia-prime (0.5.1) trusty; urgency=low
 

commit 5a5fe84f59698c4042c2d6d94df838fef6a5aa3e
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Dec 20 14:59:51 2013 +0100

    debian/preinst.in: set the lightdm configuration bits only if lightdm is the default display manager
    
    This is a partial fix for LP: #1262068

diff --git a/debian/preinst.in b/debian/preinst.in
index 7202496..a120bbd 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -14,6 +14,7 @@ set -e
 # the debian-policy package
 
 lightdm_orig_conf=#LIGHTDM_CONF_FILE#
+default_display_manager_file=/etc/X11/default-display-manager
 
 add_hybrid_script () {
     if [ -s "$lightdm_orig_conf" ]; then
@@ -69,8 +70,15 @@ EOF
 
 case "$1" in
     install|upgrade)
-        # Insert the display-setup-script line
-        add_hybrid_script
+        if [ -e "$default_display_manager_file" ]; then
+            default_path="$(cat $default_display_manager_file)"
+            display_manager="${default_path##*/}"
+            # We currently support only lightdm
+            if [ "$display_manager" = "lightdm" ]; then
+                # Insert the display-*-script lines
+                add_hybrid_script
+            fi
+        fi
 
         if [ ! -f /etc/prime-discrete ]; then
             echo "on" > /etc/prime-discrete

commit a85c8e08832a79ddf2af290dc39df6efbd1488ab
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Dec 20 12:51:19 2013 +0100

    debian/control: add alternative dependency on gdm and kdm

diff --git a/debian/control b/debian/control
index 4631fa4..5d9a4cb 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Browser: http://github.com/tseliot/nvidia-prime
 
 Package: nvidia-prime
 Architecture: i386 amd64
-Depends: lightdm (>= 1.9.1), upstart, bbswitch-dkms,
+Depends: lightdm (>= 1.9.1) | gdm | kdm, upstart, bbswitch-dkms,
  pciutils, lsb-release, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: hybrid-graphics
 Replaces: hybrid-graphics

commit b219f41b5ef9a60cc6e27c014817d7757d74f8f4
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Dec 20 12:49:56 2013 +0100

    Start work on 0.5.2

diff --git a/debian/changelog b/debian/changelog
index 5c8ffb5..23f7267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.5.2) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 20 Dec 2013 12:49:46 +0100
+
 nvidia-prime (0.5.1) trusty; urgency=low
 
   * debian/nvidia-prime.upstart, prime-switch:

commit bff2dbf912ab36c6b1e8a316a5e6b13662fd82db
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Dec 17 10:27:17 2013 +0100

    Release 0.5.1

diff --git a/debian/changelog b/debian/changelog
index 683a5af..5c8ffb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-nvidia-prime (0.5.1) UNRELEASED; urgency=low
+nvidia-prime (0.5.1) trusty; urgency=low
 
-  * 
+  * debian/nvidia-prime.upstart, prime-switch:
+    - Send events to start and to stop the
+      nvidia-persistenced upstart job.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Thu, 12 Dec 2013 15:43:59 +0100
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 17 Dec 2013 10:26:25 +0100
 
 nvidia-prime (0.5) trusty; urgency=low
 

commit 065ca8b3d3a9512d97db751844b189774de60541
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Dec 12 15:54:57 2013 +0100

    debian/nvidia-prime.upstart, prime-switch: send events for the nvidia-persistenced upstart job

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index a0fe515..fc4a2d7 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -19,6 +19,9 @@ author		"Alberto Milone <alberto.milone@canonical.com>"
 start on starting lightdm
 stop on runlevel [016]
 
+emits nvidia-off
+emits bbswitch-ready
+
 script
     LOG=/var/log/nvidia-prime-upstart.log
     prime_settings=/etc/prime-discrete
@@ -34,6 +37,10 @@ script
     if [ -z "$supported" ]; then
         echo "Sorry but your hardware configuration is not supported" \
              >> $LOG 2>&1
+        # We're probably dealing with a system with a single
+        # NVIDIA card here, so we make sure to start nvidia-persistence
+        # with some delay
+        /usr/bin/start-nvidia-persistenced
         exit 0
     fi
 
@@ -99,6 +106,9 @@ script
         # Disable the card
         echo "Disabling the NVIDIA card" \
          >> $LOG 2>&1
+        # Tell nvidia-persistenced the nvidia card is about
+        # to be switched off
+        /sbin/initctl emit nvidia-off
         /sbin/rmmod nvidia || true
         echo "OFF" > /proc/acpi/bbswitch
     fi
diff --git a/prime-switch b/prime-switch
index d81e320..b419daf 100755
--- a/prime-switch
+++ b/prime-switch
@@ -96,10 +96,15 @@ if [ "$action" = "on" ]; then
          >> $LOG 2>&1
     echo "ON" > /proc/acpi/bbswitch
     /sbin/modprobe nvidia || true
+    # Tell nvidia-persistence bbswitch is ready
+    /sbin/initctl emit bbswitch-ready
     exit 0
 elif [ "$action" = "off" ]; then
     echo "Disabling the NVIDIA card" \
          >> $LOG 2>&1
+    # Tell nvidia-persistenced the nvidia-card is about
+    # to be switched off
+    /sbin/initctl emit nvidia-off
     /sbin/rmmod nvidia || true
     echo "OFF" > /proc/acpi/bbswitch
     exit 0

commit 17607f47c381081657173bdd1ad237a3a6e79564
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Dec 12 15:44:14 2013 +0100

    Start work on 0.5.1

diff --git a/debian/changelog b/debian/changelog
index 58c1ebf..683a5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.5.1) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 12 Dec 2013 15:43:59 +0100
+
 nvidia-prime (0.5) trusty; urgency=low
 
   * debian/control:

commit 383f8d0d6fa22e0c9c2bf4dbd9e83a12d8c16200
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Nov 27 12:13:08 2013 +0100

    Release 0.5

diff --git a/debian/changelog b/debian/changelog
index 89521d4..58c1ebf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,47 @@
-nvidia-prime (0.5) UNRELEASED; urgency=low
+nvidia-prime (0.5) trusty; urgency=low
 
-  * 
-
- -- Alberto Milone <alberto.milone@canonical.com>  Mon, 25 Nov 2013 19:14:37 +0100
+  * debian/control:
+    - Depend on bbswitch-dkms and upstart.
+    - Depend on lightdm (>= 1.9.1).
+    - Build only for i386 and amd64.
+  * debian/install.in:
+    - Install the new components.
+  * debian/nvidia-prime.upstart:
+    - Make sure that NVIDIA is always enabled on shutdown.
+      This will avoid issues with the BIOS.
+    - Make sure that bbswitch does not disable nvidia when
+      loading.
+    - Set up xorg.conf on boot.
+  * debian/preinst.in:
+    - Create a display-stopped-script entry in lightdm.conf.
+    - Create /etc/lightdm/hybrid_default.
+  * debian/postinst.in:
+    - Remove it.
+  * debian/postrm.in:
+    - Remove /etc/lightdm/hybrid_default on package removal.
+    - Remove the display-stopped-script entry from
+      lightdm.conf.
+    - Restore the non-prime related alternative on removal.
+  * New upstream release:
+    - Improved hardware detection. The package won't change
+      anything if the hardware configuration is not
+      supported. We only support laptops with NVIDIA
+      optimus hardware and nvidia driver >= 319
+      (LP: #1249067).
+    - More robust system to deal with xorg.conf. Broken
+      xorg.conf files will be automatically restored to
+      a configuration that works with hybrid graphics.
+      Whether on boot or on log out, we always try to make
+      sure that the system is configured correctly.
+    - Added prime-select switcher to switch between the
+      integrated and the discrete GPU. This allows users
+      to disable the discrete GPU to save power. Users'
+      settings are now saved and applied on log out and
+      on boot.
+    - Added a quirk system to pass custom options to the
+      bbswitch module (see /etc/prime-quirks).
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 04 Dec 2013 16:23:32 +0100
 
 nvidia-prime (0.4.2) trusty; urgency=low
 

commit 2f03043db74067369bf9565f61e4d690457809e5
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Dec 9 19:05:37 2013 +0100

    prime-select: do not trust ENV on boot and use full paths

diff --git a/prime-select b/prime-select
index b1e7442..643080d 100755
--- a/prime-select
+++ b/prime-select
@@ -47,7 +47,7 @@ class Alternatives:
     def __init__(self, master_link):
         self._open_drivers_alternative = 'mesa/ld.so.conf'
         self._open_egl_drivers_alternative = 'mesa-egl/ld.so.conf'
-        self._command = 'update-alternatives'
+        self._command = '/usr/bin/update-alternatives'
         self._master_link = master_link
 
         # Make sure that the PATH environment variable is set
@@ -125,7 +125,7 @@ class Alternatives:
     def ldconfig(self):
         '''Call ldconfig'''
         try:
-            subprocess.check_call(['ldconfig'])
+            subprocess.check_call(['/sbin/ldconfig'])
         except CalledProcessError:
             return False
         return True

commit f47c50b34d8f51f835993e358b5d9d1b6c02398a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Dec 5 11:30:35 2013 +0100

    debian/postrm.in: add missing quotation marks around strings

diff --git a/debian/postrm.in b/debian/postrm.in
index aa35bd5..10d7d14 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -40,10 +40,10 @@ remove_hybrid_script () {
 get_current_alternative() {
     master_link="$1"
     value=""
-    alternatives=$(update-alternatives --query $master_link 2>/dev/null)
+    alternatives="$(update-alternatives --query "$master_link" 2>/dev/null || true)"
     if [ -n "$alternatives" ]; then
         #status=$(echo "$alternatives" | grep "Status:" | sed "s/Status: //g")
-        value=$(echo "$alternatives" | grep "Value:" | sed "s/Value: //g")
+        value="$(echo "$alternatives" | grep "Value:" | sed "s/Value: //g")"
     fi
     echo "$value"
 }
@@ -69,8 +69,6 @@ case "$1" in
             # Remove the settings
             rm -f /etc/prime-discrete
 
-
-
             # Restore the alternatives to a non prime
             # configuration, if possible
             os_release="$(lsb_release -c | cut -d: -f2 | sed "s/\t//g")"

commit f9b9a1137cd5a3851080e7073a34587dc956684a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Dec 5 10:31:45 2013 +0100

    debian/postrm.in: set the alternatives back to auto mode on systems other than precise
    
    Also call ldconfig afterwards

diff --git a/debian/postrm.in b/debian/postrm.in
index dd1be80..aa35bd5 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -69,8 +69,11 @@ case "$1" in
             # Remove the settings
             rm -f /etc/prime-discrete
 
+
+
             # Restore the alternatives to a non prime
             # configuration, if possible
+            os_release="$(lsb_release -c | cut -d: -f2 | sed "s/\t//g")"
             host_arch_main=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
             host_arch_other=$( (echo "$host_arch_main" | \
                                 grep "i386" >/dev/null) && \
@@ -84,14 +87,36 @@ case "$1" in
             other_alternative="$(get_current_alternative "$other_arch")"
 
             if echo "$main_alternative" | grep "prime"; then
-                fallback="$(echo "$main_alternative" | sed "s/-prime//g")"
-                set_alternative "$main_arch" "$fallback"
+                if [ "$os_release" = "precise" ]; then
+                    # In Precise multiple drivers can be installed at the
+                    # same time, so we simply switch back to the non-prime
+                    # alternative provided by the same driver package
+                    fallback="$(echo "$main_alternative" | sed "s/-prime//g")"
+                    set_alternative "$main_arch" "$fallback"
+                else
+                    # Drivers cannot be installed all at the
+                    # same time, therefore it is recommended
+                    # that we set the alternative back to
+                    # automatic mode.
+                    update-alternatives --auto "$main_arch" || true
+                fi
             fi
-
             if echo "$other_alternative" | grep "prime"; then
-                fallback="$(echo "$other_alternative" | sed "s/-prime//g")"
-                set_alternative "$other_arch" "$fallback"
+                if [ "$os_release" = "precise" ]; then
+                    # In Precise multiple drivers can be installed at the
+                    # same time, so we simply switch back to the non-prime
+                    # alternative provided by the same driver package
+                    fallback="$(echo "$other_alternative" | sed "s/-prime//g")"
+                    set_alternative "$other_arch" "$fallback"
+                else
+                    # Drivers cannot be installed all at the
+                    # same time, therefore it is recommended
+                    # that we set the alternative back to
+                    # automatic mode.
+                    update-alternatives --auto "$other_arch" || true
+                fi
             fi
+            LDCONFIG_NOTRIGGER=y ldconfig
         fi
     ;;
 

commit 8f7162e6da1f63444b69e17a3d7ced2e520d5d0d
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Dec 5 10:01:49 2013 +0100

    debian/control: depend on lsb-release

diff --git a/debian/control b/debian/control
index 815390d..4631fa4 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://github.com/tseliot/nvidia-prime
 Package: nvidia-prime
 Architecture: i386 amd64
 Depends: lightdm (>= 1.9.1), upstart, bbswitch-dkms,
- pciutils, ${shlibs:Depends}, ${misc:Depends}
+ pciutils, lsb-release, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: hybrid-graphics
 Replaces: hybrid-graphics
 Provides: hybrid-graphics

commit 5139cc1be8f780779c6661f2ca41ddde391b5ff0
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Dec 4 16:22:53 2013 +0100

    debian/control: depend on upstart

diff --git a/debian/control b/debian/control
index cb726ba..815390d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Vcs-Browser: http://github.com/tseliot/nvidia-prime
 
 Package: nvidia-prime
 Architecture: i386 amd64
-Depends: lightdm (>= 1.9.1), bbswitch-dkms, pciutils,
- ${shlibs:Depends}, ${misc:Depends}
+Depends: lightdm (>= 1.9.1), upstart, bbswitch-dkms,
+ pciutils, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: hybrid-graphics
 Replaces: hybrid-graphics
 Provides: hybrid-graphics

commit c4666945df8c008a363283222a89731d76e3fdfb
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Dec 4 16:16:12 2013 +0100

    debian/control: depend on lightdm (>= 1.9.1)

diff --git a/debian/control b/debian/control
index e509832..cb726ba 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Browser: http://github.com/tseliot/nvidia-prime
 
 Package: nvidia-prime
 Architecture: i386 amd64
-Depends: lightdm, bbswitch-dkms, pciutils,
+Depends: lightdm (>= 1.9.1), bbswitch-dkms, pciutils,
  ${shlibs:Depends}, ${misc:Depends}
 Conflicts: hybrid-graphics
 Replaces: hybrid-graphics

commit 5986499a985bee5560f51fee46b5baaa7f79c8ff
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Dec 4 16:13:15 2013 +0100

    debian/control: build only for i386 and amd64

diff --git a/debian/control b/debian/control
index 02e3b4d..e509832 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Git: git://github.com/tseliot/nvidia-prime.git
 Vcs-Browser: http://github.com/tseliot/nvidia-prime
 
 Package: nvidia-prime
-Architecture: all
+Architecture: i386 amd64
 Depends: lightdm, bbswitch-dkms, pciutils,
  ${shlibs:Depends}, ${misc:Depends}
 Conflicts: hybrid-graphics

commit bd9d9ab5969a44179455b5189d1741095a4c8a0d
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Dec 4 15:44:48 2013 +0100

    debian/postrm.in: disable the non-prime alternative when uninstalling

diff --git a/debian/postrm.in b/debian/postrm.in
index 1b9f0c1..dd1be80 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -37,6 +37,24 @@ remove_hybrid_script () {
     fi
 }
 
+get_current_alternative() {
+    master_link="$1"
+    value=""
+    alternatives=$(update-alternatives --query $master_link 2>/dev/null)
+    if [ -n "$alternatives" ]; then
+        #status=$(echo "$alternatives" | grep "Status:" | sed "s/Status: //g")
+        value=$(echo "$alternatives" | grep "Value:" | sed "s/Value: //g")
+    fi
+    echo "$value"
+}
+
+set_alternative() {
+    master_link="$1"
+    path="$2"
+    update-alternatives --set "$master_link" "$path" || true
+}
+
+
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         # Remove the xorg.conf
@@ -50,6 +68,30 @@ case "$1" in
 
             # Remove the settings
             rm -f /etc/prime-discrete
+
+            # Restore the alternatives to a non prime
+            # configuration, if possible
+            host_arch_main=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+            host_arch_other=$( (echo "$host_arch_main" | \
+                                grep "i386" >/dev/null) && \
+                                echo "$host_arch_main" | \
+                                sed "s/i386/x86_64/" || \
+                                echo "$host_arch_main" | \
+                                sed "s/x86_64/i386/")
+            main_arch=""$host_arch_main"_gl_conf"
+            other_arch=""$host_arch_other"_gl_conf"
+            main_alternative="$(get_current_alternative "$main_arch")"
+            other_alternative="$(get_current_alternative "$other_arch")"
+
+            if echo "$main_alternative" | grep "prime"; then
+                fallback="$(echo "$main_alternative" | sed "s/-prime//g")"
+                set_alternative "$main_arch" "$fallback"
+            fi
+
+            if echo "$other_alternative" | grep "prime"; then
+                fallback="$(echo "$other_alternative" | sed "s/-prime//g")"
+                set_alternative "$other_arch" "$fallback"
+            fi
         fi
     ;;
 

commit 2dd851d2a7b884488dccaf7ae38504916b9d32ad
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Dec 4 12:59:28 2013 +0100

    prime-select: use sys.stdout.write instead of print to keep compatibility

diff --git a/prime-select b/prime-select
index 740f46f..b1e7442 100755
--- a/prime-select
+++ b/prime-select
@@ -230,11 +230,11 @@ class Switcher(object):
         if (alternative == alternative_other and
             'nvidia' in alternative):
             if 'prime' in alternative:
-                print 'intel'
+                sys.stdout.write('intel\n')
             else:
-                print 'nvidia'
+                sys.stdout.write('nvidia\n')
         else:
-            print 'unknown'
+            sys.stdout.write('unknown\n')
 
         return True
 
@@ -291,13 +291,13 @@ class Switcher(object):
             # No need to do anything if we're already using the desired
             # profile, provided that alternatives are not in "auto" mode
             if profile == current_profile and 'auto' not in status:
-                print 'Info: the %s profile is already in use' % (profile)
+                sys.stdout.write('Info: the %s profile is already in use\n' % (profile))
                 return True
         elif (alternative != alternative_other and
             'nvidia' in alternative):
             # Something's wrong here
             # e.g. nvidia-319 on x86_64 and mesa on i386
-            print 'Info: the alternatives do not match'
+            sys.stdout.write('Info: the alternatives do not match\n')
             # The first alternative shows the driver in use
             current_driver = alternative
 

commit 71de09ae51792e9d157561279a81a807c2d721d6
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Dec 4 11:11:36 2013 +0100

    xorg.template: disable "AllowEmptyInitialConfiguration"
    
    Use Option "UseDisplayDevice" "none" for now, at least until the
    weird input grabbing issue is fixed.

diff --git a/xorg.template b/xorg.template
index c815987..8d7273d 100644
--- a/xorg.template
+++ b/xorg.template
@@ -18,7 +18,8 @@ Section "Screen"
     # The internal display might not be connected
     # to the nvidia card but we definitely want
     # to be able to connect external displays later
-    Option "AllowEmptyInitialConfiguration" "on"
+    #Option "AllowEmptyInitialConfiguration" "on"
+    Option "UseDisplayDevice" "none"
 EndSection
 
 Section "Device"

commit 17c816de1efa17c68aa81c15419bffac100d1264
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 23 15:55:20 2013 +0200

    debian/{preinst|postrm}.in: remove leftover in the test condition
    
    This was causing the lightdm.conf file to be rewritten every time.
    See LP: #1224098.

diff --git a/debian/postrm.in b/debian/postrm.in
index 340ff0b..1b9f0c1 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -23,7 +23,7 @@ now=$(date +"%m%d%Y")
 lightdm_orig_conf=#LIGHTDM_CONF_FILE#
 
 remove_hybrid_script () {
-    if [ -f "$lightdm_orig_conf" -a ! -z "$(cat $lightdm_orig_conf)" ]; then
+    if [ -s "$lightdm_orig_conf" ]; then
         # Get the file
         lightdm_orig="$(cat $lightdm_orig_conf)"
         echo "$lightdm_orig" | \

commit 61d06baeeee4c036170395e7dd4feac35cddadf1
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 23 15:52:07 2013 +0200

    prime-xconfig: fix issue with printf
    
    Apparently the printf command treats string values with
    leading zeros as octal. Work around this by removing any
    leading zeros (LP: #1219650).

diff --git a/prime-xconfig b/prime-xconfig
index 4d2b76a..37248d6 100755
--- a/prime-xconfig
+++ b/prime-xconfig
@@ -34,7 +34,7 @@ nv_get_id() {
     id_1="$(echo $nvidia_id | cut -d: -f2)"
     id_2="$(echo $nvidia_id | cut -d: -f3)"
 
-    printf "%d:%d:%d\n" $id_0 $id_1 $id_1
+    printf "%d:%d:%d\n" "${id_0#0}" "${id_1#0}" "${id_2#0}"
 }
 
 # The first nvidia series which works when no displays are

commit 79a641dd384489d80c6fe2c023ee54de0bc15d72
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 21 16:27:51 2013 +0200

    prime-supported: allow the first argument to override the log file

diff --git a/prime-supported b/prime-supported
index 07cf8d9..c7c7274 100755
--- a/prime-supported
+++ b/prime-supported
@@ -20,8 +20,17 @@
 LOG=/var/log/prime-supported.log
 force_prime=/etc/force-prime
 
+if [ -n "$1" ]; then
+    LOG="$1"
+fi
+
 # Remove any previous logs
-rm -f $LOG
+# as long as the log is an actual
+# file. In some cases we may pass
+# it /dev/stdout which is a link
+if [ -f $LOG ]; then
+    rm -f $LOG
+fi
 
 # We only support laptops by default,
 # you can override this check by creating

commit 8f3da547ac83a4586ec834fcbc906e5b2e709848
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 21 12:44:21 2013 +0200

    prime-offload: make sure to power on eDP outputs in addition to LVDS

diff --git a/prime-offload b/prime-offload
index 54fd7af..52276c3 100755
--- a/prime-offload
+++ b/prime-offload
@@ -87,6 +87,6 @@ xrandr --setprovideroutputsource "$sink" "$src"
 xrandr --auto
 
 # Do not move up. Only now xrandr shows the outputs
-lvds=$(xrandr | grep -i "lvds" | head -n1 |cut -d " " -f 1)
+lvds=$(xrandr | grep -i -e "lvds" -e "edp" | head -n1 |cut -d " " -f 1)
 xrandr --output "$lvds" --off
 xrandr --output "$lvds" --auto

commit 40ce45570e2468f718028d409bc3b738db254fad
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Oct 15 12:39:59 2013 +0200

    Move hardware detection into prime-supported which all other programs can call

diff --git a/debian/install.in b/debian/install.in
index c9df1b0..2a0a108 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -7,3 +7,4 @@ prime-switch /sbin
 prime-xconfig /sbin
 get-quirk-options /sbin
 prime-select /usr/bin
+prime-supported /usr/bin
diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index feee31a..a0fe515 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -24,23 +24,17 @@ script
     prime_settings=/etc/prime-discrete
     prime_power=/proc/acpi/bbswitch
     force_prime=/etc/force-prime
+    prime_supported=/usr/bin/prime-supported
 
     # Remove any previous logs
     rm -f $LOG
 
-    # We only support laptops by default,
-    # you can override this check by creating
-    # the /etc/force-prime file
-    if [ -f "$force_prime" ]; then
-        echo "Force mode enabled. Skipping laptop check" >> $LOG 2>&1
-    else
-        if [ -n "`ls -A /sys/class/power_supply/`" ] && \
-           [ -d "/proc/acpi/button/lid" ]; then
-            echo "Laptop detected" >> $LOG 2>&1
-        else
-            echo "Sorry but we only support laptops" >> $LOG 2>&1
-            exit 0
-        fi
+    # Check hardware support here
+    supported="`$prime_supported`"
+    if [ -z "$supported" ]; then
+        echo "Sorry but your hardware configuration is not supported" \
+             >> $LOG 2>&1
+        exit 0
     fi
 
     if lsmod | grep nouveau > /dev/null; then
diff --git a/prime-offload b/prime-offload
index 42bcbf3..54fd7af 100755
--- a/prime-offload
+++ b/prime-offload
@@ -19,24 +19,17 @@
 #
 LOG=/var/log/prime-offload.log
 prime_power=/proc/acpi/bbswitch
-force_prime=/etc/force-prime
+prime_supported=/usr/bin/prime-supported
 
 # Remove any previous logs
 rm -f $LOG
 
-# We only support laptops by default,
-# you can override this check by creating
-# the /etc/force-prime file
-if [ -f "$force_prime" ]; then
-    echo "Force mode enabled. Skipping laptop check" >> $LOG 2>&1
-else
-    if [ -n "`ls -A /sys/class/power_supply/`" ] && \
-       [ -d "/proc/acpi/button/lid" ]; then
-        echo "Laptop detected" >> $LOG 2>&1
-    else
-        echo "Sorry but we only support laptops" >> $LOG 2>&1
-        exit 0
-    fi
+# Check hardware support here
+supported="`$prime_supported`"
+if [ -z "$supported" ]; then
+    echo "Sorry but your hardware configuration is not supported" \
+         >> $LOG 2>&1
+    exit 0
 fi
 
 # Only for NVIDIA's proprietary driver
@@ -47,45 +40,6 @@ if ! lsmod | grep nvidia > /dev/null; then
     exit 0
 fi
 
-# We only support intel + nvidia
-cards="$(lspci -n)"
-# the different classes as per pci.ids
-# Syntax:
-# C class   class_name
-#   subclass    subclass_name       <-- single tab
-#       prog-if  prog-if_name   <-- two tabs
-#C 03  Display controller
-#    00  VGA compatible controller
-#        00  VGA controller
-#        01  8514 controller
-#    01  XGA compatible controller
-#    02  3D controller
-#    80  Display controller
-gfx_300="$(echo "$cards" | grep 300)"
-gfx_301="$(echo "$cards" | grep 301)"
-gfx_302="$(echo "$cards" | grep 302)"
-gfx_380="$(echo "$cards" | grep 380)"
-
-has_nvidia=false
-has_intel=false
-
-for gfx_class in "$gfx_300" "$gfx_301" "$gfx_302" "$gfx_380"; do
-    if echo "$gfx_class" | egrep -q "8086"; then
-      # Intel detected
-      has_intel=true
-    fi
-    if echo "$gfx_class" | egrep -q "10de"; then
-      # Nvidia detected
-      has_nvidia=true
-    fi
-done
-
-if ! $has_intel || ! $has_nvidia; then
-    echo "Sorry we only support Intel+Nvidia" \
-         >> $LOG 2>&1
-    exit 0
-fi
-
 # Check the xrandr version
 randr_ver="$(xrandr -v)"
 client=$(echo "$randr_ver" | grep "program" | awk '{print $NF}' | cut -d. -f2)
diff --git a/prime-supported b/prime-supported
new file mode 100755
index 0000000..07cf8d9
--- /dev/null
+++ b/prime-supported
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+LOG=/var/log/prime-supported.log
+force_prime=/etc/force-prime
+
+# Remove any previous logs
+rm -f $LOG
+
+# We only support laptops by default,
+# you can override this check by creating
+# the /etc/force-prime file
+if [ -f "$force_prime" ]; then
+    echo "Force mode enabled. Skipping laptop check" >> $LOG 2>&1
+else
+    if [ -n "`ls -A /sys/class/power_supply/`" ] && \
+       [ -d "/proc/acpi/button/lid" ]; then
+        echo "Laptop detected" >> $LOG 2>&1
+    else
+        echo "Sorry but we only support laptops" >> $LOG 2>&1
+        exit 0
+    fi
+fi
+
+# We only support intel + nvidia
+cards="$(lspci -n)"
+# the different classes as per pci.ids
+# Syntax:
+# C class   class_name
+#   subclass    subclass_name       <-- single tab
+#       prog-if  prog-if_name   <-- two tabs
+#C 03  Display controller
+#    00  VGA compatible controller
+#        00  VGA controller
+#        01  8514 controller
+#    01  XGA compatible controller
+#    02  3D controller
+#    80  Display controller
+gfx_300="$(echo "$cards" | grep 300)"
+gfx_301="$(echo "$cards" | grep 301)"
+gfx_302="$(echo "$cards" | grep 302)"
+gfx_380="$(echo "$cards" | grep 380)"
+
+has_nvidia=false
+has_intel=false
+
+for gfx_class in "$gfx_300" "$gfx_301" "$gfx_302" "$gfx_380"; do
+    if echo "$gfx_class" | egrep -q "8086"; then
+      # Intel detected
+      has_intel=true
+    fi
+    if echo "$gfx_class" | egrep -q "10de"; then
+      # Nvidia detected
+      has_nvidia=true
+    fi
+done
+
+if ! $has_intel || ! $has_nvidia; then
+    echo "Sorry we only support Intel+Nvidia" \
+         >> $LOG 2>&1
+    exit 0
+fi
+
+echo "yes"
diff --git a/prime-switch b/prime-switch
index 28da4e8..d81e320 100755
--- a/prime-switch
+++ b/prime-switch
@@ -21,23 +21,17 @@ LOG=/var/log/prime-switch.log
 prime_settings=/etc/prime-discrete
 prime_power=/proc/acpi/bbswitch
 force_prime=/etc/force-prime
+prime_supported=/usr/bin/prime-supported
 
 # Remove any previous logs
 rm -f $LOG
 
-# We only support laptops by default,
-# you can override this check by creating
-# the /etc/force-prime file
-if [ -f "$force_prime" ]; then
-    echo "Force mode enabled. Skipping laptop check" >> $LOG 2>&1
-else
-    if [ -n "`ls -A /sys/class/power_supply/`" ] && \
-       [ -d "/proc/acpi/button/lid" ]; then
-        echo "Laptop detected" >> $LOG 2>&1
-    else
-        echo "Sorry but we only support laptops" >> $LOG 2>&1
-        exit 0
-    fi
+# Check hardware support here
+supported="`$prime_supported`"
+if [ -z "$supported" ]; then
+    echo "Sorry but your hardware configuration is not supported" \
+         >> $LOG 2>&1
+    exit 0
 fi
 
 if lsmod | grep nouveau > /dev/null; then
diff --git a/prime-xconfig b/prime-xconfig
old mode 100644
new mode 100755

commit 1576cac43fc76926c1f6e810b6f17f7facf9b559
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 14 16:49:41 2013 +0200

    Always check if we're dealing with a laptop
    
    If it's not a laptop we do nothing, unless /etc/force_prime is set

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index 8ab21a6..feee31a 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -23,20 +23,36 @@ script
     LOG=/var/log/nvidia-prime-upstart.log
     prime_settings=/etc/prime-discrete
     prime_power=/proc/acpi/bbswitch
+    force_prime=/etc/force-prime
 
     # Remove any previous logs
     rm -f $LOG
 
+    # We only support laptops by default,
+    # you can override this check by creating
+    # the /etc/force-prime file
+    if [ -f "$force_prime" ]; then
+        echo "Force mode enabled. Skipping laptop check" >> $LOG 2>&1
+    else
+        if [ -n "`ls -A /sys/class/power_supply/`" ] && \
+           [ -d "/proc/acpi/button/lid" ]; then
+            echo "Laptop detected" >> $LOG 2>&1
+        else
+            echo "Sorry but we only support laptops" >> $LOG 2>&1
+            exit 0
+        fi
+    fi
+
     if lsmod | grep nouveau > /dev/null; then
         # exit if nouveau is in use
         echo "Sorry but nvidia-prime does not work with the nouveau driver" \
-             > $LOG 2>&1
+             >> $LOG 2>&1
         exit 0
     fi
 
     if [ ! -e $prime_settings ]; then
         echo "No settings for nvidia-prime can be found in $prime_settings" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
         exit 0
     fi
 
diff --git a/prime-offload b/prime-offload
index 9dd220c..42bcbf3 100755
--- a/prime-offload
+++ b/prime-offload
@@ -19,12 +19,31 @@
 #
 LOG=/var/log/prime-offload.log
 prime_power=/proc/acpi/bbswitch
+force_prime=/etc/force-prime
+
+# Remove any previous logs
+rm -f $LOG
+
+# We only support laptops by default,
+# you can override this check by creating
+# the /etc/force-prime file
+if [ -f "$force_prime" ]; then
+    echo "Force mode enabled. Skipping laptop check" >> $LOG 2>&1
+else
+    if [ -n "`ls -A /sys/class/power_supply/`" ] && \
+       [ -d "/proc/acpi/button/lid" ]; then
+        echo "Laptop detected" >> $LOG 2>&1
+    else
+        echo "Sorry but we only support laptops" >> $LOG 2>&1
+        exit 0
+    fi
+fi
 
 # Only for NVIDIA's proprietary driver
 if ! lsmod | grep nvidia > /dev/null; then
     # Sorry the driver is not is loaded
     echo "Sorry the nvidia kernel module is not is loaded" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     exit 0
 fi
 
@@ -63,7 +82,7 @@ done
 
 if ! $has_intel || ! $has_nvidia; then
     echo "Sorry we only support Intel+Nvidia" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     exit 0
 fi
 
@@ -86,7 +105,7 @@ elif [ "$client" -eq 3 -a "$client_point" -eq 5 \
 else
     # client and server ver < 1.4
     echo "Sorry we only support randr 1.4 or higher" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     exit 0
 fi
 
diff --git a/prime-switch b/prime-switch
index 47f0778..28da4e8 100755
--- a/prime-switch
+++ b/prime-switch
@@ -20,20 +20,36 @@
 LOG=/var/log/prime-switch.log
 prime_settings=/etc/prime-discrete
 prime_power=/proc/acpi/bbswitch
+force_prime=/etc/force-prime
 
 # Remove any previous logs
 rm -f $LOG
 
+# We only support laptops by default,
+# you can override this check by creating
+# the /etc/force-prime file
+if [ -f "$force_prime" ]; then
+    echo "Force mode enabled. Skipping laptop check" >> $LOG 2>&1
+else
+    if [ -n "`ls -A /sys/class/power_supply/`" ] && \
+       [ -d "/proc/acpi/button/lid" ]; then
+        echo "Laptop detected" >> $LOG 2>&1
+    else
+        echo "Sorry but we only support laptops" >> $LOG 2>&1
+        exit 0
+    fi
+fi
+
 if lsmod | grep nouveau > /dev/null; then
     # Exit if nouveau is in use
     echo "Sorry but nvidia-prime does not work with the nouveau driver" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     exit 0
 fi
 
 if [ ! -e $prime_settings ]; then
     echo "No settings for prime can be found in $prime_settings" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     exit 0
 fi
 
@@ -46,7 +62,7 @@ fi
 if [ ! -e $prime_power ]; then
     # If we get here there is no bbswitch module
     echo "No bbswitch can be found" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     exit 0
 fi
 
@@ -77,25 +93,25 @@ fi
 # Do we need to call bbswitch?
 if [ "$action" = "$nvidia_status" ]; then
     echo "No action required to get PRIME to work" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     exit 0
 fi
 
 if [ "$action" = "on" ]; then
     echo "Enabling the NVIDIA card" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     echo "ON" > /proc/acpi/bbswitch
     /sbin/modprobe nvidia || true
     exit 0
 elif [ "$action" = "off" ]; then
     echo "Disabling the NVIDIA card" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     /sbin/rmmod nvidia || true
     echo "OFF" > /proc/acpi/bbswitch
     exit 0
 else
     echo "\"$action\" is not a valid action for PRIME" \
-         > $LOG 2>&1
+         >> $LOG 2>&1
     exit 0
 fi
 

commit 8dab895e0f3df81023bf7f5e33225f69a82b02ed
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 14 14:35:22 2013 +0200

    prime-select: remove any reference to amd

diff --git a/prime-select b/prime-select
index 83713e2..740f46f 100755
--- a/prime-select
+++ b/prime-select
@@ -1,18 +1,18 @@
 #!/usr/bin/python
 #
-#       switchlibGL
+#       prime-select
 #
-#       Copyright 2011 Canonical Ltd.
+#       Copyright 2013 Canonical Ltd.
 #       Author: Alberto Milone <alberto.milone@canonical.com>
 #
-#       Script to switch between AMD and Intel graphics driver libraries.
+#       Script to switch between NVIDIA and Intel graphics driver libraries.
 #
 #       Usage:
-#           switchlibGL   amd|intel|query
-#           amd:   switches to AMD's version of libGL.so
+#           prime-select   nvidia|intel|query
+#           nvidia:   switches to NVIDIA's version of libGL.so
 #           intel: switches to the open-source version of libGL.so
 #           query: checks which version is currently active and writes
-#                  "amd", "intel" or "unknown" to the standard output
+#                  "nvidia", "intel" or "unknown" to the standard output
 #
 #       Permission is hereby granted, free of charge, to any person
 #       obtaining a copy of this software and associated documentation
@@ -342,7 +342,7 @@ def handle_query_error():
     exit(1)
 
 def usage():
-    sys.stderr.write("Usage: %s amd|intel|query\n" % (sys.argv[0]))
+    sys.stderr.write("Usage: %s nvidia|intel|query\n" % (sys.argv[0]))
 
 if __name__ == '__main__':
     try:

commit 7c26b47a6f7dbc105a3b9e7de4ea80c49bf08831
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 10 17:49:32 2013 +0200

    Make sure that the output of prime-selects goes into the log

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index 61cc087..8ab21a6 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -67,7 +67,8 @@ script
         echo "Configuring alternatives" \
          >> $LOG 2>&1
         # Make sure the alternatives are in sync
-        /usr/bin/prime-select nvidia
+        /usr/bin/prime-select nvidia  \
+         >> $LOG 2>&1
     elif [ "$action" = "off" ]; then
         echo "Moving xorg.conf away" \
          >> $LOG 2>&1
@@ -75,7 +76,8 @@ script
         echo "Configuring alternatives" \
          >> $LOG 2>&1
         # Make sure the alternatives are in sync
-        /usr/bin/prime-select intel
+        /usr/bin/prime-select intel  \
+         >> $LOG 2>&1
 
         # Do we need to take action?
         if [ "$action" = "$nvidia_status" ]; then

commit 3d1ca0daf8e178d945acab3f94e709033c49087d
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 10 15:41:02 2013 +0200

    prime-select: add logic to handle "auto" alternatives
    
    Also take care of alternatives that don't match on the different architectures

diff --git a/prime-select b/prime-select
index 6792794..83713e2 100755
--- a/prime-select
+++ b/prime-select
@@ -68,8 +68,12 @@ class Alternatives:
 
         return alternatives
 
-    def get_current_alternative(self):
-        '''Get the alternative in use'''
+    def get_current_alternative(self, check_status=False):
+        '''Get the alternative in use
+
+        If check_status is True, then only the status will
+        be reported (i.e. either "manual" or "auto")
+        '''
         dev_null = open('/dev/null', 'w')
         current_alternative = None
         p1 = Popen([self._command, '--query', self._master_link],
@@ -77,9 +81,13 @@ class Alternatives:
         p = p1.communicate()[0]
         dev_null.close()
         c = p.split('\n')
+        if check_status:
+            pattern = 'Status:'
+        else:
+            pattern = 'Value:'
         for line in c:
-            if line.strip().startswith('Value:'):
-                return line.replace('Value:', '').strip()
+            if line.strip().startswith(pattern):
+                return line.replace(pattern, '').strip()
         return None
 
     def get_alternative_by_name(self, name, ignore_pattern=None):
@@ -167,8 +175,7 @@ class Switcher(object):
         subprocess.call(['update-initramfs', '-u', '-k', os.uname()[2]])
 
     def _get_current_alternative(self):
-        # This is a list as the 2nd item could be another alternative
-        # we might be looking for e.g. an xorg.conf alternative
+        # This is a list as the 2nd item belongs to another architecture
         alternatives = [None, None]
         raw_gl_alternative = self._gl_switcher.get_current_alternative()
         raw_gl_alternative_other = self._gl_switcher_other.get_current_alternative()
@@ -180,6 +187,20 @@ class Switcher(object):
 
         return alternatives
 
+    def _get_current_alternative_status(self):
+        '''Get the current status i.e. either "auto" or "manual"'''
+        # This is a list as the 2nd item belongs to another architecture
+        alternatives = [None, None]
+        raw_gl_alternative = self._gl_switcher.get_current_alternative(True)
+        raw_gl_alternative_other = self._gl_switcher_other.get_current_alternative(True)
+
+        if (raw_gl_alternative != None):
+            alternatives[0] = raw_gl_alternative
+        if (raw_gl_alternative_other != None):
+            alternatives[1] = raw_gl_alternative_other
+
+        return alternatives
+
     def enable_alternative(self, alternative):
         # Make sure that the alternative exists
         gl_alternative = self._gl_switcher.get_alternative_by_name(alternative)
@@ -264,28 +285,48 @@ class Switcher(object):
                     sys.stderr.write('Error: %s does not support PRIME power management\n')
                     return False
 
+            # Are alternatives in "auto" or in "manual" mode?
+            status = self._get_current_alternative_status()
+
             # No need to do anything if we're already using the desired
-            # profile
-            if profile == current_profile:
+            # profile, provided that alternatives are not in "auto" mode
+            if profile == current_profile and 'auto' not in status:
                 print 'Info: the %s profile is already in use' % (profile)
                 return True
-            else:
-                # Enable the desired alternative
-                if profile == 'intel':
-                    target_driver = '%s-prime' % current_driver
-                else:
-                    target_driver = current_driver.replace('-prime', '')
-
-                if self.enable_alternative(target_driver):
-                    # Write the settings to the config file
-                    self._write_profile(profile)
-                    return True
-                else:
+        elif (alternative != alternative_other and
+            'nvidia' in alternative):
+            # Something's wrong here
+            # e.g. nvidia-319 on x86_64 and mesa on i386
+            print 'Info: the alternatives do not match'
+            # The first alternative shows the driver in use
+            current_driver = alternative
+
+            if 'prime' not in alternative:
+                # Check that the alternative for the intel profile
+                # exists. If it doesn't, then the driver does not
+                # support power management with PRIME
+                alt_driver = '%s-prime' % current_driver
+                if (not self._gl_switcher.get_alternative_by_name(alt_driver) or
+                    not self._gl_switcher_other.get_alternative_by_name(alt_driver)):
+                    sys.stderr.write('Error: %s does not support PRIME power management\n')
                     return False
         else:
             sys.stderr.write('Error: alternatives are not set up properly\n')
             return False
 
+        # Enable the desired alternative
+        if profile == 'intel':
+            target_driver = '%s-prime' % current_driver
+        else:
+            target_driver = current_driver.replace('-prime', '')
+
+        if self.enable_alternative(target_driver):
+            # Write the settings to the config file
+            self._write_profile(profile)
+            return True
+        else:
+            return False
+
 
 def check_root():
     if not os.geteuid() == 0:

commit a187b86b5af64663ad3c29be64340dbd96f79ba0
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 10 14:44:12 2013 +0200

    prime-select: add \n when writing to stderr

diff --git a/prime-select b/prime-select
index 5051692..6792794 100755
--- a/prime-select
+++ b/prime-select
@@ -241,7 +241,7 @@ class Switcher(object):
             alternative_other = str(alternatives[1])
         except IndexError:
             # No alternative exists
-            sys.stderr.write('Error: the required alternatives do not exist')
+            sys.stderr.write('Error: the required alternatives do not exist\n')
             return False
 
         # The alternatives we are looking for are both provided by
@@ -261,7 +261,7 @@ class Switcher(object):
                 alt_driver = '%s-prime' % current_driver
                 if (not self._gl_switcher.get_alternative_by_name(alt_driver) or
                     not self._gl_switcher_other.get_alternative_by_name(alt_driver)):
-                    sys.stderr.write('Error: %s does not support PRIME power management')
+                    sys.stderr.write('Error: %s does not support PRIME power management\n')
                     return False
 
             # No need to do anything if we're already using the desired
@@ -283,8 +283,7 @@ class Switcher(object):
                 else:
                     return False
         else:
-            print 'unknown'
-            sys.stderr.write('Error: alternatives are not set up properly')
+            sys.stderr.write('Error: alternatives are not set up properly\n')
             return False
 
 

commit 7484b9c181288a61e9bb8d2ef5f80893a81b242d
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 10 12:41:38 2013 +0200

    Make sure to always switch to the correct alternatives

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index 5071911..61cc087 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -64,10 +64,18 @@ script
         echo "Configuring xorg.conf" \
          >> $LOG 2>&1
         /sbin/prime-xconfig on
+        echo "Configuring alternatives" \
+         >> $LOG 2>&1
+        # Make sure the alternatives are in sync
+        /usr/bin/prime-select nvidia
     elif [ "$action" = "off" ]; then
         echo "Moving xorg.conf away" \
          >> $LOG 2>&1
         /sbin/prime-xconfig off
+        echo "Configuring alternatives" \
+         >> $LOG 2>&1
+        # Make sure the alternatives are in sync
+        /usr/bin/prime-select intel
 
         # Do we need to take action?
         if [ "$action" = "$nvidia_status" ]; then
diff --git a/prime-switch b/prime-switch
index a591604..47f0778 100755
--- a/prime-switch
+++ b/prime-switch
@@ -60,10 +60,18 @@ if [ "$action" = "on" ]; then
     echo "Configuring xorg.conf" \
      >> $LOG 2>&1
     /sbin/prime-xconfig on
+    echo "Configuring alternatives" \
+     >> $LOG 2>&1
+    # Make sure the alternatives are in sync
+    /usr/bin/prime-select nvidia
 elif [ "$action" = "off" ]; then
     echo "Moving xorg.conf away" \
      >> $LOG 2>&1
     /sbin/prime-xconfig off
+    echo "Configuring alternatives" \
+     >> $LOG 2>&1
+    # Make sure the alternatives are in sync
+    /usr/bin/prime-select intel
 fi
 
 # Do we need to call bbswitch?

commit 4c19d256209b88a56d4c452b854d65ecb36ff129
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 7 17:44:00 2013 +0200

    Install /etc/prime-quirks

diff --git a/debian/install.in b/debian/install.in
index 7c7cba1..c9df1b0 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,6 +1,7 @@
 #LIGHTDM_CONF_FILENAME_D# #LIGHTDM_CONF_DIR_D#
 xorg.template #LIGHTDM_CUSTOM_CONF_DIR#
 xorg_legacy.template #LIGHTDM_CUSTOM_CONF_DIR#
+prime-quirks #LIGHTDM_CUSTOM_CONF_DIR#
 prime-offload /sbin
 prime-switch /sbin
 prime-xconfig /sbin
diff --git a/get-quirk-options b/get-quirk-options
index b9d6740..919c7bb 100755
--- a/get-quirk-options
+++ b/get-quirk-options
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 LOG="/var/log/prime-quirks.log"
-quirks="/etc/prime-quirks"
+quirks="/usr/share/nvidia-prime/prime-quirks"
 dmi_prod_ver_path="/sys/class/dmi/id/product_version"
 
 additional_opts=""
diff --git a/prime-quirks b/prime-quirks
new file mode 100644
index 0000000..d7d551d
--- /dev/null
+++ b/prime-quirks
@@ -0,0 +1,8 @@
+# Quirks file for nvidia-prime
+#
+# You can add quirks using the following format:
+#
+#   "dmi product version" "bbswitch options"
+#
+"ThinkPad T410" "skip_optimus_dsm=1"
+"ThinkPad T410s" "skip_optimus_dsm=1"

commit b8657577cf98d138c6035ae4ae1aa484a553ae82
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 7 17:38:27 2013 +0200

    Pass options to bbswitch from quirks

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index a913ac5..5071911 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -43,8 +43,9 @@ script
     if [ ! -e $prime_power ]; then
         echo "No bbswitch can be found 1st attempt" \
          >> $LOG 2>&1
+        opts="`/sbin/get-quirk-options`"
         # Load bbswitch
-        /sbin/modprobe bbswitch load_state=-1 unload_state=1 || true
+        /sbin/modprobe bbswitch load_state=-1 unload_state=1 "$opts" || true
         # Try again
         if [ ! -e $prime_power ]; then
             echo "No bbswitch can be found 2nd attempt" \
diff --git a/prime-switch b/prime-switch
index 6ff25d5..a591604 100755
--- a/prime-switch
+++ b/prime-switch
@@ -38,8 +38,9 @@ if [ ! -e $prime_settings ]; then
 fi
 
 if ! lsmod | grep bbswitch > /dev/null; then
+    opts="`/sbin/get-quirk-options`"
     # Try to load bbswitch
-    /sbin/modprobe bbswitch load_state=-1 unload_state=1 || true
+    /sbin/modprobe bbswitch load_state=-1 unload_state=1 "$opts" || true
 fi
 
 if [ ! -e $prime_power ]; then

commit 343c8087a31b8e791e96064af061348c0b771335
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 7 17:29:49 2013 +0200

    Add get-quirk-options

diff --git a/debian/install.in b/debian/install.in
index 55311af..7c7cba1 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -4,4 +4,5 @@ xorg_legacy.template #LIGHTDM_CUSTOM_CONF_DIR#
 prime-offload /sbin
 prime-switch /sbin
 prime-xconfig /sbin
+get-quirk-options /sbin
 prime-select /usr/bin
diff --git a/get-quirk-options b/get-quirk-options
new file mode 100755
index 0000000..b9d6740
--- /dev/null
+++ b/get-quirk-options
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+LOG="/var/log/prime-quirks.log"
+quirks="/etc/prime-quirks"
+dmi_prod_ver_path="/sys/class/dmi/id/product_version"
+
+additional_opts=""
+
+if [ -s "$quirks" ] && [ -s "$dmi_prod_ver_path" ]; then
+
+    dmi_prod_ver="`cat "$dmi_prod_ver_path"`"
+
+    while read line; do
+        if [ -n "$line" ] && [ -n "`echo "$line" | grep -v "#"`" ]; then
+            product="`echo "$line" | cut -d '"' -f 2`"
+            if [ "$dmi_prod_ver" = "$product" ]; then
+                options="`echo "$line" | cut -d '"' -f 4`"
+                echo "Applying quirk for $product\n$options" \
+                > $LOG 2>&1
+                additional_opts="$options"
+                break
+            fi
+        fi
+
+    done < "$quirks"
+fi
+echo "$additional_opts"
+

commit bbc4fa6748d45b4c78a3c93fde0d3a31e66ed2ed
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 7 13:36:00 2013 +0200

    prime-xconfig: make sure to use the new xorg.template with nvidia >= 331

diff --git a/prime-xconfig b/prime-xconfig
index 24a0d51..4d2b76a 100644
--- a/prime-xconfig
+++ b/prime-xconfig
@@ -37,8 +37,23 @@ nv_get_id() {
     printf "%d:%d:%d\n" $id_0 $id_1 $id_1
 }
 
-xorg_conf=/etc/X11/xorg.conf
-xorg_template=/usr/share/nvidia-prime/xorg.template
+# The first nvidia series which works when no displays are
+# connected when X starts
+empty_initial_ver=331
+
+# Check the nvidia driver series in use
+current_ver="`update-alternatives --query x86_64-linux-gnu_gl_conf | \
+             grep ^Value | sed 's/[^0-9]//g'`"
+
+if [ -n "$current_ver" ] && \
+   [ $current_ver -ge $empty_initial_ver ]; then
+   template="xorg.template"
+else
+   template="xorg_legacy.template"
+fi
+
+xorg_conf="/etc/X11/xorg.conf"
+xorg_template="/usr/share/nvidia-prime/$template"
 
 action="$1"
 

commit bb2f15263f4cca4ef0eaf23eccb8395d22d97612
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 7 13:18:27 2013 +0200

    Add xorg_legacy.template for drivers older than 331

diff --git a/debian/install.in b/debian/install.in
index 8bcc5eb..55311af 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,5 +1,6 @@
 #LIGHTDM_CONF_FILENAME_D# #LIGHTDM_CONF_DIR_D#
 xorg.template #LIGHTDM_CUSTOM_CONF_DIR#
+xorg_legacy.template #LIGHTDM_CUSTOM_CONF_DIR#
 prime-offload /sbin
 prime-switch /sbin
 prime-xconfig /sbin
diff --git a/xorg.template b/xorg.template
index 5af010b..c815987 100644
--- a/xorg.template
+++ b/xorg.template
@@ -15,10 +15,10 @@ EndSection
 Section "Screen"
     Identifier "nvidia"
     Device "nvidia"
-    # Uncomment this line if your computer has no display devices connected to
-    # the NVIDIA GPU.  Leave it commented if you have display devices
-    # connected to the NVIDIA GPU that you would like to use.
-    Option "UseDisplayDevice" "none"
+    # The internal display might not be connected
+    # to the nvidia card but we definitely want
+    # to be able to connect external displays later
+    Option "AllowEmptyInitialConfiguration" "on"
 EndSection
 
 Section "Device"
diff --git a/xorg_legacy.template b/xorg_legacy.template
new file mode 100644
index 0000000..5af010b
--- /dev/null
+++ b/xorg_legacy.template
@@ -0,0 +1,32 @@
+# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
+
+Section "ServerLayout"
+    Identifier "layout"
+    Screen 0 "nvidia"
+    Inactive "intel"
+EndSection
+
+Section "Device"
+    Identifier "nvidia"
+    Driver "nvidia"
+    BusID "#BUSID#"
+EndSection
+
+Section "Screen"
+    Identifier "nvidia"
+    Device "nvidia"
+    # Uncomment this line if your computer has no display devices connected to
+    # the NVIDIA GPU.  Leave it commented if you have display devices
+    # connected to the NVIDIA GPU that you would like to use.
+    Option "UseDisplayDevice" "none"
+EndSection
+
+Section "Device"
+    Identifier "intel"
+    Driver "modesetting"
+EndSection
+
+Section "Screen"
+    Identifier "intel"
+    Device "intel"
+EndSection

commit 415879cdd0af34df7bb14e36c5bdc7e5c1eee166
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 7 11:09:29 2013 +0200

    Rename and normalise logs

diff --git a/prime-offload b/prime-offload
index 3d5767b..9dd220c 100755
--- a/prime-offload
+++ b/prime-offload
@@ -17,14 +17,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-PRIME_LOG=/var/log/lightdm_prime.log
+LOG=/var/log/prime-offload.log
 prime_power=/proc/acpi/bbswitch
 
 # Only for NVIDIA's proprietary driver
 if ! lsmod | grep nvidia > /dev/null; then
     # Sorry the driver is not is loaded
     echo "Sorry the nvidia kernel module is not is loaded" \
-         > $PRIME_LOG 2>&1
+         > $LOG 2>&1
     exit 0
 fi
 
@@ -63,7 +63,7 @@ done
 
 if ! $has_intel || ! $has_nvidia; then
     echo "Sorry we only support Intel+Nvidia" \
-         > $PRIME_LOG 2>&1
+         > $LOG 2>&1
     exit 0
 fi
 
@@ -86,7 +86,7 @@ elif [ "$client" -eq 3 -a "$client_point" -eq 5 \
 else
     # client and server ver < 1.4
     echo "Sorry we only support randr 1.4 or higher" \
-         > $PRIME_LOG 2>&1
+         > $LOG 2>&1
     exit 0
 fi
 
diff --git a/prime-switch b/prime-switch
index c87bf3c..6ff25d5 100755
--- a/prime-switch
+++ b/prime-switch
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-LOG=/var/log/lightdm_prime_out.log
+LOG=/var/log/prime-switch.log
 prime_settings=/etc/prime-discrete
 prime_power=/proc/acpi/bbswitch
 

commit f76570625fdfec217e6cc8827c6873f614e42140
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 7 11:03:32 2013 +0200

    Rename hybrid-switch to prime-switch

diff --git a/debian/install.in b/debian/install.in
index 9a9e0c0..8bcc5eb 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,6 +1,6 @@
 #LIGHTDM_CONF_FILENAME_D# #LIGHTDM_CONF_DIR_D#
 xorg.template #LIGHTDM_CUSTOM_CONF_DIR#
 prime-offload /sbin
-hybrid-switch /sbin
+prime-switch /sbin
 prime-xconfig /sbin
 prime-select /usr/bin
diff --git a/debian/preinst.in b/debian/preinst.in
index 3871f52..7202496 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -45,13 +45,13 @@ display-setup-script\=\/sbin\/prime-offload' \
              grep "display-stopped-script"; then
             echo "$lightdm_orig" | \
             sed "s/.*display-stopped-script.*/\
-display-stopped-script\=\/sbin\/hybrid-switch/g" \
+display-stopped-script\=\/sbin\/prime-switch/g" \
             > "$lightdm_orig_conf"
         else
             # Add a line after the pattern
             echo "$lightdm_orig" | \
             sed '/.*display-setup-script.*/ a\
-display-stopped-script\=\/sbin\/hybrid-switch' \
+display-stopped-script\=\/sbin\/prime-switch' \
             > "$lightdm_orig_conf"
         fi
     else
@@ -62,7 +62,7 @@ display-stopped-script\=\/sbin\/hybrid-switch' \
 greeter-session=unity-greeter
 user-session=ubuntu
 display-setup-script=/sbin/prime-offload
-display-stopped-script=/sbin/hybrid-switch
+display-stopped-script=/sbin/prime-switch
 EOF
     fi
 }
diff --git a/hybrid-switch b/hybrid-switch
deleted file mode 100755
index c87bf3c..0000000
--- a/hybrid-switch
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2013 Canonical Ltd.
-#
-# Author: Alberto Milone <alberto.milone@canonical.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-LOG=/var/log/lightdm_prime_out.log
-prime_settings=/etc/prime-discrete
-prime_power=/proc/acpi/bbswitch
-
-# Remove any previous logs
-rm -f $LOG
-
-if lsmod | grep nouveau > /dev/null; then
-    # Exit if nouveau is in use
-    echo "Sorry but nvidia-prime does not work with the nouveau driver" \
-         > $LOG 2>&1
-    exit 0
-fi
-
-if [ ! -e $prime_settings ]; then
-    echo "No settings for prime can be found in $prime_settings" \
-         > $LOG 2>&1
-    exit 0
-fi
-
-if ! lsmod | grep bbswitch > /dev/null; then
-    # Try to load bbswitch
-    /sbin/modprobe bbswitch load_state=-1 unload_state=1 || true
-fi
-
-if [ ! -e $prime_power ]; then
-    # If we get here there is no bbswitch module
-    echo "No bbswitch can be found" \
-         > $LOG 2>&1
-    exit 0
-fi
-
-nvidia_status="`cat $prime_power | cut -d " " -f2`"
-action="`cat $prime_settings`"
-# We support both uppercase and lowercase
-action="$(echo "$action" | /usr/bin/tr '[:upper:]' '[:lower:]')"
-
-# Always set up xorg.conf
-if [ "$action" = "on" ]; then
-    echo "Configuring xorg.conf" \
-     >> $LOG 2>&1
-    /sbin/prime-xconfig on
-elif [ "$action" = "off" ]; then
-    echo "Moving xorg.conf away" \
-     >> $LOG 2>&1
-    /sbin/prime-xconfig off
-fi
-
-# Do we need to call bbswitch?
-if [ "$action" = "$nvidia_status" ]; then
-    echo "No action required to get PRIME to work" \
-         > $LOG 2>&1
-    exit 0
-fi
-
-if [ "$action" = "on" ]; then
-    echo "Enabling the NVIDIA card" \
-         > $LOG 2>&1
-    echo "ON" > /proc/acpi/bbswitch
-    /sbin/modprobe nvidia || true
-    exit 0
-elif [ "$action" = "off" ]; then
-    echo "Disabling the NVIDIA card" \
-         > $LOG 2>&1
-    /sbin/rmmod nvidia || true
-    echo "OFF" > /proc/acpi/bbswitch
-    exit 0
-else
-    echo "\"$action\" is not a valid action for PRIME" \
-         > $LOG 2>&1
-    exit 0
-fi
-
diff --git a/prime-switch b/prime-switch
new file mode 100755
index 0000000..c87bf3c
--- /dev/null
+++ b/prime-switch
@@ -0,0 +1,92 @@
+#!/bin/sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+LOG=/var/log/lightdm_prime_out.log
+prime_settings=/etc/prime-discrete
+prime_power=/proc/acpi/bbswitch
+
+# Remove any previous logs
+rm -f $LOG
+
+if lsmod | grep nouveau > /dev/null; then
+    # Exit if nouveau is in use
+    echo "Sorry but nvidia-prime does not work with the nouveau driver" \
+         > $LOG 2>&1
+    exit 0
+fi
+
+if [ ! -e $prime_settings ]; then
+    echo "No settings for prime can be found in $prime_settings" \
+         > $LOG 2>&1
+    exit 0
+fi
+
+if ! lsmod | grep bbswitch > /dev/null; then
+    # Try to load bbswitch
+    /sbin/modprobe bbswitch load_state=-1 unload_state=1 || true
+fi
+
+if [ ! -e $prime_power ]; then
+    # If we get here there is no bbswitch module
+    echo "No bbswitch can be found" \
+         > $LOG 2>&1
+    exit 0
+fi
+
+nvidia_status="`cat $prime_power | cut -d " " -f2`"
+action="`cat $prime_settings`"
+# We support both uppercase and lowercase
+action="$(echo "$action" | /usr/bin/tr '[:upper:]' '[:lower:]')"
+
+# Always set up xorg.conf
+if [ "$action" = "on" ]; then
+    echo "Configuring xorg.conf" \
+     >> $LOG 2>&1
+    /sbin/prime-xconfig on
+elif [ "$action" = "off" ]; then
+    echo "Moving xorg.conf away" \
+     >> $LOG 2>&1
+    /sbin/prime-xconfig off
+fi
+
+# Do we need to call bbswitch?
+if [ "$action" = "$nvidia_status" ]; then
+    echo "No action required to get PRIME to work" \
+         > $LOG 2>&1
+    exit 0
+fi
+
+if [ "$action" = "on" ]; then
+    echo "Enabling the NVIDIA card" \
+         > $LOG 2>&1
+    echo "ON" > /proc/acpi/bbswitch
+    /sbin/modprobe nvidia || true
+    exit 0
+elif [ "$action" = "off" ]; then
+    echo "Disabling the NVIDIA card" \
+         > $LOG 2>&1
+    /sbin/rmmod nvidia || true
+    echo "OFF" > /proc/acpi/bbswitch
+    exit 0
+else
+    echo "\"$action\" is not a valid action for PRIME" \
+         > $LOG 2>&1
+    exit 0
+fi
+

commit 7f0bbe057b28abe1fa4c7e9a054e47899e0f53a2
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 7 10:49:20 2013 +0200

    Rename hybrid-power to prime-offload

diff --git a/debian/install.in b/debian/install.in
index a73f34a..9a9e0c0 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,6 +1,6 @@
 #LIGHTDM_CONF_FILENAME_D# #LIGHTDM_CONF_DIR_D#
 xorg.template #LIGHTDM_CUSTOM_CONF_DIR#
-hybrid-power /sbin
+prime-offload /sbin
 hybrid-switch /sbin
 prime-xconfig /sbin
 prime-select /usr/bin
diff --git a/debian/preinst.in b/debian/preinst.in
index 3fc0414..3871f52 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -26,13 +26,13 @@ add_hybrid_script () {
              grep "display-setup-script"; then
             echo "$lightdm_orig" | \
             sed "s/.*display-setup-script.*/\
-display-setup-script\=\/sbin\/hybrid-power/g" \
+display-setup-script\=\/sbin\/prime-offload/g" \
             > "$lightdm_orig_conf"
         else
             # Add a line after the pattern
             echo "$lightdm_orig" | \
             sed '/.*user-session.*/ a\
-display-setup-script\=\/sbin\/hybrid-power' \
+display-setup-script\=\/sbin\/prime-offload' \
             > "$lightdm_orig_conf"
         fi
 
@@ -61,7 +61,7 @@ display-stopped-script\=\/sbin\/hybrid-switch' \
 [SeatDefaults]
 greeter-session=unity-greeter
 user-session=ubuntu
-display-setup-script=/sbin/hybrid-power
+display-setup-script=/sbin/prime-offload
 display-stopped-script=/sbin/hybrid-switch
 EOF
     fi
diff --git a/hybrid-power b/hybrid-power
deleted file mode 100755
index 3d5767b..0000000
--- a/hybrid-power
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2013 Canonical Ltd.
-#
-# Author: Alberto Milone <alberto.milone@canonical.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-PRIME_LOG=/var/log/lightdm_prime.log
-prime_power=/proc/acpi/bbswitch
-
-# Only for NVIDIA's proprietary driver
-if ! lsmod | grep nvidia > /dev/null; then
-    # Sorry the driver is not is loaded
-    echo "Sorry the nvidia kernel module is not is loaded" \
-         > $PRIME_LOG 2>&1
-    exit 0
-fi
-
-# We only support intel + nvidia
-cards="$(lspci -n)"
-# the different classes as per pci.ids
-# Syntax:
-# C class   class_name
-#   subclass    subclass_name       <-- single tab
-#       prog-if  prog-if_name   <-- two tabs
-#C 03  Display controller
-#    00  VGA compatible controller
-#        00  VGA controller
-#        01  8514 controller
-#    01  XGA compatible controller
-#    02  3D controller
-#    80  Display controller
-gfx_300="$(echo "$cards" | grep 300)"
-gfx_301="$(echo "$cards" | grep 301)"
-gfx_302="$(echo "$cards" | grep 302)"
-gfx_380="$(echo "$cards" | grep 380)"
-
-has_nvidia=false
-has_intel=false
-
-for gfx_class in "$gfx_300" "$gfx_301" "$gfx_302" "$gfx_380"; do
-    if echo "$gfx_class" | egrep -q "8086"; then
-      # Intel detected
-      has_intel=true
-    fi
-    if echo "$gfx_class" | egrep -q "10de"; then
-      # Nvidia detected
-      has_nvidia=true
-    fi
-done
-
-if ! $has_intel || ! $has_nvidia; then
-    echo "Sorry we only support Intel+Nvidia" \
-         > $PRIME_LOG 2>&1
-    exit 0
-fi
-
-# Check the xrandr version
-randr_ver="$(xrandr -v)"
-client=$(echo "$randr_ver" | grep "program" | awk '{print $NF}' | cut -d. -f2)
-client_point=$(echo "$randr_ver" | grep "program" | awk '{print $NF}' | cut -d. -f3)
-server=$(echo "$randr_ver" | grep -i "server" | awk '{print $NF}' | cut -d. -f2)
-
-# There may not be a point version
-[ -z "$client_point" ] && client_point=0
-
-if [ "$client" -ge 4 -a "$server" -ge 4 ]; then
-    # client and server ver >= 1.4
-    use_randr_names=true
-elif [ "$client" -eq 3 -a "$client_point" -eq 5 \
-       -a "$server" -ge 4 ]; then
-    # client ver 1.3.5 and server ver >= 1.4
-    use_randr_names=false
-else
-    # client and server ver < 1.4
-    echo "Sorry we only support randr 1.4 or higher" \
-         > $PRIME_LOG 2>&1
-    exit 0
-fi
-
-# Get the xrandr providers
-output="$(xrandr --listproviders)"
-
-if [ "$use_randr_names" = true ]; then
-    # Use the providers' names
-    src=$(echo "$output" | grep " Source" | \
-          head -n1 | awk '{print $NF}' | cut -d: -f2)
-    sink=$(echo -e "$output" | grep " Sink" | \
-           head -n1 | awk '{print $NF}' | cut -d: -f2)
-else
-    # Use the providers' ids
-    src=$(echo "$output" | grep " Source" | \
-          head -n1 | cut -d: -f3 | cut -d" " -f2)
-    sink=$(echo -e "$output" | grep " Sink" | \
-           head -n1 | cut -d: -f3 | cut -d" " -f2)
-fi
-
-# Pass provider or sink and source
-xrandr --setprovideroutputsource "$sink" "$src"
-
-# Make sure xrandr sees all the outputs
-xrandr --auto
-
-# Do not move up. Only now xrandr shows the outputs
-lvds=$(xrandr | grep -i "lvds" | head -n1 |cut -d " " -f 1)
-xrandr --output "$lvds" --off
-xrandr --output "$lvds" --auto
diff --git a/prime-offload b/prime-offload
new file mode 100755
index 0000000..3d5767b
--- /dev/null
+++ b/prime-offload
@@ -0,0 +1,119 @@
+#!/bin/sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+PRIME_LOG=/var/log/lightdm_prime.log
+prime_power=/proc/acpi/bbswitch
+
+# Only for NVIDIA's proprietary driver
+if ! lsmod | grep nvidia > /dev/null; then
+    # Sorry the driver is not is loaded
+    echo "Sorry the nvidia kernel module is not is loaded" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+
+# We only support intel + nvidia
+cards="$(lspci -n)"
+# the different classes as per pci.ids
+# Syntax:
+# C class   class_name
+#   subclass    subclass_name       <-- single tab
+#       prog-if  prog-if_name   <-- two tabs
+#C 03  Display controller
+#    00  VGA compatible controller
+#        00  VGA controller
+#        01  8514 controller
+#    01  XGA compatible controller
+#    02  3D controller
+#    80  Display controller
+gfx_300="$(echo "$cards" | grep 300)"
+gfx_301="$(echo "$cards" | grep 301)"
+gfx_302="$(echo "$cards" | grep 302)"
+gfx_380="$(echo "$cards" | grep 380)"
+
+has_nvidia=false
+has_intel=false
+
+for gfx_class in "$gfx_300" "$gfx_301" "$gfx_302" "$gfx_380"; do
+    if echo "$gfx_class" | egrep -q "8086"; then
+      # Intel detected
+      has_intel=true
+    fi
+    if echo "$gfx_class" | egrep -q "10de"; then
+      # Nvidia detected
+      has_nvidia=true
+    fi
+done
+
+if ! $has_intel || ! $has_nvidia; then
+    echo "Sorry we only support Intel+Nvidia" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+
+# Check the xrandr version
+randr_ver="$(xrandr -v)"
+client=$(echo "$randr_ver" | grep "program" | awk '{print $NF}' | cut -d. -f2)
+client_point=$(echo "$randr_ver" | grep "program" | awk '{print $NF}' | cut -d. -f3)
+server=$(echo "$randr_ver" | grep -i "server" | awk '{print $NF}' | cut -d. -f2)
+
+# There may not be a point version
+[ -z "$client_point" ] && client_point=0
+
+if [ "$client" -ge 4 -a "$server" -ge 4 ]; then
+    # client and server ver >= 1.4
+    use_randr_names=true
+elif [ "$client" -eq 3 -a "$client_point" -eq 5 \
+       -a "$server" -ge 4 ]; then
+    # client ver 1.3.5 and server ver >= 1.4
+    use_randr_names=false
+else
+    # client and server ver < 1.4
+    echo "Sorry we only support randr 1.4 or higher" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+
+# Get the xrandr providers
+output="$(xrandr --listproviders)"
+
+if [ "$use_randr_names" = true ]; then
+    # Use the providers' names
+    src=$(echo "$output" | grep " Source" | \
+          head -n1 | awk '{print $NF}' | cut -d: -f2)
+    sink=$(echo -e "$output" | grep " Sink" | \
+           head -n1 | awk '{print $NF}' | cut -d: -f2)
+else
+    # Use the providers' ids
+    src=$(echo "$output" | grep " Source" | \
+          head -n1 | cut -d: -f3 | cut -d" " -f2)
+    sink=$(echo -e "$output" | grep " Sink" | \
+           head -n1 | cut -d: -f3 | cut -d" " -f2)
+fi
+
+# Pass provider or sink and source
+xrandr --setprovideroutputsource "$sink" "$src"
+
+# Make sure xrandr sees all the outputs
+xrandr --auto
+
+# Do not move up. Only now xrandr shows the outputs
+lvds=$(xrandr | grep -i "lvds" | head -n1 |cut -d " " -f 1)
+xrandr --output "$lvds" --off
+xrandr --output "$lvds" --auto

commit f6ab74c176345cb886fd6850c6263d0d53dfaca6
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 7 10:45:21 2013 +0200

    Rename config file as /etc/prime-discrete

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index ad3a628..a913ac5 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -21,7 +21,7 @@ stop on runlevel [016]
 
 script
     LOG=/var/log/nvidia-prime-upstart.log
-    prime_settings=/etc/lightdm/hybrid_default
+    prime_settings=/etc/prime-discrete
     prime_power=/proc/acpi/bbswitch
 
     # Remove any previous logs
diff --git a/debian/postrm.in b/debian/postrm.in
index cd7785b..340ff0b 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -49,7 +49,7 @@ case "$1" in
             remove_hybrid_script
 
             # Remove the settings
-            rm -f /etc/lightdm/hybrid_default
+            rm -f /etc/prime-discrete
         fi
     ;;
 
diff --git a/debian/preinst.in b/debian/preinst.in
index ce1abad..3fc0414 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -72,8 +72,8 @@ case "$1" in
         # Insert the display-setup-script line
         add_hybrid_script
 
-        if [ ! -f /etc/lightdm/hybrid_default ]; then
-            echo "on" > /etc/lightdm/hybrid_default
+        if [ ! -f /etc/prime-discrete ]; then
+            echo "on" > /etc/prime-discrete
         fi
     ;;
 
diff --git a/hybrid-switch b/hybrid-switch
index f0995a3..c87bf3c 100755
--- a/hybrid-switch
+++ b/hybrid-switch
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 LOG=/var/log/lightdm_prime_out.log
-prime_settings=/etc/lightdm/hybrid_default
+prime_settings=/etc/prime-discrete
 prime_power=/proc/acpi/bbswitch
 
 # Remove any previous logs
diff --git a/prime-select b/prime-select
index cab5c6e..5051692 100755
--- a/prime-select
+++ b/prime-select
@@ -126,7 +126,7 @@ class Alternatives:
 class Switcher(object):
 
     def __init__(self):
-        self._power_profile_path = '/etc/lightdm/hybrid_default'
+        self._power_profile_path = '/etc/prime-discrete'
         self._supported_architectures = {'i386': 'i386', 'amd64': 'x86_64'}
         main_arch = self._get_architecture()
         other_arch = self._supported_architectures.values()[

commit 5c0e15da55c22d6d03bebc396ce5215b9d2e4214
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 19:18:58 2013 +0200

    debian/install.in: install prime-select

diff --git a/debian/install.in b/debian/install.in
index 182f2c3..a73f34a 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -3,3 +3,4 @@ xorg.template #LIGHTDM_CUSTOM_CONF_DIR#
 hybrid-power /sbin
 hybrid-switch /sbin
 prime-xconfig /sbin
+prime-select /usr/bin

commit d48fd6290859c29ef1192e62cc91da973a234ca0
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 19:17:24 2013 +0200

    prime-select: write the profile to the config file

diff --git a/prime-select b/prime-select
index 79b841c..cab5c6e 100755
--- a/prime-select
+++ b/prime-select
@@ -126,6 +126,7 @@ class Alternatives:
 class Switcher(object):
 
     def __init__(self):
+        self._power_profile_path = '/etc/lightdm/hybrid_default'
         self._supported_architectures = {'i386': 'i386', 'amd64': 'x86_64'}
         main_arch = self._get_architecture()
         other_arch = self._supported_architectures.values()[
@@ -216,10 +217,18 @@ class Switcher(object):
 
         return True
 
-    def _check_settings(self):
-        # Check that nvidia-flavour and nvidia-flavour-prime
-        # are available and that one of them is in use
-        pass
+    def _write_profile(self, profile):
+        if profile == 'intel':
+            nvidia_power = 'off'
+        elif profile == 'nvidia':
+            nvidia_power = 'on'
+        else:
+            return False
+
+        # Write the settings to the file
+        settings = open(self._power_profile_path, 'w')
+        settings.write('%s\n' % nvidia_power)
+        settings.close()
 
 
     def enable_profile(self, profile):
@@ -266,7 +275,13 @@ class Switcher(object):
                     target_driver = '%s-prime' % current_driver
                 else:
                     target_driver = current_driver.replace('-prime', '')
-                return self.enable_alternative(target_driver)
+
+                if self.enable_alternative(target_driver):
+                    # Write the settings to the config file
+                    self._write_profile(profile)
+                    return True
+                else:
+                    return False
         else:
             print 'unknown'
             sys.stderr.write('Error: alternatives are not set up properly')

commit aff7ae1001eada2b5a991ed3697f7510de7b0b00
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 17:38:11 2013 +0200

    Add prime-select

diff --git a/prime-select b/prime-select
new file mode 100755
index 0000000..79b841c
--- /dev/null
+++ b/prime-select
@@ -0,0 +1,315 @@
+#!/usr/bin/python
+#
+#       switchlibGL
+#
+#       Copyright 2011 Canonical Ltd.
+#       Author: Alberto Milone <alberto.milone@canonical.com>
+#
+#       Script to switch between AMD and Intel graphics driver libraries.
+#
+#       Usage:
+#           switchlibGL   amd|intel|query
+#           amd:   switches to AMD's version of libGL.so
+#           intel: switches to the open-source version of libGL.so
+#           query: checks which version is currently active and writes
+#                  "amd", "intel" or "unknown" to the standard output
+#
+#       Permission is hereby granted, free of charge, to any person
+#       obtaining a copy of this software and associated documentation
+#       files (the "Software"), to deal in the Software without
+#       restriction, including without limitation the rights to use,
+#       copy, modify, merge, publish, distribute, sublicense, and/or sell
+#       copies of the Software, and to permit persons to whom the
+#       Software is furnished to do so, subject to the following
+#       conditions:
+#
+#       The above copyright notice and this permission notice shall be
+#       included in all copies or substantial portions of the Software.
+#
+#       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#       EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#       OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#       NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#       HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#       WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#       FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#       OTHER DEALINGS IN THE SOFTWARE.
+
+
+import os
+import sys
+import re
+import subprocess
+from subprocess import Popen, PIPE, CalledProcessError
+
+class Alternatives:
+
+    def __init__(self, master_link):
+        self._open_drivers_alternative = 'mesa/ld.so.conf'
+        self._open_egl_drivers_alternative = 'mesa-egl/ld.so.conf'
+        self._command = 'update-alternatives'
+        self._master_link = master_link
+
+        # Make sure that the PATH environment variable is set
+        if not os.environ.get('PATH'):
+            os.environ['PATH'] = '/sbin:/usr/sbin:/bin:/usr/bin'
+
+    def list_alternatives(self):
+        '''Get the list of alternatives for the master link'''
+        dev_null = open('/dev/null', 'w')
+        alternatives = []
+        p1 = Popen([self._command, '--list', self._master_link],
+                   stdout=PIPE, stderr=dev_null)
+        p = p1.communicate()[0]
+        dev_null.close()
+        c = p.split('\n')
+        for line in c:
+            line.strip() and alternatives.append(line.strip())
+
+        return alternatives
+
+    def get_current_alternative(self):
+        '''Get the alternative in use'''
+        dev_null = open('/dev/null', 'w')
+        current_alternative = None
+        p1 = Popen([self._command, '--query', self._master_link],
+                   stdout=PIPE, stderr=dev_null)
+        p = p1.communicate()[0]
+        dev_null.close()
+        c = p.split('\n')
+        for line in c:
+            if line.strip().startswith('Value:'):
+                return line.replace('Value:', '').strip()
+        return None
+
+    def get_alternative_by_name(self, name, ignore_pattern=None):
+        '''Get the alternative link by providing the driver name
+
+        ignore_pattern allows ignoring a substring in the name'''
+        if ignore_pattern:
+            name = name.replace(ignore_pattern, '')
+        alternatives = self.list_alternatives()
+
+        for alternative in alternatives:
+            if alternative.split('/')[-2] == name:
+                return alternative
+
+        return None
+
+    def get_open_drivers_alternative(self):
+        '''Get the alternative link for open drivers'''
+        return self.get_alternative_by_name(self._open_drivers_alternative)
+
+    def get_open_egl_drivers_alternative(self):
+        '''Get the alternative link for open EGL/GLES drivers'''
+        return self.get_alternative_by_name(self._open_egl_drivers_alternative)
+
+    def set_alternative(self, path):
+        '''Tries to set an alternative and returns the boolean exit status'''
+        try:
+            subprocess.check_call([self._command, '--set',
+                                   self._master_link, path])
+            self.ldconfig()
+        except CalledProcessError:
+            return False
+        return True
+
+    def ldconfig(self):
+        '''Call ldconfig'''
+        try:
+            subprocess.check_call(['ldconfig'])
+        except CalledProcessError:
+            return False
+        return True
+
+
+class Switcher(object):
+
+    def __init__(self):
+        self._supported_architectures = {'i386': 'i386', 'amd64': 'x86_64'}
+        main_arch = self._get_architecture()
+        other_arch = self._supported_architectures.values()[
+                          int(not self._supported_architectures
+                          .values().index(main_arch))]
+        main_alternative_name = self._get_alternative_name_from_arch(main_arch)
+        other_alternative_name = self._get_alternative_name_from_arch(other_arch)
+
+        # We have 2 alternatives, one for each architecture
+        self._gl_switcher = Alternatives(main_alternative_name)
+        self._gl_switcher_other = Alternatives(other_alternative_name)
+
+    def _get_architecture(self):
+        dev_null = open('/dev/null', 'w')
+        p1 = Popen(['dpkg', '--print-architecture'], stdout=PIPE, stderr=dev_null)
+        p = p1.communicate()[0]
+        dev_null.close()
+        architecture = p.strip()
+        return self._supported_architectures.get(architecture)
+
+    def _get_alternative_name_from_arch(self, architecture):
+        alternative = '%s-linux-gnu_gl_conf' % architecture
+        return alternative
+
+    def _simplify_x_alternative_name(self, alternative):
+        return alternative.split('/')[-1]
+
+    def _simplify_gl_alternative_name(self, alternative):
+        return alternative.split('/')[-2]
+
+    def _get_gl_alternatives_list(self):
+        raw_alternatives = self._gl_switcher.list_alternatives()
+        return  [ self._simplify_gl_alternative_name(x) for x in raw_alternatives ]
+
+    def _update_initramfs(self):
+        subprocess.call(['update-initramfs', '-u'])
+        # This may not be necessary
+        subprocess.call(['update-initramfs', '-u', '-k', os.uname()[2]])
+
+    def _get_current_alternative(self):
+        # This is a list as the 2nd item could be another alternative
+        # we might be looking for e.g. an xorg.conf alternative
+        alternatives = [None, None]
+        raw_gl_alternative = self._gl_switcher.get_current_alternative()
+        raw_gl_alternative_other = self._gl_switcher_other.get_current_alternative()
+
+        if (raw_gl_alternative != None):
+            alternatives[0] = self._simplify_gl_alternative_name(raw_gl_alternative)
+        if (raw_gl_alternative_other != None):
+            alternatives[1] = self._simplify_gl_alternative_name(raw_gl_alternative_other)
+
+        return alternatives
+
+    def enable_alternative(self, alternative):
+        # Make sure that the alternative exists
+        gl_alternative = self._gl_switcher.get_alternative_by_name(alternative)
+        gl_alternative_other = self._gl_switcher_other.get_alternative_by_name(alternative)
+
+        # See if they are null
+        # Abort if gl_alternative is null
+        if gl_alternative and gl_alternative_other:
+            success = (self._gl_switcher.set_alternative(gl_alternative) and
+                       self._gl_switcher_other.set_alternative(gl_alternative_other))
+            return success
+        else:
+            sys.stderr.write("Error: no alternative can be found for %s\n" % alternative)
+
+        return False
+
+    def print_current_alternative(self):
+        alternatives = self._get_current_alternative()
+
+        try:
+            alternative = str(alternatives[0])
+            alternative_other = str(alternatives[1])
+        except IndexError:
+            # No alternative exists
+            return False
+
+        if (alternative == alternative_other and
+            'nvidia' in alternative):
+            if 'prime' in alternative:
+                print 'intel'
+            else:
+                print 'nvidia'
+        else:
+            print 'unknown'
+
+        return True
+
+    def _check_settings(self):
+        # Check that nvidia-flavour and nvidia-flavour-prime
+        # are available and that one of them is in use
+        pass
+
+
+    def enable_profile(self, profile):
+        current_driver = ''
+        current_profile = ''
+        alternatives = self._get_current_alternative()
+
+        try:
+            alternative = str(alternatives[0])
+            alternative_other = str(alternatives[1])
+        except IndexError:
+            # No alternative exists
+            sys.stderr.write('Error: the required alternatives do not exist')
+            return False
+
+        # The alternatives we are looking for are both provided by
+        # an nvidia package
+        if (alternative == alternative_other and
+            'nvidia' in alternative):
+            # The driver in use
+            current_driver = alternative
+            # The profile in use
+            if 'prime' in alternative:
+                current_profile = 'intel'
+            else:
+                current_profile = 'nvidia'
+                # Check that the alternative for the intel profile
+                # exists. If it doesn't, then the driver does not
+                # support power management with PRIME
+                alt_driver = '%s-prime' % current_driver
+                if (not self._gl_switcher.get_alternative_by_name(alt_driver) or
+                    not self._gl_switcher_other.get_alternative_by_name(alt_driver)):
+                    sys.stderr.write('Error: %s does not support PRIME power management')
+                    return False
+
+            # No need to do anything if we're already using the desired
+            # profile
+            if profile == current_profile:
+                print 'Info: the %s profile is already in use' % (profile)
+                return True
+            else:
+                # Enable the desired alternative
+                if profile == 'intel':
+                    target_driver = '%s-prime' % current_driver
+                else:
+                    target_driver = current_driver.replace('-prime', '')
+                return self.enable_alternative(target_driver)
+        else:
+            print 'unknown'
+            sys.stderr.write('Error: alternatives are not set up properly')
+            return False
+
+
+def check_root():
+    if not os.geteuid() == 0:
+        sys.stderr.write("This operation requires root privileges\n")
+        exit(1)
+
+def handle_alternatives_error(mode):
+    sys.stderr.write('Error: %s mode can\'t be enabled\n' % mode)
+    exit(1)
+
+def handle_query_error():
+    sys.stderr.write("Error: no alternative can be found\n")
+    exit(1)
+
+def usage():
+    sys.stderr.write("Usage: %s amd|intel|query\n" % (sys.argv[0]))
+
+if __name__ == '__main__':
+    try:
+        arg = sys.argv[1]
+    except IndexError:
+        arg = None
+
+    if len(sys.argv[1:]) != 1:
+        usage()
+        exit(1)
+
+    switcher = Switcher()
+
+    if arg == 'intel' or arg == 'nvidia':
+        check_root()
+        if not switcher.enable_profile(arg):
+            handle_alternatives_error(arg)
+    elif arg == 'query':
+        if not switcher.print_current_alternative():
+            handle_query_error()
+    else:
+        usage()
+        sys.exit(1)
+
+    exit(0)

commit ab84cec85ce9d354103ed056581f810ef63c7acc
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 15:07:14 2013 +0200

    debian/control: depend on bbswitch-dkms

diff --git a/debian/control b/debian/control
index ff089d4..02e3b4d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Vcs-Browser: http://github.com/tseliot/nvidia-prime
 
 Package: nvidia-prime
 Architecture: all
-Depends: lightdm, pciutils, ${shlibs:Depends}, ${misc:Depends}
+Depends: lightdm, bbswitch-dkms, pciutils,
+ ${shlibs:Depends}, ${misc:Depends}
 Conflicts: hybrid-graphics
 Replaces: hybrid-graphics
 Provides: hybrid-graphics

commit c5ff750f1fde07914b7363aa50803c6da0131c28
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 15:05:55 2013 +0200

    Remove get-nvidia-id

diff --git a/get-nvidia-id b/get-nvidia-id
deleted file mode 100644
index 7c33ae7..0000000
--- a/get-nvidia-id
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2013 Canonical Ltd.
-#
-# Author: Alberto Milone <alberto.milone@canonical.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-bus_id=""
-nvidia_id=""
-pattern="10de"
-for devclass in "300" "301" "302" "380"; do
-    nvidia_id="$(lspci -n | grep $devclass | grep $pattern | cut -d" " -f1 | sed s/\\./:/g)"
-    if [ -n "$nvidia_id" ]; then
-        # We have found the device
-        break
-    fi
-done
-
-id_0="$(echo $nvidia_id | cut -d: -f1)"
-id_1="$(echo $nvidia_id | cut -d: -f2)"
-id_2="$(echo $nvidia_id | cut -d: -f3)"
-
-bus_id=$(printf "%d:%d:%d\n" $id_0 $id_1 $id_1)
-echo "$bus_id"

commit dc863ba6b849c4e65a487869f50385472471ad37
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 13:39:27 2013 +0200

    hybrid-switch: correct action switch

diff --git a/hybrid-switch b/hybrid-switch
index 6449824..f0995a3 100755
--- a/hybrid-switch
+++ b/hybrid-switch
@@ -39,7 +39,7 @@ fi
 
 if ! lsmod | grep bbswitch > /dev/null; then
     # Try to load bbswitch
-    /sbin/modprobe bbswitch || true
+    /sbin/modprobe bbswitch load_state=-1 unload_state=1 || true
 fi
 
 if [ ! -e $prime_power ]; then
@@ -55,11 +55,11 @@ action="`cat $prime_settings`"
 action="$(echo "$action" | /usr/bin/tr '[:upper:]' '[:lower:]')"
 
 # Always set up xorg.conf
-if [ "$action" = "ON" ]; then
+if [ "$action" = "on" ]; then
     echo "Configuring xorg.conf" \
      >> $LOG 2>&1
     /sbin/prime-xconfig on
-elif [ "$action" = "OFF" ]; then
+elif [ "$action" = "off" ]; then
     echo "Moving xorg.conf away" \
      >> $LOG 2>&1
     /sbin/prime-xconfig off

commit dbb50a72169b7465a8ab030b57b6d36e38a73fd9
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 13:09:17 2013 +0200

    Do not pass -s to tr

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index d87cab4..ad3a628 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -57,7 +57,7 @@ script
     action="`cat $prime_settings`"
 
     # We support both uppercase and lowercase
-    action="$(echo "$action" | /usr/bin/tr -s '[:upper:]' '[:lower:]')"
+    action="$(echo "$action" | /usr/bin/tr '[:upper:]' '[:lower:]')"
 
     if [ "$action" = "on" ]; then
         echo "Configuring xorg.conf" \
diff --git a/hybrid-switch b/hybrid-switch
index 156d0e6..6449824 100755
--- a/hybrid-switch
+++ b/hybrid-switch
@@ -51,6 +51,8 @@ fi
 
 nvidia_status="`cat $prime_power | cut -d " " -f2`"
 action="`cat $prime_settings`"
+# We support both uppercase and lowercase
+action="$(echo "$action" | /usr/bin/tr '[:upper:]' '[:lower:]')"
 
 # Always set up xorg.conf
 if [ "$action" = "ON" ]; then
@@ -70,9 +72,6 @@ if [ "$action" = "$nvidia_status" ]; then
     exit 0
 fi
 
-# We support both uppercase and lowercase
-action="$(echo "$action" | /usr/bin/tr -s '[:upper:]' '[:lower:]')"
-
 if [ "$action" = "on" ]; then
     echo "Enabling the NVIDIA card" \
          > $LOG 2>&1

commit 89ad28fd4aa51837a1000e181c626ad1552d98bc
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 12:53:40 2013 +0200

    debian/nvidia-prime.upstart: do not tell bbswitch to disable nvidia when loading

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index ea03298..d87cab4 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -44,7 +44,7 @@ script
         echo "No bbswitch can be found 1st attempt" \
          >> $LOG 2>&1
         # Load bbswitch
-        /sbin/modprobe bbswitch load_state=0 unload_state=1 || true
+        /sbin/modprobe bbswitch load_state=-1 unload_state=1 || true
         # Try again
         if [ ! -e $prime_power ]; then
             echo "No bbswitch can be found 2nd attempt" \

commit 89ba91d9aa0a7c2def241ae440161a4a85e835ff
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 12:43:21 2013 +0200

    prime-xconfig: use quotation marks instea of apostrophes

diff --git a/prime-xconfig b/prime-xconfig
index 0c1c76a..24a0d51 100644
--- a/prime-xconfig
+++ b/prime-xconfig
@@ -46,7 +46,7 @@ if [ "$action" = "on" ]; then
     # Get the BusID of NVIDIA
     bus_id=$(nv_get_id)
     # Set up a xorg.conf
-    sed -e 's|#BUSID#|$bus_id|g' \
+    sed -e "s|#BUSID#|$bus_id|g" \
     $xorg_template > $xorg_conf
 elif [ "$action" = "off" ]; then
     # Move away xorg.conf

commit c84d9670bbde65dd7c8795fb2f390fe4378bc920
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 12:29:47 2013 +0200

    debian/nvidia-prime.upstart: re-enable NVIDIA on shutdown

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index 1d9cc18..ea03298 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -9,11 +9,15 @@
 # that the NVIDIA card is disabled before lightdm
 # starts X if system settings require so.
 #
+# On system shutdown we remove bbswitch and re-enable
+# the NVIDIA card.
+#
 
 description	"NVIDIA PRIME Power Saving Mode"
 author		"Alberto Milone <alberto.milone@canonical.com>"
 
 start on starting lightdm
+stop on runlevel [016]
 
 script
     LOG=/var/log/nvidia-prime-upstart.log
@@ -40,7 +44,7 @@ script
         echo "No bbswitch can be found 1st attempt" \
          >> $LOG 2>&1
         # Load bbswitch
-        /sbin/modprobe bbswitch || true
+        /sbin/modprobe bbswitch load_state=0 unload_state=1 || true
         # Try again
         if [ ! -e $prime_power ]; then
             echo "No bbswitch can be found 2nd attempt" \
@@ -79,4 +83,8 @@ script
     fi
 end script
 
-
+pre-stop script
+    if lsmod | grep bbswitch > /dev/null; then
+        /sbin/rmmod bbswitch
+    fi
+end script

commit 0fcb87b4baf2d0b407d38fe3c5818b0be5460faf
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 11:40:41 2013 +0200

    debian/postrm.in: remove the display-stopped-script entry from lightdm.conf

diff --git a/debian/postrm.in b/debian/postrm.in
index 8ab88ae..cd7785b 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -29,6 +29,11 @@ remove_hybrid_script () {
         echo "$lightdm_orig" | \
         sed "/.*display-setup-script.*/d" \
         > "$lightdm_orig_conf"
+
+        lightdm_orig="$(cat $lightdm_orig_conf)"
+        echo "$lightdm_orig" | \
+        sed "/.*display-stopped-script.*/d" \
+        > "$lightdm_orig_conf"
     fi
 }
 

commit 353388ce3d38091cefbedf14a22ea3a420fe3a98
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 11:38:58 2013 +0200

    debian/postrm.in: remove /etc/lightdm/hybrid_default on package removal

diff --git a/debian/postrm.in b/debian/postrm.in
index 45204a6..8ab88ae 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -42,6 +42,9 @@ case "$1" in
         if [ ! "$1" = "upgrade" ]; then
             # Remove the display-setup-script line
             remove_hybrid_script
+
+            # Remove the settings
+            rm -f /etc/lightdm/hybrid_default
         fi
     ;;
 

commit 5d31b8ea64f7ca1c0b48f0b521458c24f004b67d
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 11:35:50 2013 +0200

    debian/preinst.in: create /etc/lightdm/hybrid_default

diff --git a/debian/preinst.in b/debian/preinst.in
index a82ec1e..ce1abad 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -71,6 +71,10 @@ case "$1" in
     install|upgrade)
         # Insert the display-setup-script line
         add_hybrid_script
+
+        if [ ! -f /etc/lightdm/hybrid_default ]; then
+            echo "on" > /etc/lightdm/hybrid_default
+        fi
     ;;
 
     abort-upgrade)

commit 625bd6745e38e9ac84a643c118e252ec8b84583f
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 11:30:01 2013 +0200

    Remove debian/postinst.in
    
    Conflicts:
    
    	debian/postinst.in

diff --git a/debian/postinst.in b/debian/postinst.in
deleted file mode 100644
index aa9c651..0000000
--- a/debian/postinst.in
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-# postinst script for nvidia-prime
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-xorg_conf="#XORG_CONF#"
-
-nvidia_id=""
-pattern="10de"
-for devclass in "300" "301" "302" "380"; do
-    nvidia_id="$(lspci -n | grep $devclass | grep $pattern | cut -d" " -f1 | sed s/\\./:/g)"
-    if [ -n "$nvidia_id" ]; then
-        # We have found the device
-        break
-    fi
-done
-
-id_0="$(echo $nvidia_id | cut -d: -f1)"
-id_1="$(echo $nvidia_id | cut -d: -f2)"
-id_2="$(echo $nvidia_id | cut -d: -f3)"
-
-bus_id=$(printf "%d:%d:%d\n" "${id_0#0}" "${id_1#0}" "${id_2#0}")
-
-now=$(date +"%m%d%Y")
-
-case "$1" in
-    configure)
-        if [ -f "$xorg_conf" ]; then
-            mv $xorg_conf $xorg_conf.$now
-        fi
-        cat > $xorg_conf <<EOF
-# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
-
-Section "ServerLayout"
-    Identifier "layout"
-    Screen 0 "nvidia"
-    Inactive "intel"
-EndSection
-
-Section "Device"
-    Identifier "nvidia"
-    Driver "nvidia"
-    BusID "$bus_id"
-EndSection
-
-Section "Screen"
-    Identifier "nvidia"
-    Device "nvidia"
-    # Uncomment this line if your computer has no display devices connected to
-    # the NVIDIA GPU.  Leave it commented if you have display devices
-    # connected to the NVIDIA GPU that you would like to use.
-    Option "UseDisplayDevice" "none"
-EndSection
-
-Section "Device"
-    Identifier "intel"
-    Driver "modesetting"
-EndSection
-
-Section "Screen"
-    Identifier "intel"
-    Device "intel"
-EndSection
-EOF
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index c269ef9..bd04abf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,6 @@ regen-from-templates:
 	for i in $(CURDIR)/debian/install \
 	     $(CURDIR)/debian/dirs \
 		 $(CURDIR)/debian/preinst \
-		 $(CURDIR)/debian/postinst \
 		 $(CURDIR)/debian/postrm; do \
 		sed -e 's|#XORG_CONF#|$(XORG_CONF)|g' \
 			-e 's|#XORG_TEMPLATE#|$(XORG_TEMPLATE)|g' \
@@ -54,7 +53,6 @@ override_dh_auto_clean:
 	for i in $(CURDIR)/debian/install \
 	     $(CURDIR)/debian/dirs \
 		 $(CURDIR)/debian/preinst \
-		 $(CURDIR)/debian/postinst \
 		 $(CURDIR)/debian/postrm; do \
 		rm -f $$i; \
 	done

commit 5446d78d71da5e71fe33493de3b5f4af0d78b433
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri Oct 4 11:28:59 2013 +0200

    Support case insensitive settings

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index ad29bf4..1d9cc18 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -52,12 +52,14 @@ script
     nvidia_status="`cat $prime_power | cut -d " " -f2`"
     action="`cat $prime_settings`"
 
+    # We support both uppercase and lowercase
+    action="$(echo "$action" | /usr/bin/tr -s '[:upper:]' '[:lower:]')"
 
-    if [ "$action" = "ON" ]; then
+    if [ "$action" = "on" ]; then
         echo "Configuring xorg.conf" \
          >> $LOG 2>&1
         /sbin/prime-xconfig on
-    elif [ "$action" = "OFF" ]; then
+    elif [ "$action" = "off" ]; then
         echo "Moving xorg.conf away" \
          >> $LOG 2>&1
         /sbin/prime-xconfig off
diff --git a/hybrid-switch b/hybrid-switch
index e542983..156d0e6 100755
--- a/hybrid-switch
+++ b/hybrid-switch
@@ -70,13 +70,16 @@ if [ "$action" = "$nvidia_status" ]; then
     exit 0
 fi
 
-if [ "$action" = "ON" ]; then
+# We support both uppercase and lowercase
+action="$(echo "$action" | /usr/bin/tr -s '[:upper:]' '[:lower:]')"
+
+if [ "$action" = "on" ]; then
     echo "Enabling the NVIDIA card" \
          > $LOG 2>&1
     echo "ON" > /proc/acpi/bbswitch
     /sbin/modprobe nvidia || true
     exit 0
-elif [ "$action" = "OFF" ]; then
+elif [ "$action" = "off" ]; then
     echo "Disabling the NVIDIA card" \
          > $LOG 2>&1
     /sbin/rmmod nvidia || true

commit 8bd114feca1e62f0ea84201851aa9366881850c4
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 19:31:18 2013 +0200

    Use prime-xconfig to configure xorg.conf

diff --git a/debian/install.in b/debian/install.in
index 0f03273..182f2c3 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -2,4 +2,4 @@
 xorg.template #LIGHTDM_CUSTOM_CONF_DIR#
 hybrid-power /sbin
 hybrid-switch /sbin
-get-nvidia-id /usr/bin
+prime-xconfig /sbin
diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index 331177d..ad29bf4 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -56,11 +56,11 @@ script
     if [ "$action" = "ON" ]; then
         echo "Configuring xorg.conf" \
          >> $LOG 2>&1
-        /usr/bin/prime-xconfig on
+        /sbin/prime-xconfig on
     elif [ "$action" = "OFF" ]; then
         echo "Moving xorg.conf away" \
          >> $LOG 2>&1
-        /usr/bin/prime-xconfig off
+        /sbin/prime-xconfig off
 
         # Do we need to take action?
         if [ "$action" = "$nvidia_status" ]; then
diff --git a/hybrid-switch b/hybrid-switch
index 7ac57d6..e542983 100755
--- a/hybrid-switch
+++ b/hybrid-switch
@@ -56,11 +56,11 @@ action="`cat $prime_settings`"
 if [ "$action" = "ON" ]; then
     echo "Configuring xorg.conf" \
      >> $LOG 2>&1
-    /usr/bin/prime-xconfig on
+    /sbin/prime-xconfig on
 elif [ "$action" = "OFF" ]; then
     echo "Moving xorg.conf away" \
      >> $LOG 2>&1
-    /usr/bin/prime-xconfig off
+    /sbin/prime-xconfig off
 fi
 
 # Do we need to call bbswitch?
diff --git a/prime-xconfig b/prime-xconfig
new file mode 100644
index 0000000..0c1c76a
--- /dev/null
+++ b/prime-xconfig
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+nv_get_id() {
+    bus_id=""
+    nvidia_id=""
+    pattern="10de"
+    for devclass in "300" "301" "302" "380"; do
+        nvidia_id="$(lspci -n | grep $devclass | grep $pattern | cut -d" " -f1 | sed s/\\./:/g)"
+        if [ -n "$nvidia_id" ]; then
+            # We have found the device
+            break
+        fi
+    done
+
+    id_0="$(echo $nvidia_id | cut -d: -f1)"
+    id_1="$(echo $nvidia_id | cut -d: -f2)"
+    id_2="$(echo $nvidia_id | cut -d: -f3)"
+
+    printf "%d:%d:%d\n" $id_0 $id_1 $id_1
+}
+
+xorg_conf=/etc/X11/xorg.conf
+xorg_template=/usr/share/nvidia-prime/xorg.template
+
+action="$1"
+
+if [ "$action" = "on" ]; then
+    # Get the BusID of NVIDIA
+    bus_id=$(nv_get_id)
+    # Set up a xorg.conf
+    sed -e 's|#BUSID#|$bus_id|g' \
+    $xorg_template > $xorg_conf
+elif [ "$action" = "off" ]; then
+    # Move away xorg.conf
+    now=$(date +"%m%d%Y")
+    if [ -f "$xorg_conf" ]; then
+        mv $xorg_conf $xorg_conf.$now
+    fi
+fi

commit 3fc272743cbe7fa4f5f6a677dbfd0db94cfebab0
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 19:28:29 2013 +0200

    hybrid-switch: make use of prime-xconfig and refine logic

diff --git a/hybrid-switch b/hybrid-switch
index 2edcf65..7ac57d6 100755
--- a/hybrid-switch
+++ b/hybrid-switch
@@ -17,47 +17,74 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-PRIME_LOG=/var/log/lightdm_prime_out.log
+LOG=/var/log/lightdm_prime_out.log
 prime_settings=/etc/lightdm/hybrid_default
 prime_power=/proc/acpi/bbswitch
 
+# Remove any previous logs
+rm -f $LOG
+
+if lsmod | grep nouveau > /dev/null; then
+    # Exit if nouveau is in use
+    echo "Sorry but nvidia-prime does not work with the nouveau driver" \
+         > $LOG 2>&1
+    exit 0
+fi
+
 if [ ! -e $prime_settings ]; then
     echo "No settings for prime can be found in $prime_settings" \
-         > $PRIME_LOG 2>&1
+         > $LOG 2>&1
     exit 0
 fi
 
+if ! lsmod | grep bbswitch > /dev/null; then
+    # Try to load bbswitch
+    /sbin/modprobe bbswitch || true
+fi
+
 if [ ! -e $prime_power ]; then
+    # If we get here there is no bbswitch module
     echo "No bbswitch can be found" \
-         > $PRIME_LOG 2>&1
+         > $LOG 2>&1
     exit 0
 fi
 
 nvidia_status="`cat $prime_power | cut -d " " -f2`"
 action="`cat $prime_settings`"
 
-# Do we need to change anything?
+# Always set up xorg.conf
+if [ "$action" = "ON" ]; then
+    echo "Configuring xorg.conf" \
+     >> $LOG 2>&1
+    /usr/bin/prime-xconfig on
+elif [ "$action" = "OFF" ]; then
+    echo "Moving xorg.conf away" \
+     >> $LOG 2>&1
+    /usr/bin/prime-xconfig off
+fi
+
+# Do we need to call bbswitch?
 if [ "$action" = "$nvidia_status" ]; then
     echo "No action required to get PRIME to work" \
-         > $PRIME_LOG 2>&1
+         > $LOG 2>&1
     exit 0
 fi
 
 if [ "$action" = "ON" ]; then
     echo "Enabling the NVIDIA card" \
-         > $PRIME_LOG 2>&1
+         > $LOG 2>&1
     echo "ON" > /proc/acpi/bbswitch
     /sbin/modprobe nvidia || true
     exit 0
 elif [ "$action" = "OFF" ]; then
     echo "Disabling the NVIDIA card" \
-         > $PRIME_LOG 2>&1
+         > $LOG 2>&1
     /sbin/rmmod nvidia || true
     echo "OFF" > /proc/acpi/bbswitch
     exit 0
 else
     echo "\"$action\" is not a valid action for PRIME" \
-         > $PRIME_LOG 2>&1
+         > $LOG 2>&1
     exit 0
 fi
 

commit 2e046c748564521ad9d72d51a4a50220819e2f18
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 19:27:50 2013 +0200

    debian/nvidia-prime.upstart: remove X configuration

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
new file mode 100644
index 0000000..331177d
--- /dev/null
+++ b/debian/nvidia-prime.upstart
@@ -0,0 +1,80 @@
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# NVIDIA PRIME - Power Saving Mode
+#
+# We need to make sure that bbswitch is loaded and
+# that the NVIDIA card is disabled before lightdm
+# starts X if system settings require so.
+#
+
+description	"NVIDIA PRIME Power Saving Mode"
+author		"Alberto Milone <alberto.milone@canonical.com>"
+
+start on starting lightdm
+
+script
+    LOG=/var/log/nvidia-prime-upstart.log
+    prime_settings=/etc/lightdm/hybrid_default
+    prime_power=/proc/acpi/bbswitch
+
+    # Remove any previous logs
+    rm -f $LOG
+
+    if lsmod | grep nouveau > /dev/null; then
+        # exit if nouveau is in use
+        echo "Sorry but nvidia-prime does not work with the nouveau driver" \
+             > $LOG 2>&1
+        exit 0
+    fi
+
+    if [ ! -e $prime_settings ]; then
+        echo "No settings for nvidia-prime can be found in $prime_settings" \
+         > $LOG 2>&1
+        exit 0
+    fi
+
+    if [ ! -e $prime_power ]; then
+        echo "No bbswitch can be found 1st attempt" \
+         >> $LOG 2>&1
+        # Load bbswitch
+        /sbin/modprobe bbswitch || true
+        # Try again
+        if [ ! -e $prime_power ]; then
+            echo "No bbswitch can be found 2nd attempt" \
+                  >> $LOG 2>&1
+            exit 0
+        fi
+    fi
+
+    nvidia_status="`cat $prime_power | cut -d " " -f2`"
+    action="`cat $prime_settings`"
+
+
+    if [ "$action" = "ON" ]; then
+        echo "Configuring xorg.conf" \
+         >> $LOG 2>&1
+        /usr/bin/prime-xconfig on
+    elif [ "$action" = "OFF" ]; then
+        echo "Moving xorg.conf away" \
+         >> $LOG 2>&1
+        /usr/bin/prime-xconfig off
+
+        # Do we need to take action?
+        if [ "$action" = "$nvidia_status" ]; then
+            echo "No action required to get nvidia-prime to work" \
+             >> $LOG 2>&1
+            exit 0
+        fi
+
+        # Disable the card
+        echo "Disabling the NVIDIA card" \
+         >> $LOG 2>&1
+        /sbin/rmmod nvidia || true
+        echo "OFF" > /proc/acpi/bbswitch
+    fi
+end script
+
+
diff --git a/debian/nvidia-prime.upstart.in b/debian/nvidia-prime.upstart.in
deleted file mode 100644
index 6e8a674..0000000
--- a/debian/nvidia-prime.upstart.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright 2013 Canonical Ltd.
-#
-# Author: Alberto Milone <alberto.milone@canonical.com>
-#
-# NVIDIA PRIME - Power Saving Mode
-#
-# We need to make sure that bbswitch is loaded and
-# that the NVIDIA card is disabled before lightdm
-# starts X if system settings require so.
-#
-
-description	"NVIDIA PRIME Power Saving Mode"
-author		"Alberto Milone <alberto.milone@canonical.com>"
-
-start on starting lightdm
-
-script
-    LOG=/var/log/nvidia_prime.log
-    prime_settings=/etc/lightdm/hybrid_default
-    prime_power=/proc/acpi/bbswitch
-
-    # Remove any previous logs
-    rm -f $LOG
-
-    if [ ! -e $prime_settings ]; then
-        echo "No settings for prime can be found in $prime_settings" \
-         > $LOG 2>&1
-        exit 0
-    fi
-
-    if [ ! -e $prime_power ]; then
-        echo "No bbswitch can be found 1st attempt" \
-         >> $LOG 2>&1
-        # Load bbswitch
-        /sbin/modprobe bbswitch || true
-        # Try again
-        if [ ! -e $prime_power ]; then
-            echo "No bbswitch can be found 2nd attempt" \
-                  >> $LOG 2>&1
-            exit 0
-        fi
-    fi
-
-    nvidia_status="`cat $prime_power | cut -d " " -f2`"
-    action="`cat $prime_settings`"
-
-
-    if [ "$action" = "ON" ]; then
-        # Get the BusID of NVIDIA
-        bus_id="`/usr/bin/get-nvidia-id`"
-        # Set up a xorg.conf
-        sed -e 's|#BUSID#|$bus_id|g' \
-        #XORG_TEMPLATE# \
-        > #XORG_CONF#
-    elif [ "$action" = "OFF" ]; then
-        # Do we need to take action?
-        if [ "$action" = "$nvidia_status" ]; then
-            echo "No action required to get PRIME to work" \
-             >> $LOG 2>&1
-            exit 0
-        fi
-
-        # Move away xorg.conf
-        now=$(date +"%m%d%Y")
-        if [ -f "#XORG_CONF#" ]; then
-            mv #XORG_CONF# #XORG_CONF#.$now
-        fi
-
-        # Disable the card
-        echo "Disabling the NVIDIA card" \
-         >> $LOG 2>&1
-        /sbin/rmmod nvidia || true
-        echo "OFF" > /proc/acpi/bbswitch
-    fi
-end script
-
-
diff --git a/debian/rules b/debian/rules
index f5c44c7..c269ef9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,6 @@ XORG_TEMPLATE := $(PKG_lightdm_custom_config_dir)/xorg.template
 .PHONY: regen-from-templates
 regen-from-templates:
 	for i in $(CURDIR)/debian/install \
-		 $(CURDIR)/debian/$(PKG_name).upstart \
 	     $(CURDIR)/debian/dirs \
 		 $(CURDIR)/debian/preinst \
 		 $(CURDIR)/debian/postinst \
@@ -53,7 +52,6 @@ regen-from-templates:
 
 override_dh_auto_clean:
 	for i in $(CURDIR)/debian/install \
-		 $(CURDIR)/debian/$(PKG_name).upstart \
 	     $(CURDIR)/debian/dirs \
 		 $(CURDIR)/debian/preinst \
 		 $(CURDIR)/debian/postinst \

commit 884c7ad0a955e5598634ea80369e673d3cace61a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 17:45:02 2013 +0200

    Generate more templates

diff --git a/debian/install.in b/debian/install.in
index 8b1acf9..0f03273 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,3 +1,5 @@
 #LIGHTDM_CONF_FILENAME_D# #LIGHTDM_CONF_DIR_D#
+xorg.template #LIGHTDM_CUSTOM_CONF_DIR#
 hybrid-power /sbin
 hybrid-switch /sbin
+get-nvidia-id /usr/bin
diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
deleted file mode 100644
index 6e8a674..0000000
--- a/debian/nvidia-prime.upstart
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright 2013 Canonical Ltd.
-#
-# Author: Alberto Milone <alberto.milone@canonical.com>
-#
-# NVIDIA PRIME - Power Saving Mode
-#
-# We need to make sure that bbswitch is loaded and
-# that the NVIDIA card is disabled before lightdm
-# starts X if system settings require so.
-#
-
-description	"NVIDIA PRIME Power Saving Mode"
-author		"Alberto Milone <alberto.milone@canonical.com>"
-
-start on starting lightdm
-
-script
-    LOG=/var/log/nvidia_prime.log
-    prime_settings=/etc/lightdm/hybrid_default
-    prime_power=/proc/acpi/bbswitch
-
-    # Remove any previous logs
-    rm -f $LOG
-
-    if [ ! -e $prime_settings ]; then
-        echo "No settings for prime can be found in $prime_settings" \
-         > $LOG 2>&1
-        exit 0
-    fi
-
-    if [ ! -e $prime_power ]; then
-        echo "No bbswitch can be found 1st attempt" \
-         >> $LOG 2>&1
-        # Load bbswitch
-        /sbin/modprobe bbswitch || true
-        # Try again
-        if [ ! -e $prime_power ]; then
-            echo "No bbswitch can be found 2nd attempt" \
-                  >> $LOG 2>&1
-            exit 0
-        fi
-    fi
-
-    nvidia_status="`cat $prime_power | cut -d " " -f2`"
-    action="`cat $prime_settings`"
-
-
-    if [ "$action" = "ON" ]; then
-        # Get the BusID of NVIDIA
-        bus_id="`/usr/bin/get-nvidia-id`"
-        # Set up a xorg.conf
-        sed -e 's|#BUSID#|$bus_id|g' \
-        #XORG_TEMPLATE# \
-        > #XORG_CONF#
-    elif [ "$action" = "OFF" ]; then
-        # Do we need to take action?
-        if [ "$action" = "$nvidia_status" ]; then
-            echo "No action required to get PRIME to work" \
-             >> $LOG 2>&1
-            exit 0
-        fi
-
-        # Move away xorg.conf
-        now=$(date +"%m%d%Y")
-        if [ -f "#XORG_CONF#" ]; then
-            mv #XORG_CONF# #XORG_CONF#.$now
-        fi
-
-        # Disable the card
-        echo "Disabling the NVIDIA card" \
-         >> $LOG 2>&1
-        /sbin/rmmod nvidia || true
-        echo "OFF" > /proc/acpi/bbswitch
-    fi
-end script
-
-
diff --git a/debian/nvidia-prime.upstart.in b/debian/nvidia-prime.upstart.in
new file mode 100644
index 0000000..6e8a674
--- /dev/null
+++ b/debian/nvidia-prime.upstart.in
@@ -0,0 +1,78 @@
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# NVIDIA PRIME - Power Saving Mode
+#
+# We need to make sure that bbswitch is loaded and
+# that the NVIDIA card is disabled before lightdm
+# starts X if system settings require so.
+#
+
+description	"NVIDIA PRIME Power Saving Mode"
+author		"Alberto Milone <alberto.milone@canonical.com>"
+
+start on starting lightdm
+
+script
+    LOG=/var/log/nvidia_prime.log
+    prime_settings=/etc/lightdm/hybrid_default
+    prime_power=/proc/acpi/bbswitch
+
+    # Remove any previous logs
+    rm -f $LOG
+
+    if [ ! -e $prime_settings ]; then
+        echo "No settings for prime can be found in $prime_settings" \
+         > $LOG 2>&1
+        exit 0
+    fi
+
+    if [ ! -e $prime_power ]; then
+        echo "No bbswitch can be found 1st attempt" \
+         >> $LOG 2>&1
+        # Load bbswitch
+        /sbin/modprobe bbswitch || true
+        # Try again
+        if [ ! -e $prime_power ]; then
+            echo "No bbswitch can be found 2nd attempt" \
+                  >> $LOG 2>&1
+            exit 0
+        fi
+    fi
+
+    nvidia_status="`cat $prime_power | cut -d " " -f2`"
+    action="`cat $prime_settings`"
+
+
+    if [ "$action" = "ON" ]; then
+        # Get the BusID of NVIDIA
+        bus_id="`/usr/bin/get-nvidia-id`"
+        # Set up a xorg.conf
+        sed -e 's|#BUSID#|$bus_id|g' \
+        #XORG_TEMPLATE# \
+        > #XORG_CONF#
+    elif [ "$action" = "OFF" ]; then
+        # Do we need to take action?
+        if [ "$action" = "$nvidia_status" ]; then
+            echo "No action required to get PRIME to work" \
+             >> $LOG 2>&1
+            exit 0
+        fi
+
+        # Move away xorg.conf
+        now=$(date +"%m%d%Y")
+        if [ -f "#XORG_CONF#" ]; then
+            mv #XORG_CONF# #XORG_CONF#.$now
+        fi
+
+        # Disable the card
+        echo "Disabling the NVIDIA card" \
+         >> $LOG 2>&1
+        /sbin/rmmod nvidia || true
+        echo "OFF" > /proc/acpi/bbswitch
+    fi
+end script
+
+
diff --git a/debian/rules b/debian/rules
index 7e14397..f5c44c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ PKG_lightdm_config_dir_d := $(PKG_lightdm_config_dir)/lightdm.conf.d
 PKG_lightdm_config_file_d := $(PKG_lightdm_config_dir_d)/$(PKG_lightdm_config_filename_d)
 
 XORG_CONF := /etc/X11/xorg.conf
+XORG_TEMPLATE := $(PKG_lightdm_custom_config_dir)/xorg.template
 
 %:
 	dh $@
@@ -31,10 +32,13 @@ XORG_CONF := /etc/X11/xorg.conf
 .PHONY: regen-from-templates
 regen-from-templates:
 	for i in $(CURDIR)/debian/install \
+		 $(CURDIR)/debian/$(PKG_name).upstart \
+	     $(CURDIR)/debian/dirs \
 		 $(CURDIR)/debian/preinst \
 		 $(CURDIR)/debian/postinst \
 		 $(CURDIR)/debian/postrm; do \
 		sed -e 's|#XORG_CONF#|$(XORG_CONF)|g' \
+			-e 's|#XORG_TEMPLATE#|$(XORG_TEMPLATE)|g' \
 			-e 's|#PKGNAME#|$(PKG_name)|g' \
 			-e "s|#LIGHTDM_CONF_FILE#|$(PKG_lightdm_config_file)|g" \
 			-e "s|#LIGHTDM_CONF_DIR#|$(PKG_lightdm_config_dir)|g" \
@@ -43,11 +47,14 @@ regen-from-templates:
 			-e "s|#LIGHTDM_CONF_FILE_D#|$(PKG_lightdm_config_file_d)|g" \
 			-e "s|#LIGHTDM_CONF_DIR_D#|$(PKG_lightdm_config_dir_d)|g" \
 			-e "s|#LIGHTDM_CONF_FILENAME_D#|$(PKG_lightdm_config_filename_d)|g" \
+			-e "s|#PRIME_DIR#|$(PKG_lightdm_config_filename_d)|g" \
 		$$i.in > $$i; \
 	done
 
 override_dh_auto_clean:
 	for i in $(CURDIR)/debian/install \
+		 $(CURDIR)/debian/$(PKG_name).upstart \
+	     $(CURDIR)/debian/dirs \
 		 $(CURDIR)/debian/preinst \
 		 $(CURDIR)/debian/postinst \
 		 $(CURDIR)/debian/postrm; do \

commit 69e7bd5aaa5aa217fcd018b3f13c53b5c8cea7dc
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 17:44:21 2013 +0200

    Add get-nvidia-id

diff --git a/get-nvidia-id b/get-nvidia-id
new file mode 100644
index 0000000..7c33ae7
--- /dev/null
+++ b/get-nvidia-id
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+bus_id=""
+nvidia_id=""
+pattern="10de"
+for devclass in "300" "301" "302" "380"; do
+    nvidia_id="$(lspci -n | grep $devclass | grep $pattern | cut -d" " -f1 | sed s/\\./:/g)"
+    if [ -n "$nvidia_id" ]; then
+        # We have found the device
+        break
+    fi
+done
+
+id_0="$(echo $nvidia_id | cut -d: -f1)"
+id_1="$(echo $nvidia_id | cut -d: -f2)"
+id_2="$(echo $nvidia_id | cut -d: -f3)"
+
+bus_id=$(printf "%d:%d:%d\n" $id_0 $id_1 $id_1)
+echo "$bus_id"

commit 3f0fe7bfec863a02184850279b770b37988e0274
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 17:43:46 2013 +0200

    debian/nvidia-prime.upstart: set up xorg.conf on boot

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
index 2dc4d99..6e8a674 100644
--- a/debian/nvidia-prime.upstart
+++ b/debian/nvidia-prime.upstart
@@ -1,3 +1,8 @@
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
 # NVIDIA PRIME - Power Saving Mode
 #
 # We need to make sure that bbswitch is loaded and
@@ -40,19 +45,33 @@ script
     nvidia_status="`cat $prime_power | cut -d " " -f2`"
     action="`cat $prime_settings`"
 
-    # Do we need to take action?
-    if [ "$action" = "$nvidia_status" ]; then
-        echo "No action required to get PRIME to work" \
-         >> $LOG 2>&1
-        exit 0
-    fi
 
-    if [ "$action" = "OFF" ]; then
+    if [ "$action" = "ON" ]; then
+        # Get the BusID of NVIDIA
+        bus_id="`/usr/bin/get-nvidia-id`"
+        # Set up a xorg.conf
+        sed -e 's|#BUSID#|$bus_id|g' \
+        #XORG_TEMPLATE# \
+        > #XORG_CONF#
+    elif [ "$action" = "OFF" ]; then
+        # Do we need to take action?
+        if [ "$action" = "$nvidia_status" ]; then
+            echo "No action required to get PRIME to work" \
+             >> $LOG 2>&1
+            exit 0
+        fi
+
+        # Move away xorg.conf
+        now=$(date +"%m%d%Y")
+        if [ -f "#XORG_CONF#" ]; then
+            mv #XORG_CONF# #XORG_CONF#.$now
+        fi
+
+        # Disable the card
         echo "Disabling the NVIDIA card" \
          >> $LOG 2>&1
         /sbin/rmmod nvidia || true
         echo "OFF" > /proc/acpi/bbswitch
-        exit 0
     fi
 end script
 

commit 3eef06a377e3f972adb821eacd1cb8b6b506bf2e
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 17:08:51 2013 +0200

    Add upstart job

diff --git a/debian/nvidia-prime.upstart b/debian/nvidia-prime.upstart
new file mode 100644
index 0000000..2dc4d99
--- /dev/null
+++ b/debian/nvidia-prime.upstart
@@ -0,0 +1,59 @@
+# NVIDIA PRIME - Power Saving Mode
+#
+# We need to make sure that bbswitch is loaded and
+# that the NVIDIA card is disabled before lightdm
+# starts X if system settings require so.
+#
+
+description	"NVIDIA PRIME Power Saving Mode"
+author		"Alberto Milone <alberto.milone@canonical.com>"
+
+start on starting lightdm
+
+script
+    LOG=/var/log/nvidia_prime.log
+    prime_settings=/etc/lightdm/hybrid_default
+    prime_power=/proc/acpi/bbswitch
+
+    # Remove any previous logs
+    rm -f $LOG
+
+    if [ ! -e $prime_settings ]; then
+        echo "No settings for prime can be found in $prime_settings" \
+         > $LOG 2>&1
+        exit 0
+    fi
+
+    if [ ! -e $prime_power ]; then
+        echo "No bbswitch can be found 1st attempt" \
+         >> $LOG 2>&1
+        # Load bbswitch
+        /sbin/modprobe bbswitch || true
+        # Try again
+        if [ ! -e $prime_power ]; then
+            echo "No bbswitch can be found 2nd attempt" \
+                  >> $LOG 2>&1
+            exit 0
+        fi
+    fi
+
+    nvidia_status="`cat $prime_power | cut -d " " -f2`"
+    action="`cat $prime_settings`"
+
+    # Do we need to take action?
+    if [ "$action" = "$nvidia_status" ]; then
+        echo "No action required to get PRIME to work" \
+         >> $LOG 2>&1
+        exit 0
+    fi
+
+    if [ "$action" = "OFF" ]; then
+        echo "Disabling the NVIDIA card" \
+         >> $LOG 2>&1
+        /sbin/rmmod nvidia || true
+        echo "OFF" > /proc/acpi/bbswitch
+        exit 0
+    fi
+end script
+
+

commit df3793c8b10a570848cf4d9988e0dd7a7c84ee5f
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 17:02:13 2013 +0200

    Add xorg.template

diff --git a/xorg.template b/xorg.template
new file mode 100644
index 0000000..5af010b
--- /dev/null
+++ b/xorg.template
@@ -0,0 +1,32 @@
+# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
+
+Section "ServerLayout"
+    Identifier "layout"
+    Screen 0 "nvidia"
+    Inactive "intel"
+EndSection
+
+Section "Device"
+    Identifier "nvidia"
+    Driver "nvidia"
+    BusID "#BUSID#"
+EndSection
+
+Section "Screen"
+    Identifier "nvidia"
+    Device "nvidia"
+    # Uncomment this line if your computer has no display devices connected to
+    # the NVIDIA GPU.  Leave it commented if you have display devices
+    # connected to the NVIDIA GPU that you would like to use.
+    Option "UseDisplayDevice" "none"
+EndSection
+
+Section "Device"
+    Identifier "intel"
+    Driver "modesetting"
+EndSection
+
+Section "Screen"
+    Identifier "intel"
+    Device "intel"
+EndSection

commit af024789c2caecc58318946b48137cab83e4416e
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 17:01:40 2013 +0200

    hybrid-power: remove redundant check on prime

diff --git a/hybrid-power b/hybrid-power
index 60ecf4b..3d5767b 100755
--- a/hybrid-power
+++ b/hybrid-power
@@ -67,11 +67,6 @@ if ! $has_intel || ! $has_nvidia; then
     exit 0
 fi
 
-if [ -e $prime_power ] && [ "`cat $prime_power | cut -d " " -f2`" = "OFF" ]; then
-    echo "Not offloading rendering to disabled Nvidia"
-    exit 0
-fi
-
 # Check the xrandr version
 randr_ver="$(xrandr -v)"
 client=$(echo "$randr_ver" | grep "program" | awk '{print $NF}' | cut -d. -f2)

commit a23a8cb2e8b6cfedf597bfb9f65a49a72483a350
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 11:05:18 2013 +0200

    debian/install.in: install hybrid-switch script

diff --git a/debian/install.in b/debian/install.in
index 0ede715..8b1acf9 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,2 +1,3 @@
 #LIGHTDM_CONF_FILENAME_D# #LIGHTDM_CONF_DIR_D#
 hybrid-power /sbin
+hybrid-switch /sbin

commit cd6d75e90e0821697dd5783d342ae86af0937685
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Oct 3 11:00:30 2013 +0200

    debian/preinst.in: create a display-stopped-script entry in lightdm.conf

diff --git a/debian/preinst.in b/debian/preinst.in
index 8300739..a82ec1e 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -35,6 +35,25 @@ display-setup-script\=\/sbin\/hybrid-power/g" \
 display-setup-script\=\/sbin\/hybrid-power' \
             > "$lightdm_orig_conf"
         fi
+
+        # Read the file again
+        lightdm_orig="$(cat $lightdm_orig_conf)"
+
+        # See if a display stopped script is already
+        # in use
+        if echo "$lightdm_orig" | \
+             grep "display-stopped-script"; then
+            echo "$lightdm_orig" | \
+            sed "s/.*display-stopped-script.*/\
+display-stopped-script\=\/sbin\/hybrid-switch/g" \
+            > "$lightdm_orig_conf"
+        else
+            # Add a line after the pattern
+            echo "$lightdm_orig" | \
+            sed '/.*display-setup-script.*/ a\
+display-stopped-script\=\/sbin\/hybrid-switch' \
+            > "$lightdm_orig_conf"
+        fi
     else
         # Let's create a configuration file
         # from scratch
@@ -43,6 +62,7 @@ display-setup-script\=\/sbin\/hybrid-power' \
 greeter-session=unity-greeter
 user-session=ubuntu
 display-setup-script=/sbin/hybrid-power
+display-stopped-script=/sbin/hybrid-switch
 EOF
     fi
 }

commit 427694ac741a37af69e906f3cf4198629e3849a6
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 2 18:35:41 2013 +0200

    Add hybrid-switch script
    
    This is meant to be used as the "session-cleanup-script" for
    lightdm, so that the discrete card is either enabled or disabled
    on log out.

diff --git a/hybrid-switch b/hybrid-switch
new file mode 100755
index 0000000..2edcf65
--- /dev/null
+++ b/hybrid-switch
@@ -0,0 +1,63 @@
+#!/bin/sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+PRIME_LOG=/var/log/lightdm_prime_out.log
+prime_settings=/etc/lightdm/hybrid_default
+prime_power=/proc/acpi/bbswitch
+
+if [ ! -e $prime_settings ]; then
+    echo "No settings for prime can be found in $prime_settings" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+
+if [ ! -e $prime_power ]; then
+    echo "No bbswitch can be found" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+
+nvidia_status="`cat $prime_power | cut -d " " -f2`"
+action="`cat $prime_settings`"
+
+# Do we need to change anything?
+if [ "$action" = "$nvidia_status" ]; then
+    echo "No action required to get PRIME to work" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+
+if [ "$action" = "ON" ]; then
+    echo "Enabling the NVIDIA card" \
+         > $PRIME_LOG 2>&1
+    echo "ON" > /proc/acpi/bbswitch
+    /sbin/modprobe nvidia || true
+    exit 0
+elif [ "$action" = "OFF" ]; then
+    echo "Disabling the NVIDIA card" \
+         > $PRIME_LOG 2>&1
+    /sbin/rmmod nvidia || true
+    echo "OFF" > /proc/acpi/bbswitch
+    exit 0
+else
+    echo "\"$action\" is not a valid action for PRIME" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+

commit ea3d52dcb00e22e7e41864ea5b500fe4c5ce9cd4
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 2 18:00:19 2013 +0200

    hybrid-power: check that the discrete card is ON
    
    Abort if bbswitch is available and the card is switched off.

diff --git a/hybrid-power b/hybrid-power
index 00fb7fd..60ecf4b 100755
--- a/hybrid-power
+++ b/hybrid-power
@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 PRIME_LOG=/var/log/lightdm_prime.log
+prime_power=/proc/acpi/bbswitch
 
 # Only for NVIDIA's proprietary driver
 if ! lsmod | grep nvidia > /dev/null; then
@@ -66,6 +67,11 @@ if ! $has_intel || ! $has_nvidia; then
     exit 0
 fi
 
+if [ -e $prime_power ] && [ "`cat $prime_power | cut -d " " -f2`" = "OFF" ]; then
+    echo "Not offloading rendering to disabled Nvidia"
+    exit 0
+fi
+
 # Check the xrandr version
 randr_ver="$(xrandr -v)"
 client=$(echo "$randr_ver" | grep "program" | awk '{print $NF}' | cut -d. -f2)

commit 64f40d64a6cbacd6ae18ddfab724f5b2cbcf8f2f
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Nov 25 19:14:45 2013 +0100

    Start work on 0.5

diff --git a/debian/changelog b/debian/changelog
index f3befaf..89521d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.5) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 25 Nov 2013 19:14:37 +0100
+
 nvidia-prime (0.4.2) trusty; urgency=low
 
   * debian/postinst.in: fix issue with printf

commit ca5b5144a770547e1d44b6913b4182d4a554b895
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 23 15:46:28 2013 +0200

    Release 0.4.2

diff --git a/debian/changelog b/debian/changelog
index 99e13e1..f3befaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-nvidia-prime (0.4.2) UNRELEASED; urgency=low
+nvidia-prime (0.4.2) trusty; urgency=low
 
-  * 
+  * debian/postinst.in: fix issue with printf
+    - Apparently the printf command treats string values
+      with leading zeros as octal. Work around this by
+      removing any leading zeros (LP: #1219650).
 
- -- Alberto Milone <alberto.milone@canonical.com>  Wed, 23 Oct 2013 15:07:20 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 23 Oct 2013 15:45:24 +0200
 
 nvidia-prime (0.4.1) trusty; urgency=low
 

commit e184c9b1e6b907f0c1f6c5f3cb98da90a2f2700c
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 23 15:07:57 2013 +0200

    debian/postinst.in: fix issue with printf
    
    Apparently the printf command treats string values with
    leading zeros as octal. Work around this by removing any
    leading zeros (LP: #1219650).

diff --git a/debian/postinst.in b/debian/postinst.in
index a4ce9d7..aa9c651 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -33,7 +33,7 @@ id_0="$(echo $nvidia_id | cut -d: -f1)"
 id_1="$(echo $nvidia_id | cut -d: -f2)"
 id_2="$(echo $nvidia_id | cut -d: -f3)"
 
-bus_id=$(printf "%d:%d:%d\n" $id_0 $id_1 $id_1)
+bus_id=$(printf "%d:%d:%d\n" "${id_0#0}" "${id_1#0}" "${id_2#0}")
 
 now=$(date +"%m%d%Y")
 

commit 65941fe96a717e5ecf55291ee0ec2ce0a8432379
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 23 15:07:33 2013 +0200

    Start work on 0.4.2

diff --git a/debian/changelog b/debian/changelog
index 2145f35..99e13e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.4.2) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 23 Oct 2013 15:07:20 +0200
+
 nvidia-prime (0.4.1) trusty; urgency=low
 
   * debian/preinst.in:

commit 822d2a0b825c955d6c403abce37b3986ff52dd34
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 23 12:59:29 2013 +0200

    Release 0.4.1

diff --git a/debian/changelog b/debian/changelog
index 054cac7..2145f35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-nvidia-prime (0.5) UNRELEASED; urgency=low
+nvidia-prime (0.4.1) trusty; urgency=low
 
-  * 
+  * debian/preinst.in:
+    - Remove leftover in the test condition. This was
+      causing the lightdm.conf file to be rewritten
+      every time. This is a serious problem on the
+      different Ubuntu flavours (LP: #1224098).
 
- -- Alberto Milone <alberto.milone@canonical.com>  Wed, 23 Oct 2013 12:34:50 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 23 Oct 2013 13:03:55 +0200
 
 nvidia-prime (0.4) saucy; urgency=low
 

commit bfdc22f763d13ab92361dfeff4ace88e3f4d74ce
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 23 12:36:12 2013 +0200

    debian/preinst.in: remove leftover in the test condition
    
    This was causing the lightdm.conf file to be rewritten every time.
    See LP: #1224098.

diff --git a/debian/preinst.in b/debian/preinst.in
index 4edf52e..8300739 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -16,8 +16,7 @@ set -e
 lightdm_orig_conf=#LIGHTDM_CONF_FILE#
 
 add_hybrid_script () {
-    if [ -f "$lightdm_orig_conf" -a \
-         ! -s "$lightdm_orig_conf" ]; then
+    if [ -s "$lightdm_orig_conf" ]; then
         # Get the file
         lightdm_orig="$(cat $lightdm_orig_conf)"
 

commit 49b9e27a84feb789f8b4ed317c15619321fce133
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Oct 23 12:35:13 2013 +0200

    Start work on 0.5

diff --git a/debian/changelog b/debian/changelog
index 8cd9e55..054cac7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.5) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 23 Oct 2013 12:34:50 +0200
+
 nvidia-prime (0.4) saucy; urgency=low
 
   * debian/postinst.in, hybrid-power:

commit 45f92e3fedc53ee9773873e8bfb06a1517f9c3cb
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu Aug 8 11:30:47 2013 +0200

    Release 0.4

diff --git a/debian/changelog b/debian/changelog
index 0dc7508..8cd9e55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-nvidia-prime (0.4) UNRELEASED; urgency=low
+nvidia-prime (0.4) saucy; urgency=low
 
-  * 
+  * debian/postinst.in, hybrid-power:
+    - Make sure to support more pci device classes as per
+      the pci.ids file (LP: #1207626).
 
- -- Alberto Milone <alberto.milone@canonical.com>  Wed, 07 Aug 2013 17:15:14 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 08 Aug 2013 11:27:27 +0200
 
 nvidia-prime (0.3) saucy; urgency=low
 

commit 132002ed92e4a8e7958702a9386023227bc39ac3
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Aug 7 17:41:52 2013 +0200

    Make sure to support more pci device classes as per the pci.ids file
    
    C 03  Display controller
        00  VGA compatible controller
            00  VGA controller
            01  8514 controller
        01  XGA compatible controller
        02  3D controller
        80  Display controller

diff --git a/debian/postinst.in b/debian/postinst.in
index d5e4c50..a4ce9d7 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -19,7 +19,16 @@ set -e
 
 xorg_conf="#XORG_CONF#"
 
-nvidia_id="$(lspci -n | grep 300 | grep de | cut -d" " -f1 | sed s/\\./:/g)"
+nvidia_id=""
+pattern="10de"
+for devclass in "300" "301" "302" "380"; do
+    nvidia_id="$(lspci -n | grep $devclass | grep $pattern | cut -d" " -f1 | sed s/\\./:/g)"
+    if [ -n "$nvidia_id" ]; then
+        # We have found the device
+        break
+    fi
+done
+
 id_0="$(echo $nvidia_id | cut -d: -f1)"
 id_1="$(echo $nvidia_id | cut -d: -f2)"
 id_2="$(echo $nvidia_id | cut -d: -f3)"
diff --git a/hybrid-power b/hybrid-power
index 37800a9..00fb7fd 100755
--- a/hybrid-power
+++ b/hybrid-power
@@ -28,9 +28,39 @@ if ! lsmod | grep nvidia > /dev/null; then
 fi
 
 # We only support intel + nvidia
-cards="$(lspci -n | grep 300)"
-if ! (echo "$cards" | grep -i 10de > /dev/null && \
-    echo "$cards" | grep 8086 > /dev/null); then
+cards="$(lspci -n)"
+# the different classes as per pci.ids
+# Syntax:
+# C class   class_name
+#   subclass    subclass_name       <-- single tab
+#       prog-if  prog-if_name   <-- two tabs
+#C 03  Display controller
+#    00  VGA compatible controller
+#        00  VGA controller
+#        01  8514 controller
+#    01  XGA compatible controller
+#    02  3D controller
+#    80  Display controller
+gfx_300="$(echo "$cards" | grep 300)"
+gfx_301="$(echo "$cards" | grep 301)"
+gfx_302="$(echo "$cards" | grep 302)"
+gfx_380="$(echo "$cards" | grep 380)"
+
+has_nvidia=false
+has_intel=false
+
+for gfx_class in "$gfx_300" "$gfx_301" "$gfx_302" "$gfx_380"; do
+    if echo "$gfx_class" | egrep -q "8086"; then
+      # Intel detected
+      has_intel=true
+    fi
+    if echo "$gfx_class" | egrep -q "10de"; then
+      # Nvidia detected
+      has_nvidia=true
+    fi
+done
+
+if ! $has_intel || ! $has_nvidia; then
     echo "Sorry we only support Intel+Nvidia" \
          > $PRIME_LOG 2>&1
     exit 0

commit 4310c2f1d3e2cd23a8725c376bd14645938c165d
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Aug 7 17:15:30 2013 +0200

    Start work on 0.4

diff --git a/debian/changelog b/debian/changelog
index bd35553..0dc7508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.4) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 07 Aug 2013 17:15:14 +0200
+
 nvidia-prime (0.3) saucy; urgency=low
 
   * debian/postinst.in:

commit 24279e67a956a8b5385594ba09541dc0bfd31c85
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Jul 24 10:21:32 2013 +0200

    Release 0.3

diff --git a/debian/changelog b/debian/changelog
index 6ca8a9b..bd35553 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-nvidia-prime (0.2ubuntu1) UNRELEASED; urgency=low
+nvidia-prime (0.3) saucy; urgency=low
 
-  * 
+  * debian/postinst.in:
+    - Do not touch the lightdm.conf (LP: #1199342).
+  * debian/preinst.in:
+    - Create a lightdm.conf if none can be found.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Wed, 24 Jul 2013 08:52:07 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 24 Jul 2013 10:20:06 +0200
 
 nvidia-prime (0.2) saucy; urgency=low
 

commit 521488dc4453116a1d215618bb43ab9f8de9c8b4
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Jul 24 10:18:50 2013 +0200

    improve lightdm.conf handling

diff --git a/debian/postinst.in b/debian/postinst.in
index c15632b..d5e4c50 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -68,12 +68,6 @@ Section "Screen"
 EndSection
 EOF
 
-        # If there's no lightdm conf file, then we're in trouble
-        # add a new one
-        if [ ! -f #LIGHTDM_CONF_FILE# ]; then
-            cp -f #LIGHTDM_CUSTOM_CONF_FILE# #LIGHTDM_CONF_FILE#
-        fi
-
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/preinst.in b/debian/preinst.in
index 1605842..4edf52e 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -17,7 +17,7 @@ lightdm_orig_conf=#LIGHTDM_CONF_FILE#
 
 add_hybrid_script () {
     if [ -f "$lightdm_orig_conf" -a \
-         ! -z "$(cat $lightdm_orig_conf)" ]; then
+         ! -s "$lightdm_orig_conf" ]; then
         # Get the file
         lightdm_orig="$(cat $lightdm_orig_conf)"
 
@@ -36,6 +36,15 @@ display-setup-script\=\/sbin\/hybrid-power/g" \
 display-setup-script\=\/sbin\/hybrid-power' \
             > "$lightdm_orig_conf"
         fi
+    else
+        # Let's create a configuration file
+        # from scratch
+        cat > $lightdm_orig_conf <<EOF
+[SeatDefaults]
+greeter-session=unity-greeter
+user-session=ubuntu
+display-setup-script=/sbin/hybrid-power
+EOF
     fi
 }
 

commit 36fc464cf793381112b95b5c097196291c0aa550
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Jul 24 08:52:11 2013 +0200

    Start work on 0.2ubuntu1

diff --git a/debian/changelog b/debian/changelog
index 4d19517..6ca8a9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.2ubuntu1) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 24 Jul 2013 08:52:07 +0200
+
 nvidia-prime (0.2) saucy; urgency=low
 
   * debian/control:

commit 10bd0cb29b62067ae0ad5c2bf149a4823f4c73d0
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Jul 3 11:22:07 2013 +0200

    Release 0.2

diff --git a/debian/changelog b/debian/changelog
index 187e60b..4d19517 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-nvidia-prime (0.2) UNRELEASED; urgency=low
+nvidia-prime (0.2) saucy; urgency=low
 
-  * 
+  * debian/control:
+    - Conflict/replace/provide the hybrid-graphics virtual
+      package.
+  * Make sure to start X instead of XMir or hybrid graphics
+    won't work, at least for now.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Tue, 02 Jul 2013 10:33:51 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 03 Jul 2013 11:42:17 +0200
 
 nvidia-prime (0.1) saucy; urgency=low
 

commit 54060e3bc27a5b97c36dd3ae3f1f65f577ae988a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Wed Jul 3 11:40:00 2013 +0200

    debian/control: conflict/replace/provide hybrid-graphics

diff --git a/debian/control b/debian/control
index dec031c..ff089d4 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,9 @@ Vcs-Browser: http://github.com/tseliot/nvidia-prime
 Package: nvidia-prime
 Architecture: all
 Depends: lightdm, pciutils, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: hybrid-graphics
+Replaces: hybrid-graphics
+Provides: hybrid-graphics
 Description: Tools to enable NVIDIA's Prime
  This is a set of tools which will enable
  NVIDIA's Prime on MUXless systems.

commit db981ee364e86268d87cb9c05518e16f048f35cc
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Jul 2 11:30:51 2013 +0200

    Override XMir

diff --git a/90-nvidia.conf b/90-nvidia.conf
new file mode 100644
index 0000000..fe7bf1f
--- /dev/null
+++ b/90-nvidia.conf
@@ -0,0 +1,3 @@
+[SeatDefaults]
+# Force using traditional X
+type=xlocal
diff --git a/debian/dirs.in b/debian/dirs.in
index 219d658..ba4c782 100644
--- a/debian/dirs.in
+++ b/debian/dirs.in
@@ -1,3 +1,4 @@
 /etc/X11
 #LIGHTDM_CUSTOM_CONF_DIR#
 #LIGHTDM_CONF_DIR#
+#LIGHTDM_CONF_DIR_D#
diff --git a/debian/install.in b/debian/install.in
index 041a930..0ede715 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1 +1,2 @@
+#LIGHTDM_CONF_FILENAME_D# #LIGHTDM_CONF_DIR_D#
 hybrid-power /sbin
diff --git a/debian/rules b/debian/rules
index c5865eb..7e14397 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,12 @@ LIGHTDM_CONF_DIR := $(TMP)$(PKG_lightdm_config_dir)
 PKG_lightdm_custom_config_dir := /usr/share/$(PKG_name)
 PKG_lightdm_custom_config_file := $(PKG_lightdm_custom_config_dir)/lightdm.conf
 LIGHTDM_CUSTOM_CONF_DIR := $(TMP)$(PKG_lightdm_custom_config_dir)
+# This doesn't work in Precise but it's harmless
+# We need it to disable XMir
+PKG_lightdm_config_filename_d := 90-nvidia.conf
+PKG_lightdm_config_dir_d := $(PKG_lightdm_config_dir)/lightdm.conf.d
+PKG_lightdm_config_file_d := $(PKG_lightdm_config_dir_d)/$(PKG_lightdm_config_filename_d)
+
 XORG_CONF := /etc/X11/xorg.conf
 
 %:
@@ -34,6 +40,9 @@ regen-from-templates:
 			-e "s|#LIGHTDM_CONF_DIR#|$(PKG_lightdm_config_dir)|g" \
 			-e "s|#LIGHTDM_CUSTOM_CONF_FILE#|$(PKG_lightdm_custom_config_file)|g" \
 			-e "s|#LIGHTDM_CUSTOM_CONF_DIR#|$(PKG_lightdm_custom_config_dir)|g" \
+			-e "s|#LIGHTDM_CONF_FILE_D#|$(PKG_lightdm_config_file_d)|g" \
+			-e "s|#LIGHTDM_CONF_DIR_D#|$(PKG_lightdm_config_dir_d)|g" \
+			-e "s|#LIGHTDM_CONF_FILENAME_D#|$(PKG_lightdm_config_filename_d)|g" \
 		$$i.in > $$i; \
 	done
 

commit 8cc2070f96f0c8fe94d1327a95845ccb5c3d2191
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Jul 2 10:34:02 2013 +0200

    Start work on 0.2

diff --git a/debian/changelog b/debian/changelog
index 3ea9bcf..187e60b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-prime (0.2) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 02 Jul 2013 10:33:51 +0200
+
 nvidia-prime (0.1) saucy; urgency=low
 
   * Initial Release.

commit a1a15b52e6b6e62f4526565e185f6a1ebc8e1041
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 31 14:10:49 2013 +0200

    Release 0.1

diff --git a/debian/changelog b/debian/changelog
index e790353..3ea9bcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-nvidia-prime (0.1) UNRELEASED; urgency=low
+nvidia-prime (0.1) saucy; urgency=low
 
   * Initial Release.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Fri, 24 May 2013 11:50:20 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 31 May 2013 14:10:46 +0200

commit 0c8a8082b25789e4db774f49a3e1e95533d9972e
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 31 14:10:22 2013 +0200

    debian/preinst.in: do not create lightdm.conf if it doesn't exist

diff --git a/debian/preinst.in b/debian/preinst.in
index a8dbd3f..1605842 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -36,15 +36,6 @@ display-setup-script\=\/sbin\/hybrid-power/g" \
 display-setup-script\=\/sbin\/hybrid-power' \
             > "$lightdm_orig_conf"
         fi
-    else
-        # File does not exist or is empty.
-        # Using custom file
-        cat > $lightdm_orig_conf <<EOF
-[SeatDefaults]
-user-session=ubuntu
-greeter-session=unity-greeter
-display-setup-script=/sbin/hybrid-power
-EOF
     fi
 }
 

commit 617086cb7de954bf86a9344dac7ec69324030d6a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 31 12:41:54 2013 +0200

    Do not install a custom lightdm.conf

diff --git a/debian/install.in b/debian/install.in
index 214b974..041a930 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,2 +1 @@
 hybrid-power /sbin
-lightdm.conf #LIGHTDM_CUSTOM_CONF_DIR#
diff --git a/lightdm.conf b/lightdm.conf
deleted file mode 100644
index c447e11..0000000
--- a/lightdm.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[SeatDefaults]
-user-session=ubuntu
-greeter-session=unity-greeter
-display-setup-script=/sbin/hybrid-power

commit 6e2ec624e25ff0fc29655ad19620976e9dbae6c3
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 31 12:40:35 2013 +0200

    Add a stanza to the lightdm.conf file instead of diverting it

diff --git a/debian/postrm.in b/debian/postrm.in
index 6dd9542..45204a6 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -20,6 +20,17 @@ set -e
 
 xorg_conf="#XORG_CONF#"
 now=$(date +"%m%d%Y")
+lightdm_orig_conf=#LIGHTDM_CONF_FILE#
+
+remove_hybrid_script () {
+    if [ -f "$lightdm_orig_conf" -a ! -z "$(cat $lightdm_orig_conf)" ]; then
+        # Get the file
+        lightdm_orig="$(cat $lightdm_orig_conf)"
+        echo "$lightdm_orig" | \
+        sed "/.*display-setup-script.*/d" \
+        > "$lightdm_orig_conf"
+    fi
+}
 
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
@@ -29,13 +40,8 @@ case "$1" in
         fi
 
         if [ ! "$1" = "upgrade" ]; then
-            # Restore the default lightdm.conf, if any
-            if dpkg-divert --list #LIGHTDM_CONF_FILE# | \
-                grep 'nvidia-prime' > /dev/null ; then
-                rm -f #LIGHTDM_CONF_FILE#
-                dpkg-divert --remove --rename --package nvidia-prime \
-                    #LIGHTDM_CONF_FILE# > /dev/null
-            fi
+            # Remove the display-setup-script line
+            remove_hybrid_script
         fi
     ;;
 
diff --git a/debian/preinst.in b/debian/preinst.in
index b146058..a8dbd3f 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -13,21 +13,45 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+lightdm_orig_conf=#LIGHTDM_CONF_FILE#
 
-case "$1" in
-    install|upgrade)
-        if dpkg-divert --list #LIGHTDM_CONF_FILE# | \
-           grep 'nvidia-prime' > /dev/null ; then
-            rm -f #LIGHTDM_CONF_FILE#
-            dpkg-divert --remove --rename --package nvidia-prime \
-            --divert #LIGHTDM_CONF_FILE#.nvidia-prime \
-            #LIGHTDM_CONF_FILE# > /dev/null
+add_hybrid_script () {
+    if [ -f "$lightdm_orig_conf" -a \
+         ! -z "$(cat $lightdm_orig_conf)" ]; then
+        # Get the file
+        lightdm_orig="$(cat $lightdm_orig_conf)"
+
+        # See if a display setup script is already
+        # in use
+        if echo "$lightdm_orig" | \
+             grep "display-setup-script"; then
+            echo "$lightdm_orig" | \
+            sed "s/.*display-setup-script.*/\
+display-setup-script\=\/sbin\/hybrid-power/g" \
+            > "$lightdm_orig_conf"
+        else
+            # Add a line after the pattern
+            echo "$lightdm_orig" | \
+            sed '/.*user-session.*/ a\
+display-setup-script\=\/sbin\/hybrid-power' \
+            > "$lightdm_orig_conf"
         fi
+    else
+        # File does not exist or is empty.
+        # Using custom file
+        cat > $lightdm_orig_conf <<EOF
+[SeatDefaults]
+user-session=ubuntu
+greeter-session=unity-greeter
+display-setup-script=/sbin/hybrid-power
+EOF
+    fi
+}
 
-        # Add the new diversion
-        dpkg-divert --add --rename --package nvidia-prime --divert \
-        #LIGHTDM_CONF_FILE#.nvidia-prime \
-        #LIGHTDM_CONF_FILE# > /dev/null
+case "$1" in
+    install|upgrade)
+        # Insert the display-setup-script line
+        add_hybrid_script
     ;;
 
     abort-upgrade)

commit 9d48248c8f97c597c4cc2626ec7a189c73cb244a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 31 11:21:19 2013 +0200

    debian/control: set architecture to all

diff --git a/debian/control b/debian/control
index d66332a..dec031c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Git: git://github.com/tseliot/nvidia-prime.git
 Vcs-Browser: http://github.com/tseliot/nvidia-prime
 
 Package: nvidia-prime
-Architecture: any
+Architecture: all
 Depends: lightdm, pciutils, ${shlibs:Depends}, ${misc:Depends}
 Description: Tools to enable NVIDIA's Prime
  This is a set of tools which will enable

commit abf411e3f6104ceb8ec0fbbcbbcd56e930e9b052
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 31 11:18:12 2013 +0200

    Refresh files from templates

diff --git a/debian/install b/debian/install
deleted file mode 100644
index 4752f9f..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-hybrid-power /sbin
-lightdm.conf /usr/share/nvidia-prime
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 9ae456d..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-# postinst script for nvidia-prime
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-xorg_conf="/etc/X11/xorg.conf"
-
-nvidia_id="$(lspci -n | grep 300 | grep de | cut -d" " -f1 | sed s/\\./:/g)"
-id_0="$(echo $nvidia_id | cut -d: -f1)"
-id_1="$(echo $nvidia_id | cut -d: -f2)"
-id_2="$(echo $nvidia_id | cut -d: -f3)"
-
-bus_id=$(printf "%d:%d:%d\n" $id_0 $id_1 $id_1)
-
-now=$(date +"%m%d%Y")
-
-case "$1" in
-    configure)
-        if [ -f "$xorg_conf" ]; then
-            mv $xorg_conf $xorg_conf.$now
-        fi
-        cat > $xorg_conf <<EOF
-# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
-
-Section "ServerLayout"
-    Identifier "layout"
-    Screen 0 "nvidia"
-    Inactive "intel"
-EndSection
-
-Section "Device"
-    Identifier "nvidia"
-    Driver "nvidia"
-    BusID "$bus_id"
-EndSection
-
-Section "Screen"
-    Identifier "nvidia"
-    Device "nvidia"
-    # Uncomment this line if your computer has no display devices connected to
-    # the NVIDIA GPU.  Leave it commented if you have display devices
-    # connected to the NVIDIA GPU that you would like to use.
-    Option "UseDisplayDevice" "none"
-EndSection
-
-Section "Device"
-    Identifier "intel"
-    Driver "modesetting"
-EndSection
-
-Section "Screen"
-    Identifier "intel"
-    Device "intel"
-EndSection
-EOF
-
-        # If there's no lightdm conf file, then we're in trouble
-        # add a new one
-        if [ ! -f /etc/lightdm/lightdm.conf ]; then
-            cp -f /usr/share/nvidia-prime/lightdm.conf /etc/lightdm/lightdm.conf
-        fi
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 741f234..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# postrm script for nvidia-prime
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-xorg_conf="/etc/X11/xorg.conf"
-now=$(date +"%m%d%Y")
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        # Remove the xorg.conf
-        if [ -f $xorg_conf ]; then
-            mv $xorg_conf $xorg_conf.$now
-        fi
-
-        if [ ! "$1" = "upgrade" ]; then
-            # Restore the default lightdm.conf, if any
-            if dpkg-divert --list /etc/lightdm/lightdm.conf | \
-                grep 'nvidia-prime' > /dev/null ; then
-                rm -f /etc/lightdm/lightdm.conf
-                dpkg-divert --remove --rename --package nvidia-prime \
-                    /etc/lightdm/lightdm.conf > /dev/null
-            fi
-        fi
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644
index db4cda8..0000000
--- a/debian/preinst
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# preinst script for nvidia-prime
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
-           grep 'nvidia-prime' > /dev/null ; then
-            rm -f /etc/lightdm/lightdm.conf
-            dpkg-divert --remove --rename --package nvidia-prime \
-            --divert /etc/lightdm/lightdm.conf.nvidia-prime \
-            /etc/lightdm/lightdm.conf > /dev/null
-        fi
-
-        # Add the new diversion
-        dpkg-divert --add --rename --package nvidia-prime --divert \
-        /etc/lightdm/lightdm.conf.nvidia-prime \
-        /etc/lightdm/lightdm.conf > /dev/null
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

commit 44ac71d91288fbcddb7e81f8c5d2131bc910deb9
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 31 11:17:52 2013 +0200

    debian/rules: make sure to remove the generated files

diff --git a/debian/rules b/debian/rules
index f5eca22..c5865eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,12 @@ regen-from-templates:
 		$$i.in > $$i; \
 	done
 
-override_dh_auto_clean: regen-from-templates
+override_dh_auto_clean:
+	for i in $(CURDIR)/debian/install \
+		 $(CURDIR)/debian/preinst \
+		 $(CURDIR)/debian/postinst \
+		 $(CURDIR)/debian/postrm; do \
+		rm -f $$i; \
+	done
 
 override_dh_auto_install: regen-from-templates

commit 1d5ade600a96cf3da2828ed52e5ebafe578065d6
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 31 11:14:39 2013 +0200

    debian/copyright: set the licence to GPL-3.0

diff --git a/debian/copyright b/debian/copyright
index 7f49421..5deba54 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,13 +4,13 @@ Source: git://github.com/tseliot/nvidia-prime.git
 
 Files: *
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0+
+License: GPL-3.0
 
 Files: debian/*
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0+
+License: GPL-3.0
 
-License: GPL-3.0+
+License: GPL-3.0
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or

commit 3e2df49d902b549f28ed59bea6535e2fa2c708f8
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Fri May 24 11:50:37 2013 +0200

    debian/changelog: mark as UNRELEASED

diff --git a/debian/changelog b/debian/changelog
index a87a4ff..e790353 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-nvidia-prime (0.1) unstable; urgency=low
+nvidia-prime (0.1) UNRELEASED; urgency=low
 
   * Initial Release.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Thu, 02 May 2013 16:40:23 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 24 May 2013 11:50:20 +0200

commit 74301e17132a952c887dc4eb44b6d0e303b5868a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 20 13:00:35 2013 +0200

    Refresh files from templates

diff --git a/debian/postinst b/debian/postinst
index 98e8546..9ae456d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -ex
+set -e
 
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
diff --git a/debian/postrm b/debian/postrm
index 24d6379..741f234 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -ex
+set -e
 
 # summary of how this script can be called:
 #        * <postrm> `remove'
@@ -28,12 +28,14 @@ case "$1" in
             mv $xorg_conf $xorg_conf.$now
         fi
 
-        # Restore the default lightdm.conf, if any
-        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
-           grep 'nvidia-prime' > /dev/null ; then
-            rm -f /etc/lightdm/lightdm.conf
-            dpkg-divert --remove --rename --package nvidia-prime \
-                        /etc/lightdm/lightdm.conf > /dev/null
+        if [ ! "$1" = "upgrade" ]; then
+            # Restore the default lightdm.conf, if any
+            if dpkg-divert --list /etc/lightdm/lightdm.conf | \
+                grep 'nvidia-prime' > /dev/null ; then
+                rm -f /etc/lightdm/lightdm.conf
+                dpkg-divert --remove --rename --package nvidia-prime \
+                    /etc/lightdm/lightdm.conf > /dev/null
+            fi
         fi
     ;;
 
diff --git a/debian/preinst b/debian/preinst
index 43d1af1..db4cda8 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -ex
+set -e
 
 # summary of how this script can be called:
 #        * <new-preinst> `install'

commit 16f77b80c23add7b778316db9fce2efe6b41fb52
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 20 13:00:30 2013 +0200

    Revert "Debug mode"
    
    This reverts commit 389e064c68361c643627ee9737bc9d09dd83c51a.

diff --git a/debian/postinst.in b/debian/postinst.in
index cd3767a..c15632b 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -ex
+set -e
 
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
diff --git a/debian/postrm.in b/debian/postrm.in
index f7ce988..6dd9542 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -ex
+set -e
 
 # summary of how this script can be called:
 #        * <postrm> `remove'
diff --git a/debian/preinst.in b/debian/preinst.in
index 63164cd..b146058 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -ex
+set -e
 
 # summary of how this script can be called:
 #        * <new-preinst> `install'

commit fc32fb36aaec5b3f1c49d1fab0c3ea31030982ac
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 20 12:45:19 2013 +0200

    debian/postrm.in: do not remove diversions on upgrades

diff --git a/debian/postrm.in b/debian/postrm.in
index 53df740..f7ce988 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -28,12 +28,14 @@ case "$1" in
             mv $xorg_conf $xorg_conf.$now
         fi
 
-        # Restore the default lightdm.conf, if any
-        if dpkg-divert --list #LIGHTDM_CONF_FILE# | \
-           grep 'nvidia-prime' > /dev/null ; then
-            rm -f #LIGHTDM_CONF_FILE#
-            dpkg-divert --remove --rename --package nvidia-prime \
-                        #LIGHTDM_CONF_FILE# > /dev/null
+        if [ ! "$1" = "upgrade" ]; then
+            # Restore the default lightdm.conf, if any
+            if dpkg-divert --list #LIGHTDM_CONF_FILE# | \
+                grep 'nvidia-prime' > /dev/null ; then
+                rm -f #LIGHTDM_CONF_FILE#
+                dpkg-divert --remove --rename --package nvidia-prime \
+                    #LIGHTDM_CONF_FILE# > /dev/null
+            fi
         fi
     ;;
 

commit 72296fb483fbdaee2862cce40b875691278d7adb
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 20 12:39:00 2013 +0200

    Refresh files from templates

diff --git a/debian/postinst b/debian/postinst
index 9ae456d..98e8546 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -e
+set -ex
 
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
diff --git a/debian/postrm b/debian/postrm
index 6d89a80..24d6379 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -e
+set -ex
 
 # summary of how this script can be called:
 #        * <postrm> `remove'
diff --git a/debian/preinst b/debian/preinst
index db4cda8..43d1af1 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -e
+set -ex
 
 # summary of how this script can be called:
 #        * <new-preinst> `install'

commit 389e064c68361c643627ee9737bc9d09dd83c51a
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 20 12:38:53 2013 +0200

    Debug mode

diff --git a/debian/postinst.in b/debian/postinst.in
index c15632b..cd3767a 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -e
+set -ex
 
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
diff --git a/debian/postrm.in b/debian/postrm.in
index ad9f089..53df740 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -e
+set -ex
 
 # summary of how this script can be called:
 #        * <postrm> `remove'
diff --git a/debian/preinst.in b/debian/preinst.in
index b146058..63164cd 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -3,7 +3,7 @@
 #
 # see: dh_installdeb(1)
 
-set -e
+set -ex
 
 # summary of how this script can be called:
 #        * <new-preinst> `install'

commit 67cae9379037ec618bdb27bf062cd0ada1df4333
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 20 12:30:53 2013 +0200

    Refresh files from templates

diff --git a/debian/install b/debian/install
index 0cbf7a4..4752f9f 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
 hybrid-power /sbin
-lightdm.conf /etc/lightdm
 lightdm.conf /usr/share/nvidia-prime

commit 5beaa2363bfe93a03b9ed23e147b379416878c30
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 20 12:30:35 2013 +0200

    Make sure the original lightdm.conf is preserved

diff --git a/debian/install.in b/debian/install.in
index a6d8a7a..214b974 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,3 +1,2 @@
 hybrid-power /sbin
-lightdm.conf #LIGHTDM_CONF_DIR#
 lightdm.conf #LIGHTDM_CUSTOM_CONF_DIR#
diff --git a/debian/postrm.in b/debian/postrm.in
index 730fdcd..ad9f089 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -29,11 +29,11 @@ case "$1" in
         fi
 
         # Restore the default lightdm.conf, if any
-        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
+        if dpkg-divert --list #LIGHTDM_CONF_FILE# | \
            grep 'nvidia-prime' > /dev/null ; then
-            rm -f /etc/lightdm/lightdm.conf
+            rm -f #LIGHTDM_CONF_FILE#
             dpkg-divert --remove --rename --package nvidia-prime \
-                        /etc/lightdm/lightdm.conf > /dev/null
+                        #LIGHTDM_CONF_FILE# > /dev/null
         fi
     ;;
 
diff --git a/debian/preinst.in b/debian/preinst.in
index db4cda8..b146058 100644
--- a/debian/preinst.in
+++ b/debian/preinst.in
@@ -16,18 +16,18 @@ set -e
 
 case "$1" in
     install|upgrade)
-        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
+        if dpkg-divert --list #LIGHTDM_CONF_FILE# | \
            grep 'nvidia-prime' > /dev/null ; then
-            rm -f /etc/lightdm/lightdm.conf
+            rm -f #LIGHTDM_CONF_FILE#
             dpkg-divert --remove --rename --package nvidia-prime \
-            --divert /etc/lightdm/lightdm.conf.nvidia-prime \
-            /etc/lightdm/lightdm.conf > /dev/null
+            --divert #LIGHTDM_CONF_FILE#.nvidia-prime \
+            #LIGHTDM_CONF_FILE# > /dev/null
         fi
 
         # Add the new diversion
         dpkg-divert --add --rename --package nvidia-prime --divert \
-        /etc/lightdm/lightdm.conf.nvidia-prime \
-        /etc/lightdm/lightdm.conf > /dev/null
+        #LIGHTDM_CONF_FILE#.nvidia-prime \
+        #LIGHTDM_CONF_FILE# > /dev/null
     ;;
 
     abort-upgrade)

commit bfd89a675e5218ca97bfe6505696302061f967e8
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 20 12:08:20 2013 +0200

    Refresh files from templates

diff --git a/debian/postrm b/debian/postrm
index b1df075..6d89a80 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -33,7 +33,6 @@ case "$1" in
            grep 'nvidia-prime' > /dev/null ; then
             rm -f /etc/lightdm/lightdm.conf
             dpkg-divert --remove --rename --package nvidia-prime \
-                        --divert /etc/lightdm/lightdm.conf.nvidia-prime \
                         /etc/lightdm/lightdm.conf > /dev/null
         fi
     ;;

commit e3b76fe5214791cd05841ca77e575901dd7523a8
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon May 20 12:07:59 2013 +0200

    debian/postrm.in: correct diversion removal

diff --git a/debian/postrm.in b/debian/postrm.in
index 261dcb5..730fdcd 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -33,7 +33,6 @@ case "$1" in
            grep 'nvidia-prime' > /dev/null ; then
             rm -f /etc/lightdm/lightdm.conf
             dpkg-divert --remove --rename --package nvidia-prime \
-                        --divert /etc/lightdm/lightdm.conf.nvidia-prime \
                         /etc/lightdm/lightdm.conf > /dev/null
         fi
     ;;

commit de7165f4b6a9cd0b11f0b8318b16de45f85d1263
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 13:21:12 2013 +0200

    Refresh files from templates

diff --git a/debian/install b/debian/install
index f2c4a20..0cbf7a4 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,3 @@
 hybrid-power /sbin
 lightdm.conf /etc/lightdm
-lightdm.conf /usr/share/
+lightdm.conf /usr/share/nvidia-prime
diff --git a/debian/postinst b/debian/postinst
index ef5252d..9ae456d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -71,7 +71,7 @@ EOF
         # If there's no lightdm conf file, then we're in trouble
         # add a new one
         if [ ! -f /etc/lightdm/lightdm.conf ]; then
-            cp -f /usr/share//lightdm.conf /etc/lightdm/lightdm.conf
+            cp -f /usr/share/nvidia-prime/lightdm.conf /etc/lightdm/lightdm.conf
         fi
 
     ;;
diff --git a/debian/postrm b/debian/postrm
index 75c6eca..b1df075 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -35,7 +35,7 @@ case "$1" in
             dpkg-divert --remove --rename --package nvidia-prime \
                         --divert /etc/lightdm/lightdm.conf.nvidia-prime \
                         /etc/lightdm/lightdm.conf > /dev/null
-
+        fi
     ;;
 
     *)

commit afbb50aee7936356c0b55d6eb4dcc5e5d16f3127
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 13:20:56 2013 +0200

    debian/postrm.in: close if block

diff --git a/debian/postrm.in b/debian/postrm.in
index 6ee7580..261dcb5 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -35,7 +35,7 @@ case "$1" in
             dpkg-divert --remove --rename --package nvidia-prime \
                         --divert /etc/lightdm/lightdm.conf.nvidia-prime \
                         /etc/lightdm/lightdm.conf > /dev/null
-
+        fi
     ;;
 
     *)

commit 65aeaf851cce33450eef9fe2adb689ca599f82cc
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 13:12:35 2013 +0200

    debian/rules: replace PKG_driver with PKG_name

diff --git a/debian/rules b/debian/rules
index 6f8a3a5..f5eca22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ TMP     = $(CURDIR)/debian/tmp
 PKG_lightdm_config_dir := /etc/lightdm
 PKG_lightdm_config_file := $(PKG_lightdm_config_dir)/lightdm.conf
 LIGHTDM_CONF_DIR := $(TMP)$(PKG_lightdm_config_dir)
-PKG_lightdm_custom_config_dir := /usr/share/$(PKG_driver)
+PKG_lightdm_custom_config_dir := /usr/share/$(PKG_name)
 PKG_lightdm_custom_config_file := $(PKG_lightdm_custom_config_dir)/lightdm.conf
 LIGHTDM_CUSTOM_CONF_DIR := $(TMP)$(PKG_lightdm_custom_config_dir)
 XORG_CONF := /etc/X11/xorg.conf

commit 507cd8ff84a7835f81de7ea1fc4196605c9e46a2
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 12:28:46 2013 +0200

    debian/control: depend on lightdm and pciutils

diff --git a/debian/control b/debian/control
index 44f844d..d66332a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Browser: http://github.com/tseliot/nvidia-prime
 
 Package: nvidia-prime
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: lightdm, pciutils, ${shlibs:Depends}, ${misc:Depends}
 Description: Tools to enable NVIDIA's Prime
  This is a set of tools which will enable
  NVIDIA's Prime on MUXless systems.

commit 188595a094871b6954abf40df17c0175f14b69fe
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 12:23:30 2013 +0200

    Add generated files

diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..f2c4a20
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,3 @@
+hybrid-power /sbin
+lightdm.conf /etc/lightdm
+lightdm.conf /usr/share/
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..ef5252d
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,93 @@
+#!/bin/sh
+# postinst script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+xorg_conf="/etc/X11/xorg.conf"
+
+nvidia_id="$(lspci -n | grep 300 | grep de | cut -d" " -f1 | sed s/\\./:/g)"
+id_0="$(echo $nvidia_id | cut -d: -f1)"
+id_1="$(echo $nvidia_id | cut -d: -f2)"
+id_2="$(echo $nvidia_id | cut -d: -f3)"
+
+bus_id=$(printf "%d:%d:%d\n" $id_0 $id_1 $id_1)
+
+now=$(date +"%m%d%Y")
+
+case "$1" in
+    configure)
+        if [ -f "$xorg_conf" ]; then
+            mv $xorg_conf $xorg_conf.$now
+        fi
+        cat > $xorg_conf <<EOF
+# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
+
+Section "ServerLayout"
+    Identifier "layout"
+    Screen 0 "nvidia"
+    Inactive "intel"
+EndSection
+
+Section "Device"
+    Identifier "nvidia"
+    Driver "nvidia"
+    BusID "$bus_id"
+EndSection
+
+Section "Screen"
+    Identifier "nvidia"
+    Device "nvidia"
+    # Uncomment this line if your computer has no display devices connected to
+    # the NVIDIA GPU.  Leave it commented if you have display devices
+    # connected to the NVIDIA GPU that you would like to use.
+    Option "UseDisplayDevice" "none"
+EndSection
+
+Section "Device"
+    Identifier "intel"
+    Driver "modesetting"
+EndSection
+
+Section "Screen"
+    Identifier "intel"
+    Device "intel"
+EndSection
+EOF
+
+        # If there's no lightdm conf file, then we're in trouble
+        # add a new one
+        if [ ! -f /etc/lightdm/lightdm.conf ]; then
+            cp -f /usr/share//lightdm.conf /etc/lightdm/lightdm.conf
+        fi
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..75c6eca
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,52 @@
+#!/bin/sh
+# postrm script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+xorg_conf="/etc/X11/xorg.conf"
+now=$(date +"%m%d%Y")
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        # Remove the xorg.conf
+        if [ -f $xorg_conf ]; then
+            mv $xorg_conf $xorg_conf.$now
+        fi
+
+        # Restore the default lightdm.conf, if any
+        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
+           grep 'nvidia-prime' > /dev/null ; then
+            rm -f /etc/lightdm/lightdm.conf
+            dpkg-divert --remove --rename --package nvidia-prime \
+                        --divert /etc/lightdm/lightdm.conf.nvidia-prime \
+                        /etc/lightdm/lightdm.conf > /dev/null
+
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..db4cda8
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,47 @@
+#!/bin/sh
+# preinst script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
+           grep 'nvidia-prime' > /dev/null ; then
+            rm -f /etc/lightdm/lightdm.conf
+            dpkg-divert --remove --rename --package nvidia-prime \
+            --divert /etc/lightdm/lightdm.conf.nvidia-prime \
+            /etc/lightdm/lightdm.conf > /dev/null
+        fi
+
+        # Add the new diversion
+        dpkg-divert --add --rename --package nvidia-prime --divert \
+        /etc/lightdm/lightdm.conf.nvidia-prime \
+        /etc/lightdm/lightdm.conf > /dev/null
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

commit da0462066f4dc454c38da8641be4e947143705a0
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 12:22:45 2013 +0200

    clean up templates

diff --git a/debian/dirs.in b/debian/dirs.in
index df94acb..219d658 100644
--- a/debian/dirs.in
+++ b/debian/dirs.in
@@ -1,2 +1,3 @@
 /etc/X11
-
+#LIGHTDM_CUSTOM_CONF_DIR#
+#LIGHTDM_CONF_DIR#
diff --git a/debian/install.in b/debian/install.in
index af6c281..a6d8a7a 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,2 +1,3 @@
 hybrid-power /sbin
-lightdm.conf
+lightdm.conf #LIGHTDM_CONF_DIR#
+lightdm.conf #LIGHTDM_CUSTOM_CONF_DIR#
diff --git a/debian/postinst.in b/debian/postinst.in
index 3fa1744..c15632b 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -30,10 +30,10 @@ now=$(date +"%m%d%Y")
 
 case "$1" in
     configure)
-            if [ -f "$xorg_conf" ]; then
-                mv $xorg_conf $xorg_conf.$now
-            fi
-            cat > $xorg_conf <<EOF
+        if [ -f "$xorg_conf" ]; then
+            mv $xorg_conf $xorg_conf.$now
+        fi
+        cat > $xorg_conf <<EOF
 # Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
 
 Section "ServerLayout"
@@ -68,6 +68,12 @@ Section "Screen"
 EndSection
 EOF
 
+        # If there's no lightdm conf file, then we're in trouble
+        # add a new one
+        if [ ! -f #LIGHTDM_CONF_FILE# ]; then
+            cp -f #LIGHTDM_CUSTOM_CONF_FILE# #LIGHTDM_CONF_FILE#
+        fi
+
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

commit 7033a1650ae924ae3d4d3dfdf1994e7bc58e9239
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 12:15:38 2013 +0200

    Add two more templates

diff --git a/debian/dirs.in b/debian/dirs.in
new file mode 100644
index 0000000..df94acb
--- /dev/null
+++ b/debian/dirs.in
@@ -0,0 +1,2 @@
+/etc/X11
+
diff --git a/debian/install b/debian/install
deleted file mode 100644
index af6c281..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-hybrid-power /sbin
-lightdm.conf
diff --git a/debian/install.in b/debian/install.in
new file mode 100644
index 0000000..af6c281
--- /dev/null
+++ b/debian/install.in
@@ -0,0 +1,2 @@
+hybrid-power /sbin
+lightdm.conf

commit 28013cfa83991d349d08ddbd1f831181eaca02b4
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 12:12:44 2013 +0200

    Use #XORG_CONF# in templates

diff --git a/debian/postinst.in b/debian/postinst.in
index 6d5357d..3fa1744 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -17,7 +17,7 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-xorg_conf=/etc/X11/xorg.conf
+xorg_conf="#XORG_CONF#"
 
 nvidia_id="$(lspci -n | grep 300 | grep de | cut -d" " -f1 | sed s/\\./:/g)"
 id_0="$(echo $nvidia_id | cut -d: -f1)"
diff --git a/debian/postrm.in b/debian/postrm.in
index b09ae78..6ee7580 100644
--- a/debian/postrm.in
+++ b/debian/postrm.in
@@ -18,7 +18,7 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-xorg_conf=/etc/X11/xorg.conf
+xorg_conf="#XORG_CONF#"
 now=$(date +"%m%d%Y")
 
 case "$1" in

commit 987687f8c93d14a593fc9d2d8ee3c26821fa3779
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 12:10:33 2013 +0200

    Make templates

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 6d5357d..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-# postinst script for nvidia-prime
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-xorg_conf=/etc/X11/xorg.conf
-
-nvidia_id="$(lspci -n | grep 300 | grep de | cut -d" " -f1 | sed s/\\./:/g)"
-id_0="$(echo $nvidia_id | cut -d: -f1)"
-id_1="$(echo $nvidia_id | cut -d: -f2)"
-id_2="$(echo $nvidia_id | cut -d: -f3)"
-
-bus_id=$(printf "%d:%d:%d\n" $id_0 $id_1 $id_1)
-
-now=$(date +"%m%d%Y")
-
-case "$1" in
-    configure)
-            if [ -f "$xorg_conf" ]; then
-                mv $xorg_conf $xorg_conf.$now
-            fi
-            cat > $xorg_conf <<EOF
-# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
-
-Section "ServerLayout"
-    Identifier "layout"
-    Screen 0 "nvidia"
-    Inactive "intel"
-EndSection
-
-Section "Device"
-    Identifier "nvidia"
-    Driver "nvidia"
-    BusID "$bus_id"
-EndSection
-
-Section "Screen"
-    Identifier "nvidia"
-    Device "nvidia"
-    # Uncomment this line if your computer has no display devices connected to
-    # the NVIDIA GPU.  Leave it commented if you have display devices
-    # connected to the NVIDIA GPU that you would like to use.
-    Option "UseDisplayDevice" "none"
-EndSection
-
-Section "Device"
-    Identifier "intel"
-    Driver "modesetting"
-EndSection
-
-Section "Screen"
-    Identifier "intel"
-    Device "intel"
-EndSection
-EOF
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/postinst.in b/debian/postinst.in
new file mode 100644
index 0000000..6d5357d
--- /dev/null
+++ b/debian/postinst.in
@@ -0,0 +1,87 @@
+#!/bin/sh
+# postinst script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+xorg_conf=/etc/X11/xorg.conf
+
+nvidia_id="$(lspci -n | grep 300 | grep de | cut -d" " -f1 | sed s/\\./:/g)"
+id_0="$(echo $nvidia_id | cut -d: -f1)"
+id_1="$(echo $nvidia_id | cut -d: -f2)"
+id_2="$(echo $nvidia_id | cut -d: -f3)"
+
+bus_id=$(printf "%d:%d:%d\n" $id_0 $id_1 $id_1)
+
+now=$(date +"%m%d%Y")
+
+case "$1" in
+    configure)
+            if [ -f "$xorg_conf" ]; then
+                mv $xorg_conf $xorg_conf.$now
+            fi
+            cat > $xorg_conf <<EOF
+# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
+
+Section "ServerLayout"
+    Identifier "layout"
+    Screen 0 "nvidia"
+    Inactive "intel"
+EndSection
+
+Section "Device"
+    Identifier "nvidia"
+    Driver "nvidia"
+    BusID "$bus_id"
+EndSection
+
+Section "Screen"
+    Identifier "nvidia"
+    Device "nvidia"
+    # Uncomment this line if your computer has no display devices connected to
+    # the NVIDIA GPU.  Leave it commented if you have display devices
+    # connected to the NVIDIA GPU that you would like to use.
+    Option "UseDisplayDevice" "none"
+EndSection
+
+Section "Device"
+    Identifier "intel"
+    Driver "modesetting"
+EndSection
+
+Section "Screen"
+    Identifier "intel"
+    Device "intel"
+EndSection
+EOF
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index b09ae78..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# postrm script for nvidia-prime
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-xorg_conf=/etc/X11/xorg.conf
-now=$(date +"%m%d%Y")
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        # Remove the xorg.conf
-        if [ -f $xorg_conf ]; then
-            mv $xorg_conf $xorg_conf.$now
-        fi
-
-        # Restore the default lightdm.conf, if any
-        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
-           grep 'nvidia-prime' > /dev/null ; then
-            rm -f /etc/lightdm/lightdm.conf
-            dpkg-divert --remove --rename --package nvidia-prime \
-                        --divert /etc/lightdm/lightdm.conf.nvidia-prime \
-                        /etc/lightdm/lightdm.conf > /dev/null
-
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/postrm.in b/debian/postrm.in
new file mode 100644
index 0000000..b09ae78
--- /dev/null
+++ b/debian/postrm.in
@@ -0,0 +1,52 @@
+#!/bin/sh
+# postrm script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+xorg_conf=/etc/X11/xorg.conf
+now=$(date +"%m%d%Y")
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        # Remove the xorg.conf
+        if [ -f $xorg_conf ]; then
+            mv $xorg_conf $xorg_conf.$now
+        fi
+
+        # Restore the default lightdm.conf, if any
+        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
+           grep 'nvidia-prime' > /dev/null ; then
+            rm -f /etc/lightdm/lightdm.conf
+            dpkg-divert --remove --rename --package nvidia-prime \
+                        --divert /etc/lightdm/lightdm.conf.nvidia-prime \
+                        /etc/lightdm/lightdm.conf > /dev/null
+
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/preinst.ex b/debian/preinst.ex
deleted file mode 100644
index db4cda8..0000000
--- a/debian/preinst.ex
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# preinst script for nvidia-prime
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
-           grep 'nvidia-prime' > /dev/null ; then
-            rm -f /etc/lightdm/lightdm.conf
-            dpkg-divert --remove --rename --package nvidia-prime \
-            --divert /etc/lightdm/lightdm.conf.nvidia-prime \
-            /etc/lightdm/lightdm.conf > /dev/null
-        fi
-
-        # Add the new diversion
-        dpkg-divert --add --rename --package nvidia-prime --divert \
-        /etc/lightdm/lightdm.conf.nvidia-prime \
-        /etc/lightdm/lightdm.conf > /dev/null
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/preinst.in b/debian/preinst.in
new file mode 100644
index 0000000..db4cda8
--- /dev/null
+++ b/debian/preinst.in
@@ -0,0 +1,47 @@
+#!/bin/sh
+# preinst script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
+           grep 'nvidia-prime' > /dev/null ; then
+            rm -f /etc/lightdm/lightdm.conf
+            dpkg-divert --remove --rename --package nvidia-prime \
+            --divert /etc/lightdm/lightdm.conf.nvidia-prime \
+            /etc/lightdm/lightdm.conf > /dev/null
+        fi
+
+        # Add the new diversion
+        dpkg-divert --add --rename --package nvidia-prime --divert \
+        /etc/lightdm/lightdm.conf.nvidia-prime \
+        /etc/lightdm/lightdm.conf > /dev/null
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/prerm.ex b/debian/prerm.ex
deleted file mode 100644
index 29666fc..0000000
--- a/debian/prerm.ex
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# prerm script for nvidia-prime
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

commit 07e2ef55d54ff1e01264dff057322ce48f3c0fa3
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Thu May 9 12:07:10 2013 +0200

    debian/postrm: remove the diversion

diff --git a/debian/postrm b/debian/postrm
index 0647f5c..b09ae78 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -23,9 +23,19 @@ now=$(date +"%m%d%Y")
 
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        # Remove the xorg.conf
         if [ -f $xorg_conf ]; then
             mv $xorg_conf $xorg_conf.$now
         fi
+
+        # Restore the default lightdm.conf, if any
+        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
+           grep 'nvidia-prime' > /dev/null ; then
+            rm -f /etc/lightdm/lightdm.conf
+            dpkg-divert --remove --rename --package nvidia-prime \
+                        --divert /etc/lightdm/lightdm.conf.nvidia-prime \
+                        /etc/lightdm/lightdm.conf > /dev/null
+
     ;;
 
     *)

commit 09e7634d9aecd2a57da9c9743c4e3a355f289361
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue May 7 17:53:13 2013 +0200

    Temp change

diff --git a/debian/rules b/debian/rules
index 4300515..6f8a3a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,5 +9,34 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PKG_name = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/tmp
+PKG_lightdm_config_dir := /etc/lightdm
+PKG_lightdm_config_file := $(PKG_lightdm_config_dir)/lightdm.conf
+LIGHTDM_CONF_DIR := $(TMP)$(PKG_lightdm_config_dir)
+PKG_lightdm_custom_config_dir := /usr/share/$(PKG_driver)
+PKG_lightdm_custom_config_file := $(PKG_lightdm_custom_config_dir)/lightdm.conf
+LIGHTDM_CUSTOM_CONF_DIR := $(TMP)$(PKG_lightdm_custom_config_dir)
+XORG_CONF := /etc/X11/xorg.conf
+
 %:
-	dh $@ 
+	dh $@
+
+.PHONY: regen-from-templates
+regen-from-templates:
+	for i in $(CURDIR)/debian/install \
+		 $(CURDIR)/debian/preinst \
+		 $(CURDIR)/debian/postinst \
+		 $(CURDIR)/debian/postrm; do \
+		sed -e 's|#XORG_CONF#|$(XORG_CONF)|g' \
+			-e 's|#PKGNAME#|$(PKG_name)|g' \
+			-e "s|#LIGHTDM_CONF_FILE#|$(PKG_lightdm_config_file)|g" \
+			-e "s|#LIGHTDM_CONF_DIR#|$(PKG_lightdm_config_dir)|g" \
+			-e "s|#LIGHTDM_CUSTOM_CONF_FILE#|$(PKG_lightdm_custom_config_file)|g" \
+			-e "s|#LIGHTDM_CUSTOM_CONF_DIR#|$(PKG_lightdm_custom_config_dir)|g" \
+		$$i.in > $$i; \
+	done
+
+override_dh_auto_clean: regen-from-templates
+
+override_dh_auto_install: regen-from-templates

commit aa0cb970669b0f9f15008d7925dcabc2ceb96695
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue May 7 17:37:24 2013 +0200

    Initial commit

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..a87a4ff
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+nvidia-prime (0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 02 May 2013 16:40:23 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..44f844d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: nvidia-prime
+Section: admin
+Priority: optional
+Maintainer: Alberto Milone <alberto.milone@canonical.com>
+Build-Depends: debhelper (>= 8.0.0)
+Standards-Version: 3.9.2
+Vcs-Git: git://github.com/tseliot/nvidia-prime.git
+Vcs-Browser: http://github.com/tseliot/nvidia-prime
+
+Package: nvidia-prime
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Tools to enable NVIDIA's Prime
+ This is a set of tools which will enable
+ NVIDIA's Prime on MUXless systems.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..7f49421
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,29 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: nvidia-prime
+Source: git://github.com/tseliot/nvidia-prime.git
+
+Files: *
+Copyright: 2013 Canonical Ltd.
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2013 Canonical Ltd.
+License: GPL-3.0+
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e69de29
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..af6c281
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+hybrid-power /sbin
+lightdm.conf
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..6d5357d
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,87 @@
+#!/bin/sh
+# postinst script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+xorg_conf=/etc/X11/xorg.conf
+
+nvidia_id="$(lspci -n | grep 300 | grep de | cut -d" " -f1 | sed s/\\./:/g)"
+id_0="$(echo $nvidia_id | cut -d: -f1)"
+id_1="$(echo $nvidia_id | cut -d: -f2)"
+id_2="$(echo $nvidia_id | cut -d: -f3)"
+
+bus_id=$(printf "%d:%d:%d\n" $id_0 $id_1 $id_1)
+
+now=$(date +"%m%d%Y")
+
+case "$1" in
+    configure)
+            if [ -f "$xorg_conf" ]; then
+                mv $xorg_conf $xorg_conf.$now
+            fi
+            cat > $xorg_conf <<EOF
+# Warning: This file is autogenerated by nvidia-prime. All changes to this file will be lost.
+
+Section "ServerLayout"
+    Identifier "layout"
+    Screen 0 "nvidia"
+    Inactive "intel"
+EndSection
+
+Section "Device"
+    Identifier "nvidia"
+    Driver "nvidia"
+    BusID "$bus_id"
+EndSection
+
+Section "Screen"
+    Identifier "nvidia"
+    Device "nvidia"
+    # Uncomment this line if your computer has no display devices connected to
+    # the NVIDIA GPU.  Leave it commented if you have display devices
+    # connected to the NVIDIA GPU that you would like to use.
+    Option "UseDisplayDevice" "none"
+EndSection
+
+Section "Device"
+    Identifier "intel"
+    Driver "modesetting"
+EndSection
+
+Section "Screen"
+    Identifier "intel"
+    Device "intel"
+EndSection
+EOF
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..0647f5c
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postrm script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+xorg_conf=/etc/X11/xorg.conf
+now=$(date +"%m%d%Y")
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        if [ -f $xorg_conf ]; then
+            mv $xorg_conf $xorg_conf.$now
+        fi
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/preinst.ex b/debian/preinst.ex
new file mode 100644
index 0000000..db4cda8
--- /dev/null
+++ b/debian/preinst.ex
@@ -0,0 +1,47 @@
+#!/bin/sh
+# preinst script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        if dpkg-divert --list /etc/lightdm/lightdm.conf | \
+           grep 'nvidia-prime' > /dev/null ; then
+            rm -f /etc/lightdm/lightdm.conf
+            dpkg-divert --remove --rename --package nvidia-prime \
+            --divert /etc/lightdm/lightdm.conf.nvidia-prime \
+            /etc/lightdm/lightdm.conf > /dev/null
+        fi
+
+        # Add the new diversion
+        dpkg-divert --add --rename --package nvidia-prime --divert \
+        /etc/lightdm/lightdm.conf.nvidia-prime \
+        /etc/lightdm/lightdm.conf > /dev/null
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/prerm.ex b/debian/prerm.ex
new file mode 100644
index 0000000..29666fc
--- /dev/null
+++ b/debian/prerm.ex
@@ -0,0 +1,38 @@
+#!/bin/sh
+# prerm script for nvidia-prime
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..4300515
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/hybrid-power b/hybrid-power
new file mode 100755
index 0000000..37800a9
--- /dev/null
+++ b/hybrid-power
@@ -0,0 +1,88 @@
+#!/bin/sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# Author: Alberto Milone <alberto.milone@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+PRIME_LOG=/var/log/lightdm_prime.log
+
+# Only for NVIDIA's proprietary driver
+if ! lsmod | grep nvidia > /dev/null; then
+    # Sorry the driver is not is loaded
+    echo "Sorry the nvidia kernel module is not is loaded" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+
+# We only support intel + nvidia
+cards="$(lspci -n | grep 300)"
+if ! (echo "$cards" | grep -i 10de > /dev/null && \
+    echo "$cards" | grep 8086 > /dev/null); then
+    echo "Sorry we only support Intel+Nvidia" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+
+# Check the xrandr version
+randr_ver="$(xrandr -v)"
+client=$(echo "$randr_ver" | grep "program" | awk '{print $NF}' | cut -d. -f2)
+client_point=$(echo "$randr_ver" | grep "program" | awk '{print $NF}' | cut -d. -f3)
+server=$(echo "$randr_ver" | grep -i "server" | awk '{print $NF}' | cut -d. -f2)
+
+# There may not be a point version
+[ -z "$client_point" ] && client_point=0
+
+if [ "$client" -ge 4 -a "$server" -ge 4 ]; then
+    # client and server ver >= 1.4
+    use_randr_names=true
+elif [ "$client" -eq 3 -a "$client_point" -eq 5 \
+       -a "$server" -ge 4 ]; then
+    # client ver 1.3.5 and server ver >= 1.4
+    use_randr_names=false
+else
+    # client and server ver < 1.4
+    echo "Sorry we only support randr 1.4 or higher" \
+         > $PRIME_LOG 2>&1
+    exit 0
+fi
+
+# Get the xrandr providers
+output="$(xrandr --listproviders)"
+
+if [ "$use_randr_names" = true ]; then
+    # Use the providers' names
+    src=$(echo "$output" | grep " Source" | \
+          head -n1 | awk '{print $NF}' | cut -d: -f2)
+    sink=$(echo -e "$output" | grep " Sink" | \
+           head -n1 | awk '{print $NF}' | cut -d: -f2)
+else
+    # Use the providers' ids
+    src=$(echo "$output" | grep " Source" | \
+          head -n1 | cut -d: -f3 | cut -d" " -f2)
+    sink=$(echo -e "$output" | grep " Sink" | \
+           head -n1 | cut -d: -f3 | cut -d" " -f2)
+fi
+
+# Pass provider or sink and source
+xrandr --setprovideroutputsource "$sink" "$src"
+
+# Make sure xrandr sees all the outputs
+xrandr --auto
+
+# Do not move up. Only now xrandr shows the outputs
+lvds=$(xrandr | grep -i "lvds" | head -n1 |cut -d " " -f 1)
+xrandr --output "$lvds" --off
+xrandr --output "$lvds" --auto
diff --git a/lightdm.conf b/lightdm.conf
new file mode 100644
index 0000000..c447e11
--- /dev/null
+++ b/lightdm.conf
@@ -0,0 +1,4 @@
+[SeatDefaults]
+user-session=ubuntu
+greeter-session=unity-greeter
+display-setup-script=/sbin/hybrid-power