xresprobe (0.4.23debian1-0.3) debian-dir only changes

--- xresprobe-0.4.23debian1.orig/debian/control
+++ xresprobe-0.4.23debian1/debian/control
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Otavio Salvador <otavio@debian.org>, David Nusinow <dnusinow@debian.org>
-Build-Depends: debhelper (>= 4.0.0), cdbs
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 7), cdbs
+Standards-Version: 3.9.1
 
 Package: xresprobe
 Architecture: any
@@ -20,4 +20,4 @@
  .
  It contains the 'ddcprobe' package, which performs a DDC probe to the monitor;
  however, ddcprobe only works on i386 and powerpc. The laptop detection routines
- are, however, sufficiently generic to to be useful to other architectures.
+ are, however, sufficiently generic to be useful to other architectures.
--- xresprobe-0.4.23debian1.orig/debian/compat
+++ xresprobe-0.4.23debian1/debian/compat
@@ -1 +1 @@
-4
+7
--- xresprobe-0.4.23debian1.orig/debian/changelog
+++ xresprobe-0.4.23debian1/debian/changelog
@@ -1,3 +1,57 @@
+xresprobe (0.4.23debian1-0.3) experimental; urgency=low
+
+  * Non-maintainer upload to clean up the package.
+  * Update debhelper compat level from 4 to 7.
+  * Update standards-version from 3.7.2 to 3.9.1.  No changes needed.
+  * Apply patches from Ubuntu:
+    - Adust lcdsize.sh to add support for vesa.  Add missing getres
+      call.  Patch by Timo Aaltonen.
+    - Adjust xprobe.sh to not use the bare-bones config, instead rely
+      on the new xserver to be clever.  Make sure to only autoprobe
+      if the driver is vesa.  Patch by Timo Aaltonen.
+    - Add support for the Intel driver.  Patch by Matthew Garrett.
+    - Fix xprobe.sh failure when generating xorg.conf caused by
+      missing type1 module; this was dropped by Debian for xserver 1.3
+      since it's obsolete and has some security issues.  (Addresses
+      portion of fix for LP 127008).  Patch from Bryce Harrington.
+    - Fix issue with xresprobe in alternate installation for Intel gfx
+      laptops resulting in screen to be replaced by flashing colored
+      blocks, by making xresprobe use ddcprobe instead of xprobe for
+      laptops using the -intel driver.  (Closes LP: #127008 and many,
+      many duplicates).  Patch from Bryce Harrington.
+    - Fix resolution detection error in ddcprobe.sh where LCD's would
+      get configured to use one resolution less than their maximum
+      because ddcprobe cannot tell the difference between an analog
+      attached LCD and a CRT.  (Closes LP: #27667).  Patch from Bryce
+      Harrington.
+    - Adjust xprobe.sh handling of intel drivers (LP: #127008).  Patch
+      from Bryce Harrington.
+    - Adjust lcdsize.sh to fix vesa sed regex so that resolutions are
+      returned correctly without trailing text.  Patch from Timo
+      Aaltonen.
+
+ -- Petter Reinholdtsen <pere@hungry.com>  Sun, 02 Jan 2011 08:17:43 +0100
+
+xresprobe (0.4.23debian1-0.2) unstable; urgency=low
+
+  * Non-maintainer upload to fix RC bug.
+  * Fix typo 'to to' in package description.
+  * Apply patch from Ubuntu:
+    - Fix build problem with recent kernels by defining *_MASK in
+      ddcprobe/lrmi.c (Closes: #608187).  Patch from Chris Coulson.
+
+ -- Petter Reinholdtsen <pere@hungry.com>  Sun, 02 Jan 2011 08:56:48 +0100
+
+xresprobe (0.4.23debian1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload with maintainer approval.
+  * Fix bashism in ddcprobe.sh.  (Closes: #393929)
+  * Add copyright information for ddcprobe. (Closes: #361086)
+  * Updated FSF address to quiet down lintian.
+  * Updated standards version from 3.6.1.0 to 3.7.2.  No change needed.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Thu,  2 Aug 2007 15:08:37 +0200
+
 xresprobe (0.4.23debian1) unstable; urgency=low
 
   * New release based in 0.4.23 release of Ubuntu.
--- xresprobe-0.4.23debian1.orig/debian/copyright
+++ xresprobe-0.4.23debian1/debian/copyright
@@ -1,5 +1,5 @@
-Copyright (C) 2004 Canonical Software, written by
-Daniel Stone <daniel.stone@canonical.com>.
+The package scripts are copyright (C) 2004 Canonical Software, written by
+Daniel Stone <daniel.stone@canonical.com> and licensed under GPL v2.
 
 Copyright:
 
@@ -14,8 +14,36 @@
 
    You should have received a copy of the GNU General Public License
    along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The minifind.c source is Copyright (c) 2002 Terra Soft Solutions, Inc.
+licensed using GPL.
+
+The x86-common.c and lrmi.c source is Copyright (C) 1998 by Josh Vanderhoof
+and licensed like this:
+
+  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 JOSH VANDERHOOF 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.
+
+The source in x86emu/ is Copyright (C) 1996-1999 SciTech Software, Inc.,
+copyright (C) David Mosberger-Tang and Copyright (C) 1999 Egbert Eich.