diff -Nru /tmp/w79nm431fc/laptop-detect-0.13.1/debian/changelog /tmp/b50dtyGirH/laptop-detect-0.13.1ubuntu1/debian/changelog --- /tmp/w79nm431fc/laptop-detect-0.13.1/debian/changelog 2007-05-26 15:27:57.000000000 +0200 +++ /tmp/b50dtyGirH/laptop-detect-0.13.1ubuntu1/debian/changelog 2007-07-09 17:34:18.000000000 +0200 @@ -1,3 +1,12 @@ +laptop-detect (0.13.1ubuntu1) gutsy; urgency=low + + * New Debian version, all Ubuntu patches are merged upstream + * laptop-detect.in: Load battery module before probing for acpi + batteries (LP: #40503) + * debian/rules: Versioned dependency on dmidecode (LP: #91447) + + -- Tormod Volden Mon, 9 Jul 2007 10:45:35 +0200 + laptop-detect (0.13.1) unstable; urgency=low * Change package priority to important to match override. diff -Nru /tmp/w79nm431fc/laptop-detect-0.13.1/debian/control /tmp/b50dtyGirH/laptop-detect-0.13.1ubuntu1/debian/control --- /tmp/w79nm431fc/laptop-detect-0.13.1/debian/control 2007-05-26 14:59:08.000000000 +0200 +++ /tmp/b50dtyGirH/laptop-detect-0.13.1ubuntu1/debian/control 2007-07-09 10:49:28.000000000 +0200 @@ -1,7 +1,8 @@ Source: laptop-detect Section: utils Priority: important -Maintainer: Thom May +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Thom May Uploaders: Otavio Salvador Build-Depends: cdbs, debhelper (>= 5) Standards-Version: 3.7.2 diff -Nru /tmp/w79nm431fc/laptop-detect-0.13.1/debian/rules /tmp/b50dtyGirH/laptop-detect-0.13.1ubuntu1/debian/rules --- /tmp/w79nm431fc/laptop-detect-0.13.1/debian/rules 2007-05-26 15:26:45.000000000 +0200 +++ /tmp/b50dtyGirH/laptop-detect-0.13.1ubuntu1/debian/rules 2007-07-09 17:28:16.000000000 +0200 @@ -6,10 +6,10 @@ # supports architecture specific dependencies. DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) ifeq ($(DEB_HOST_ARCH),i386) -DEB_DH_GENCONTROL_ARGS := -- -Vdmidecode-depends=dmidecode +DEB_DH_GENCONTROL_ARGS := -- -Vdmidecode-depends="dmidecode (>= 2.8-2)" endif ifeq ($(DEB_HOST_ARCH),amd64) -DEB_DH_GENCONTROL_ARGS := -- -Vdmidecode-depends=dmidecode +DEB_DH_GENCONTROL_ARGS := -- -Vdmidecode-depends="dmidecode (>= 2.8-2)" endif VERSION=$(shell dpkg-parsechangelog \ diff -Nru /tmp/w79nm431fc/laptop-detect-0.13.1/laptop-detect.in /tmp/b50dtyGirH/laptop-detect-0.13.1ubuntu1/laptop-detect.in --- /tmp/w79nm431fc/laptop-detect-0.13.1/laptop-detect.in 2007-05-25 15:36:50.000000000 +0200 +++ /tmp/b50dtyGirH/laptop-detect-0.13.1ubuntu1/laptop-detect.in 2007-07-09 10:47:32.000000000 +0200 @@ -62,6 +62,7 @@ fi # check for any ACPI batteries +modprobe battery || true if [ -d /proc/acpi/battery ]; then results=`find /proc/acpi/battery/ -mindepth 1 -type d` if [ ! -z "$results" ]; then