diff -Nru sensors-applet-2.2.5/debian/changelog sensors-applet-2.2.5/debian/changelog
--- sensors-applet-2.2.5/debian/changelog	2010-03-31 14:26:12.000000000 -0400
+++ sensors-applet-2.2.5/debian/changelog	2010-05-23 01:52:19.000000000 -0400
@@ -1,3 +1,15 @@
+sensors-applet (2.2.5-4ubuntu1) maverick; urgency=low
+
+  * Merge from debian testing (LP: #380669, #249955). Remaining changes:
+    - debian/rules:
+      + Enable nvidia compilation flag.
+      + Disable -Wl,--as-needed LDFLAGS (static linking against libXNVCtrl.a
+        won't work otherwise, at least configure won't pick it up).
+    - debian/control:
+      + Build-depend on nvidia-settings and update description accordingly.
+
+ -- Nanley Chery <nanleychery@gmail.com>  Sat, 22 May 2010 22:25:13 -0400
+
 sensors-applet (2.2.5-4) unstable; urgency=low
 
   * Don't build-depend on libatasmart-dev on freebsd, where it does not exist.
@@ -49,6 +61,17 @@
 
  -- Sam Morris <sam@robots.org.uk>  Sun, 15 Nov 2009 14:42:42 +0000
 
+sensors-applet (2.2.3-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #374254), remaining changes:
+    - debian/control:
+      + update build-dependency of libxvnctrl-dev to
+        nvidia-settings, as the header/static library moved there with the
+        last upload of nvidia-settings.
+      + Build-Depends on gnome-doc-utils (>= 0.3.2).
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Mon, 11 May 2009 11:23:14 -0500
+
 sensors-applet (2.2.3-2) unstable; urgency=low
 
   * Make intltool build-dependency work. I don't know why the buildds and
@@ -64,6 +87,41 @@
 
  -- Sam Morris <sam@robots.org.uk>  Sun, 15 Mar 2009 11:48:10 +0000
 
+sensors-applet (2.2.1-1ubuntu4) intrepid; urgency=low
+
+  * debian/control: update build-dependency of libxvnctrl-dev to
+    nvidia-settings, as the header/static library moved there with the
+    last upload of nvidia-settings.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Sun, 10 Aug 2008 12:33:01 +0200
+
+sensors-applet (2.2.1-1ubuntu3) hardy; urgency=low
+
+  * debian/patches/01_fix_segfault_on_plugin_load.patch
+    + Patch by Alex Murray to fix a segfault when loading the libsensors
+      plugin.  (LP: #200097)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Sun, 16 Mar 2008 10:13:43 +1100
+
+sensors-applet (2.2.1-1ubuntu2) hardy; urgency=low
+
+  * debian/control: update description of sensors-applet, removing
+    the info that a separate package for NVIDIA GPU's would be
+    required.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Sun, 24 Feb 2008 20:19:08 +0100
+
+sensors-applet (2.2.1-1ubuntu1) hardy; urgency=low
+
+  * debian/rules: enable nvidia support in configure call (LP: #59945).
+  * debian/rules: disable -Wl,--as-needed LDFLAGS (static linking against
+    libXNVCtrl.a won't work otherwise, at least configure won't pick it
+    up).
+  * debian/control: add libxnvctrl-dev to build-depends.
+  * debian/control: update Maintainer value as per spec.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Sat, 23 Feb 2008 17:52:32 +0100
+
 sensors-applet (2.2.1-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru sensors-applet-2.2.5/debian/control sensors-applet-2.2.5/debian/control
--- sensors-applet-2.2.5/debian/control	2010-03-31 14:23:30.000000000 -0400
+++ sensors-applet-2.2.5/debian/control	2010-05-23 01:37:56.000000000 -0400
@@ -1,7 +1,8 @@
 Source: sensors-applet
 Section: gnome
 Priority: optional
-Maintainer: Sam Morris <sam@robots.org.uk>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sam Morris <sam@robots.org.uk>
 Uploaders: Filippo Giunchedi <filippo@esaurito.net>
 Build-Depends:
  autoconf,
@@ -23,6 +24,7 @@
  libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64],
  libtool,
  libxml-parser-perl,
+ nvidia-settings (>= 173.14.09-1ubuntu2) [amd64 i386],
  rarian-compat
 Standards-Version: 3.7.3
 Build-Conflicts:
@@ -50,7 +52,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-2.2.5/debian/rules sensors-applet-2.2.5/debian/rules
--- sensors-applet-2.2.5/debian/rules	2010-01-09 08:15:38.000000000 -0500
+++ sensors-applet-2.2.5/debian/rules	2010-05-23 01:38:36.000000000 -0400
@@ -25,8 +25,8 @@
 # don't do scrollkeeper at build-time
 confflags += --disable-scrollkeeper
 
-# remove un-necessary dependencies
-confflags += LDFLAGS=-Wl,--as-needed
+# enable nvidia support
+confflags += --with-nvidia=yes
 
 clean_paths := \
     aclocal.m4 \