diff -Nru sensors-applet-3.0.0/debian/changelog sensors-applet-3.0.0/debian/changelog
--- sensors-applet-3.0.0/debian/changelog	2012-02-14 13:06:20.000000000 -0500
+++ sensors-applet-3.0.0/debian/changelog	2012-09-30 13:22:41.000000000 -0400
@@ -1,3 +1,13 @@
+sensors-applet (3.0.0-0.2ubuntu2) quantal; urgency=low
+
+  * Merge from debian unstable (LP: #1049343).  Remaining changes:
+    - debian/rules:
+      + Enable nvidia compilation flag.
+    - debian/control:
+      + Build-depend on nvidia-settings and update description accordingly.
+
+ -- Darxus <darxus@chaosreigns.com>  Sun, 30 Sep 2012 11:21:31 -0400
+
 sensors-applet (3.0.0-0.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru sensors-applet-3.0.0/debian/control sensors-applet-3.0.0/debian/control
--- sensors-applet-3.0.0/debian/control	2012-02-14 13:04:46.000000000 -0500
+++ sensors-applet-3.0.0/debian/control	2012-09-30 13:15:19.000000000 -0400
@@ -19,7 +19,8 @@
  libx11-dev,
  libtool,
  scrollkeeper,
- xsltproc
+ xsltproc,
+ nvidia-settings (>= 173.14.09-1ubuntu2) [amd64 i386],
 Standards-Version: 3.7.3
 XS-DM-Upload-Allowed: yes
 Homepage: http://sensors-applet.sourceforge.net/
@@ -43,7 +44,7 @@
   * Linux kernel iMac G5 Windfarm module
   * hddtemp daemon for reading temperatures from S.M.A.R.T. equipped hard disks
   * Linux kernel Omnibook module
-  * NVIDIA graphics cards (with separate sensors-applet-nvidia package)
+  * NVIDIA graphics cards (supplied with nvidia-settings)
   * Linux kernel sonypi module (for Sony Vaio laptops)
  .
  Alarms can be set for each sensor to notify the user once a certain high or
diff -Nru sensors-applet-3.0.0/debian/rules sensors-applet-3.0.0/debian/rules
--- sensors-applet-3.0.0/debian/rules	2011-11-05 13:47:12.000000000 -0400
+++ sensors-applet-3.0.0/debian/rules	2012-09-30 13:16:21.000000000 -0400
@@ -28,6 +28,9 @@
 # remove un-necessary dependencies
 confflags += LDFLAGS=-Wl,--as-needed
 
+# enable nvidia support
+confflags += --with-nvidia=yes
+
 %:
 	dh $@