diff -u 915resolution-0.5.3/debian/control 915resolution-0.5.3/debian/control --- 915resolution-0.5.3/debian/control +++ 915resolution-0.5.3/debian/control @@ -1,7 +1,8 @@ Source: 915resolution Section: x11 Priority: extra -Maintainer: Steffen Joeris +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Steffen Joeris Build-Depends: debhelper (>= 5), dpatch Standards-Version: 3.7.2 diff -u 915resolution-0.5.3/debian/rules 915resolution-0.5.3/debian/rules --- 915resolution-0.5.3/debian/rules +++ 915resolution-0.5.3/debian/rules @@ -25,6 +25,8 @@ dh_clean -k dh_installdirs install -D -m 755 915resolution $(CURDIR)/debian/915resolution/usr/sbin/915resolution + install -D -m 755 debian/49-915-resolution-set.sh $(CURDIR)/debian/915resolution/etc/acpi/resume.d/49-915-resolution-set.sh + ln -s 49-915-resolution-set.sh $(CURDIR)/debian/915resolution/etc/acpi/resume.d/13-915-resolution-set.sh # Build architecture-independent files here. binary-indep: build install diff -u 915resolution-0.5.3/debian/changelog 915resolution-0.5.3/debian/changelog --- 915resolution-0.5.3/debian/changelog +++ 915resolution-0.5.3/debian/changelog @@ -1,3 +1,10 @@ +915resolution (0.5.3-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #159328), remaining changes: + - Rerun 915resolution upon ACPI resume. + + -- James Westby Thu, 01 Nov 2007 18:34:49 +0000 + 915resolution (0.5.3-1) unstable; urgency=low * New upstream version @@ -7,6 +14,25 @@ -- Steffen Joeris Sun, 01 Jul 2007 19:37:58 +0200 +915resolution (0.5.3-0ubuntu1) gutsy; urgency=low + + * New upstream version. + * debian/patches: + + drop 01-add-chipsets.dpatch + - merged upstream + + add 01-new-chipsets.dpatch + - support new intel 965GM, Q33, Q35, G33 + + -- Kyle McMartin Mon, 25 Jun 2007 21:19:42 -0400 + +915resolution (0.5.2-11ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Rerun 915resolution upon ACPI resume. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- William Grant Sat, 19 May 2007 17:58:07 +1000 + 915resolution (0.5.2-11) unstable; urgency=low * Slightly improving README.Debian by adding the changes suggested @@ -16,6 +42,13 @@ -- Steffen Joeris Wed, 16 May 2007 15:56:42 +1000 +915resolution (0.5.2-10ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Rerun 915resolution upon ACPI resume. + + -- William Grant Mon, 12 Feb 2007 15:31:21 +1100 + 915resolution (0.5.2-10) unstable; urgency=low * Remove bashism from init script when trying to see if the system @@ -24,6 +57,13 @@ -- Steffen Joeris Sat, 10 Feb 2007 20:43:44 +1100 +915resolution (0.5.2-9ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Rerun 915resolution upon ACPI resume. + + -- William Alexander Grant Fri, 8 Dec 2006 20:29:45 +1100 + 915resolution (0.5.2-9) unstable; urgency=medium * Fix bad typo in init script (Closes: #401820) @@ -43,6 +83,13 @@ -- Steffen Joeris Tue, 5 Dec 2006 19:52:11 +0100 +915resolution (0.5.2-7ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Rerun 915resolution upon ACPI resume. + + -- Sarah Hobbs Wed, 29 Nov 2006 14:23:23 +1100 + 915resolution (0.5.2-7) unstable; urgency=medium * Include patch for 946GZ, 965G and 965Q chipsets (Closes: #399221) @@ -52,6 +99,13 @@ -- Steffen Joeris Wed, 22 Nov 2006 18:29:53 +0100 +915resolution (0.5.2-6ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Rerun 915resolution upon ACPI resume. + + -- Ante Karamatic Tue, 14 Nov 2006 01:29:17 +0000 + 915resolution (0.5.2-6) unstable; urgency=low * Make sure that the init script exits gracefully in case the chipset @@ -60,6 +114,13 @@ -- Steffen Joeris Tue, 14 Nov 2006 00:10:56 +1100 +915resolution (0.5.2-5ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Rerun 915resolution upon ACPI resume. + + -- William Alexander Grant Fri, 10 Nov 2006 17:10:21 +1100 + 915resolution (0.5.2-5) unstable; urgency=low * Introduce auto detection, fetched from Ubuntu @@ -73,6 +134,16 @@ -- Steffen Joeris Sat, 14 Oct 2006 21:08:02 +1000 +915resolution (0.5.2-4ubuntu1) edgy; urgency=low + + * Bring back some Ubuntu changes which were lost a while ago in + a sync: + - Use vbetool to get native panel resolution from the hardware, + removing need for manual configuration. + - Rerun 915resolution upon ACPI resume. + + -- William Alexander Grant Tue, 19 Sep 2006 08:48:30 +1000 + 915resolution (0.5.2-4) unstable; urgency=low * Fix spelling errors in description (Closes: #363570) @@ -135,0 +207 @@ + only in patch2: unchanged: --- 915resolution-0.5.3.orig/debian/49-915-resolution-set.sh +++ 915resolution-0.5.3/debian/49-915-resolution-set.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [ -x /usr/sbin/915resolution ]; then + . /etc/default/915resolution + if [ "$MODE" = auto ] || [ -n "$MODE" -a -n "$XRESO" -a -n "$YRESO" ] ; then + /etc/init.d/915resolution start; + fi +fi only in patch2: unchanged: --- 915resolution-0.5.3.orig/debian/dirs +++ 915resolution-0.5.3/debian/dirs @@ -0,0 +1 @@ +/etc/acpi/resume.d