Package: acpi-support Version: 0.137-3 Severity: normal Tags: patch The binaries 0.137-3 in debian archive do not have the problem. The source 0.137-3 does. It is because the orig tarball contains a debian subdir, breaking policy for source format 1.0. $ apt-get source acpi-support $ tar tzf acpi-support_0.137.orig.tar.gz | grep debian debian/ debian/copyright debian/rules debian/dirs debian/control debian/acpi_fakekey.1 (...)
The Debian VCS in git://git.debian.org/git/pkg-acpi/acpi-support.git does contain neither debian/ in tag upstream/0.137, nor debian/acpi-support.manpages in tag debian/0.137-3. The binaries may have been built using the VCS workspace, not the upstream tarball. The generated debian diff assumes that the tarball contains a debian subdir. Source downloaders get this parasite subdir and do not build the same binaries than those in the archive. I guess that rebuilding and reuploading with a modified upstream tarball should solve [1], Upgrading to source/format to 3.0 (quilt) is a better solution. The new format states that dpkg should remove the debian subdir, if any, between orig tarball decompression and debian diff application. Better, dpkg respects this policy :-) (since 1.15.8, see #590297). The attached patches do no need modifying the upstream tarball. Concerning [2], I cannot reproduce it. dpkg detects that a file is installed twice, even if installing both package at once. Detecting such cases at build time with dh_installman/lintian seems redundant (maintainer will test dpkg -i/piuparts), and difficult (think to a single source producing two binary flavors, each containing exe/man with the same name).
>From 13cd3a5f9c793025017a030cdfc2bd6a10cf5312 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <Nicolas Boulenguez nicolas.bouleng...@free.fr> Date: Sat, 7 Aug 2010 10:36:08 +0200 Subject: [PATCH 1/4] Switched to source format 3.0 (quilt). --- debian/changelog | 7 +++++++ debian/rules | 8 +++----- debian/source/format | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4950842..30051ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +acpi-support (0.137-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Switched to source format 3.0 (quilt). (See #591815). + + -- Nicolas Boulenguez <nicolas.bouleng...@free.fr> Sat, 07 Aug 2010 10:29:59 +0200 + acpi-support (0.137-3) unstable; urgency=low * Re-added lost brace to policy-funcs. (Closes: #587599) diff --git a/debian/rules b/debian/rules index 1b9b5de..6ed1000 100755 --- a/debian/rules +++ b/debian/rules @@ -1,20 +1,18 @@ #!/usr/bin/make -f -include /usr/share/quilt/quilt.make - DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) ifeq ($(DEB_HOST_ARCH),i386) arch-depends := -V'arch:Suggests=toshset' endif -clean: unpatch +clean: dh_testdir dh_testroot make clean -rm -f acpi_fakekeyd dh_clean -build: patch build-stamp +build: build-stamp build-stamp: make @@ -51,5 +49,5 @@ binary-arch: dhclean install dh_gencontrol -- $(arch-depends) dh_md5sums dh_builddeb - + binary: binary-arch binary-indep diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) -- 1.7.1
>From 15e973d996b9eb1fec8d1590e7d26e0e5135e3ac Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <Nicolas Boulenguez nicolas.bouleng...@free.fr> Date: Sat, 7 Aug 2010 11:37:33 +0200 Subject: [PATCH 2/4] Refreshed all quilt patches to make them dpkg-source compatible. --- debian/patches/ac.diff | 6 ++++-- debian/patches/acpi_fakekey.diff | 22 +++++++++++++--------- debian/patches/asus-brightness-down.diff | 6 ++++-- debian/patches/asus-brn-up.sh.diff | 6 ++++-- debian/patches/asus-touchpad.sh-led.diff | 6 ++++-- debian/patches/asus-touchpad.sh.diff | 6 ++++-- debian/patches/asus-wireless.sh.diff | 6 ++++-- debian/patches/battery.diff | 6 ++++-- debian/patches/blank_no_user.diff | 6 ++++-- debian/patches/dmi.diff | 12 ++++++++---- debian/patches/dpms.diff | 18 ++++++++++++------ debian/patches/full-path.diff | 8 +++++--- debian/patches/hibernate.sh.diff | 7 ++++--- debian/patches/ibm.diff | 6 ++++-- debian/patches/lid.sh.diff | 6 ++++-- debian/patches/policy-funcs-grep.diff | 10 ++++++---- debian/patches/policy-funcs.diff | 6 ++++-- debian/patches/power-funcs.diff | 13 +++++++------ debian/patches/screenblank.diff | 6 ++++-- debian/patches/sleep.sh.diff | 7 ++++--- debian/patches/sleepbtn.sh.diff | 6 ++++-- debian/patches/state-funcs.diff | 6 ++++-- debian/patches/su_shell.diff | 25 ++++++++++++++----------- debian/patches/xset.diff | 6 ++++-- 24 files changed, 133 insertions(+), 79 deletions(-) diff --git a/debian/patches/ac.diff b/debian/patches/ac.diff index c0b5633..2b6f765 100644 --- a/debian/patches/ac.diff +++ b/debian/patches/ac.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.114.orig/events/ac -+++ acpi-support-0.114/events/ac +Index: b/events/ac +=================================================================== +--- a/events/ac 2010-08-07 11:33:52.000000000 +0200 ++++ b/events/ac 2010-08-07 11:34:55.000000000 +0200 @@ -2,5 +2,5 @@ # Called when the user connects ac power to us # diff --git a/debian/patches/acpi_fakekey.diff b/debian/patches/acpi_fakekey.diff index 6a2a2cb..e6d0acb 100644 --- a/debian/patches/acpi_fakekey.diff +++ b/debian/patches/acpi_fakekey.diff @@ -1,6 +1,7 @@ -diff -Nru acpi-support-0.115/acpi_fakekey.c /tmp/Umsn0ebzYy/acpi-support-0.115+thjaeger1/acpi_fakekey.c ---- acpi-support-0.115/acpi_fakekey.c 2008-09-26 00:14:34.000000000 +0100 -+++ acpi-support-0.115+thjaeger1/acpi_fakekey.c 2009-01-19 09:09:31.000000000 +0000 +Index: b/acpi_fakekey.c +=================================================================== +--- a/acpi_fakekey.c 2010-08-07 11:33:52.000000000 +0200 ++++ b/acpi_fakekey.c 2010-08-07 11:34:55.000000000 +0200 @@ -1,68 +1,29 @@ #include <unistd.h> #include <fcntl.h> @@ -85,9 +86,10 @@ diff -Nru acpi-support-0.115/acpi_fakekey.c /tmp/Umsn0ebzYy/acpi-support-0.115+t + return EXIT_SUCCESS; } - -diff -Nru /tmp/clWVJzRiJd/acpi-support-0.115/Makefile /tmp/Umsn0ebzYy/acpi-support-0.115+thjaeger1/Makefile ---- acpi-support-0.115/Makefile 2008-09-26 00:14:34.000000000 +0100 -+++ acpi-support-0.115+thjaeger1/Makefile 2009-01-19 09:09:31.000000000 +0000 +Index: b/Makefile +=================================================================== +--- a/Makefile 2010-08-07 11:33:52.000000000 +0200 ++++ b/Makefile 2010-08-07 11:34:55.000000000 +0200 @@ -1,8 +1,10 @@ -all: acpi_fakekey +all: acpi_fakekey acpi_fakekeyd @@ -102,14 +104,16 @@ diff -Nru /tmp/clWVJzRiJd/acpi-support-0.115/Makefile /tmp/Umsn0ebzYy/acpi-suppo # Keep this manually generated so that it doesn't build-dep on # 'linux-headers' and stays predictable. -@@ -15,4 +19,4 @@ +@@ -15,4 +17,4 @@ test -f aliased-keys && cat aliased-keys >> $@ clean: - rm -f acpi_fakekey + $(RM) acpi_fakekey acpi_fakekeyd ---- acpi-support/acpi_fakekeyd.c 2010-06-15 12:35:38.846063228 +0200 -+++ acpi-support/acpi_fakekeyd.c 2010-06-15 18:22:03.000000000 +0200 +Index: b/acpi_fakekeyd.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/acpi_fakekeyd.c 2010-08-07 11:34:55.000000000 +0200 @@ -0,0 +1,103 @@ +#include <unistd.h> +#include <fcntl.h> diff --git a/debian/patches/asus-brightness-down.diff b/debian/patches/asus-brightness-down.diff index 12ddea8..1d4d8dc 100644 --- a/debian/patches/asus-brightness-down.diff +++ b/debian/patches/asus-brightness-down.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.137/events/asus-brightness-down 2010-06-23 04:27:29.000000000 +0200 -+++ acpi-support-0.137/events/asus-brightness-down 2010-06-24 14:00:00.000000000 +0200 +Index: b/events/asus-brightness-down +=================================================================== +--- a/events/asus-brightness-down 2010-08-07 11:33:51.000000000 +0200 ++++ b/events/asus-brightness-down 2010-08-07 11:34:56.000000000 +0200 @@ -1,2 +1,2 @@ event=hotkey (ATKD|HOTK) 0000002[0123456789abcdef] -action=/etc/acpi/asus-brn-down.sh diff --git a/debian/patches/asus-brn-up.sh.diff b/debian/patches/asus-brn-up.sh.diff index d965f15..abab9d3 100644 --- a/debian/patches/asus-brn-up.sh.diff +++ b/debian/patches/asus-brn-up.sh.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.114.orig/asus-brn-up.sh -+++ acpi-support-0.114/asus-brn-up.sh +Index: b/asus-brn-up.sh +=================================================================== +--- a/asus-brn-up.sh 2010-08-07 11:33:52.000000000 +0200 ++++ b/asus-brn-up.sh 2010-08-07 11:34:55.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh test -f /usr/share/acpi-support/key-constants || exit 0 diff --git a/debian/patches/asus-touchpad.sh-led.diff b/debian/patches/asus-touchpad.sh-led.diff index 047e9d7..37ca87d 100644 --- a/debian/patches/asus-touchpad.sh-led.diff +++ b/debian/patches/asus-touchpad.sh-led.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.133.orig/asus-touchpad.sh -+++ acpi-support-0.133/asus-touchpad.sh +Index: b/asus-touchpad.sh +=================================================================== +--- a/asus-touchpad.sh 2010-08-07 11:34:55.000000000 +0200 ++++ b/asus-touchpad.sh 2010-08-07 11:34:56.000000000 +0200 @@ -25,6 +25,12 @@ if [ $TPSTATUS = 0 ]; then diff --git a/debian/patches/asus-touchpad.sh.diff b/debian/patches/asus-touchpad.sh.diff index e1bccfc..6369be0 100644 --- a/debian/patches/asus-touchpad.sh.diff +++ b/debian/patches/asus-touchpad.sh.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.114.orig/asus-touchpad.sh -+++ acpi-support-0.114/asus-touchpad.sh +Index: b/asus-touchpad.sh +=================================================================== +--- a/asus-touchpad.sh 2010-08-07 11:33:52.000000000 +0200 ++++ b/asus-touchpad.sh 2010-08-07 11:35:22.000000000 +0200 @@ -3,12 +3,20 @@ . /usr/share/acpi-support/power-funcs diff --git a/debian/patches/asus-wireless.sh.diff b/debian/patches/asus-wireless.sh.diff index a20e13d..f489b19 100644 --- a/debian/patches/asus-wireless.sh.diff +++ b/debian/patches/asus-wireless.sh.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.133.orig/asus-wireless.sh -+++ acpi-support-0.133/asus-wireless.sh +Index: b/asus-wireless.sh +=================================================================== +--- a/asus-wireless.sh 2010-08-07 11:33:52.000000000 +0200 ++++ b/asus-wireless.sh 2010-08-07 11:34:56.000000000 +0200 @@ -5,4 +5,18 @@ . /usr/share/acpi-support/state-funcs diff --git a/debian/patches/battery.diff b/debian/patches/battery.diff index f674fc0..06f36d3 100644 --- a/debian/patches/battery.diff +++ b/debian/patches/battery.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.114.orig/events/battery -+++ acpi-support-0.114/events/battery +Index: b/events/battery +=================================================================== +--- a/events/battery 2010-08-07 11:33:52.000000000 +0200 ++++ b/events/battery 2010-08-07 11:34:56.000000000 +0200 @@ -1,5 +1,5 @@ # /etc/acpi/events/battery # Called when AC power goes away and we switch to battery diff --git a/debian/patches/blank_no_user.diff b/debian/patches/blank_no_user.diff index ab95ef8..d48d63f 100644 --- a/debian/patches/blank_no_user.diff +++ b/debian/patches/blank_no_user.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.131.orig/lid.sh -+++ acpi-support-0.131/lid.sh +Index: b/lid.sh +=================================================================== +--- a/lid.sh 2010-08-07 11:34:56.000000000 +0200 ++++ b/lid.sh 2010-08-07 11:35:19.000000000 +0200 @@ -19,6 +19,8 @@ if [ x"$XAUTHORITY" != x"" ]; then export DISPLAY=":$displaynum" diff --git a/debian/patches/dmi.diff b/debian/patches/dmi.diff index e8682d4..f5dd162 100644 --- a/debian/patches/dmi.diff +++ b/debian/patches/dmi.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.133.orig/lib/device-funcs 2010-03-19 17:25:40.000000000 +0100 -+++ acpi-support-0.133/lib/device-funcs 2010-03-19 17:36:09.000000000 +0100 +Index: b/lib/device-funcs +=================================================================== +--- a/lib/device-funcs 2010-08-07 11:33:51.000000000 +0200 ++++ b/lib/device-funcs 2010-08-07 11:34:56.000000000 +0200 @@ -1,10 +1,7 @@ DeviceConfig() { @@ -15,8 +17,10 @@ + version=`cat /sys/class/dmi/id/product_version|sed -e 's/ *$//'` + bios_version=`cat /sys/class/dmi/id/bios_version|sed -e 's/ *$//'` } ---- acpi-support-0.133.orig/thinkpad-stretchortouchpad.sh 2010-03-19 17:26:13.000000000 +0100 -+++ acpi-support-0.133/thinkpad-stretchortouchpad.sh 2010-03-19 17:27:46.000000000 +0100 +Index: b/thinkpad-stretchortouchpad.sh +=================================================================== +--- a/thinkpad-stretchortouchpad.sh 2010-08-07 11:33:51.000000000 +0200 ++++ b/thinkpad-stretchortouchpad.sh 2010-08-07 11:34:56.000000000 +0200 @@ -17,10 +17,10 @@ toggle_touchpad=0 diff --git a/debian/patches/dpms.diff b/debian/patches/dpms.diff index c4aa26d..fbde088 100644 --- a/debian/patches/dpms.diff +++ b/debian/patches/dpms.diff @@ -1,5 +1,7 @@ ---- acpi-support/lid.sh 2009-12-28 22:54:05.000000000 +0100 -+++ acpi-support/lid.sh 2009-12-28 22:58:11.000000000 +0100 +Index: b/lid.sh +=================================================================== +--- a/lid.sh 2010-08-07 11:34:56.000000000 +0200 ++++ b/lid.sh 2010-08-07 11:34:56.000000000 +0200 @@ -42,7 +42,17 @@ if [ `pidof xscreensaver` ]; then su $user -s /bin/sh -c "xscreensaver-command -deactivate" @@ -18,8 +20,10 @@ else [ -x /usr/sbin/vbetool ] && /usr/sbin/vbetool dpms on fi ---- acpi-support/lib/screenblank 2009-12-28 22:54:08.000000000 +0100 -+++ acpi-support/lib/screenblank 2009-12-28 22:59:06.000000000 +0100 +Index: b/lib/screenblank +=================================================================== +--- a/lib/screenblank 2010-08-07 11:34:56.000000000 +0200 ++++ b/lib/screenblank 2010-08-07 11:34:56.000000000 +0200 @@ -14,7 +14,18 @@ fi fi @@ -39,8 +43,10 @@ if [ x$RADEON_LIGHT = xtrue ]; then [ -x /usr/sbin/radeontool ] && radeontool light off fi ---- acpi-support/screenblank.sh 2009-12-28 23:04:58.000000000 +0100 -+++ acpi-support/screenblank.sh 2009-12-28 23:05:59.000000000 +0100 +Index: b/screenblank.sh +=================================================================== +--- a/screenblank.sh 2010-08-07 11:33:51.000000000 +0200 ++++ b/screenblank.sh 2010-08-07 11:34:56.000000000 +0200 @@ -4,6 +4,7 @@ . /etc/default/acpi-support diff --git a/debian/patches/full-path.diff b/debian/patches/full-path.diff index 906f2ae..c9f5ca3 100644 --- a/debian/patches/full-path.diff +++ b/debian/patches/full-path.diff @@ -1,6 +1,8 @@ ---- acpi-support/lib/policy-funcs 2009-12-11 16:47:50.000000000 +0100 -+++ acpi-support/lib/policy-funcs 2009-12-11 17:24:02.000000000 +0100 -@@ -10,8 +10,8 @@ +Index: b/lib/policy-funcs +=================================================================== +--- a/lib/policy-funcs 2010-08-07 11:34:56.000000000 +0200 ++++ b/lib/policy-funcs 2010-08-07 11:34:56.000000000 +0200 +@@ -18,8 +18,8 @@ local PMS getXconsole diff --git a/debian/patches/hibernate.sh.diff b/debian/patches/hibernate.sh.diff index 320b98b..af17924 100644 --- a/debian/patches/hibernate.sh.diff +++ b/debian/patches/hibernate.sh.diff @@ -1,6 +1,7 @@ -diff -ruN acpi-support.orig/hibernate.sh acpi-support/hibernate.sh ---- acpi-support.orig/hibernate.sh 2009-11-22 12:25:44.000000000 +0100 -+++ acpi-support/hibernate.sh 2009-11-22 12:26:19.000000000 +0100 +Index: b/hibernate.sh +=================================================================== +--- a/hibernate.sh 2010-08-07 11:33:52.000000000 +0200 ++++ b/hibernate.sh 2010-08-07 11:34:56.000000000 +0200 @@ -1,5 +1,4 @@ -#!/bin/bash -# TODO: Above should be /bin/sh diff --git a/debian/patches/ibm.diff b/debian/patches/ibm.diff index 0b96f5f..f215e32 100644 --- a/debian/patches/ibm.diff +++ b/debian/patches/ibm.diff @@ -1,5 +1,7 @@ ---- acpi-support/ibm-wireless.sh.orig 2009-12-28 19:00:36.000000000 +0100 -+++ acpi-support/ibm-wireless.sh 2009-12-28 19:35:02.000000000 +0100 +Index: b/ibm-wireless.sh +=================================================================== +--- a/ibm-wireless.sh 2010-08-07 11:33:51.000000000 +0200 ++++ b/ibm-wireless.sh 2010-08-07 11:34:56.000000000 +0200 @@ -1,10 +1,17 @@ #!/bin/sh diff --git a/debian/patches/lid.sh.diff b/debian/patches/lid.sh.diff index 8564100..17d0c8c 100644 --- a/debian/patches/lid.sh.diff +++ b/debian/patches/lid.sh.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.114.orig/lid.sh -+++ acpi-support-0.114/lid.sh +Index: b/lid.sh +=================================================================== +--- a/lid.sh 2010-08-07 11:33:52.000000000 +0200 ++++ b/lid.sh 2010-08-07 11:35:20.000000000 +0200 @@ -1,5 +1,4 @@ -#!/bin/bash -# TODO: Change the above to /bin/sh diff --git a/debian/patches/policy-funcs-grep.diff b/debian/patches/policy-funcs-grep.diff index bce9661..ac49617 100644 --- a/debian/patches/policy-funcs-grep.diff +++ b/debian/patches/policy-funcs-grep.diff @@ -1,11 +1,13 @@ ---- acpi-support/lib/policy-funcs 2009-12-07 20:18:55.643070790 +0100 -+++ acpi-support/lib/policy-funcs 2009-12-07 20:19:15.489729366 +0100 -@@ -26,7 +26,7 @@ +Index: b/lib/policy-funcs +=================================================================== +--- a/lib/policy-funcs 2010-08-07 11:34:56.000000000 +0200 ++++ b/lib/policy-funcs 2010-08-07 11:35:20.000000000 +0200 +@@ -34,7 +34,7 @@ for p in $(pidof kded4); do test -r /proc/$p/environ || continue - local DBUS_SESS=$(cat /proc/$p/environ | grep -z "DBUS_SESSION_BUS_ADDRESS=") + local DBUS_SESS=$(cat /proc/$p/environ | grep -a -z "DBUS_SESSION_BUS_ADDRESS=") test "$DBUS_SESS" != "" || continue - (su - $(ps -o user= $p) -s /bin/sh -c "$DBUS_SESS dbus-send --print-reply --dest=org.kde.kded /kded org.kde.kded.loadedModules" | grep -q powerdevil) && return 0 + (su - $(ps -o user= $p) -c "$DBUS_SESS dbus-send --print-reply --dest=org.kde.kded /kded org.kde.kded.loadedModules" | grep -q powerdevil) && return 0 done diff --git a/debian/patches/policy-funcs.diff b/debian/patches/policy-funcs.diff index 1b501cd..16831b9 100644 --- a/debian/patches/policy-funcs.diff +++ b/debian/patches/policy-funcs.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.137.orig/lib/policy-funcs 2010-06-24 09:16:57.000000000 +0200 -+++ acpi-support-0.137.orig/lib/policy-funcs 2010-06-24 09:18:04.000000000 +0200 +Index: b/lib/policy-funcs +=================================================================== +--- a/lib/policy-funcs 2010-08-07 11:33:51.000000000 +0200 ++++ b/lib/policy-funcs 2010-08-07 11:35:21.000000000 +0200 @@ -1,3 +1,5 @@ +. /usr/share/acpi-support/power-funcs + diff --git a/debian/patches/power-funcs.diff b/debian/patches/power-funcs.diff index 3e81540..5bf7220 100644 --- a/debian/patches/power-funcs.diff +++ b/debian/patches/power-funcs.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.137.orig/lib/power-funcs -+++ acpi-support-0.137/lib/power-funcs +Index: b/lib/power-funcs +=================================================================== +--- a/lib/power-funcs 2010-08-07 11:33:51.000000000 +0200 ++++ b/lib/power-funcs 2010-08-07 11:34:56.000000000 +0200 @@ -5,11 +5,17 @@ PATH="$PATH:/usr/bin/X11" POWERSTATE="/var/lib/acpi-support/powerstate" @@ -31,11 +33,10 @@ getXconsole() { console=`fgconsole`; displaynum=`ps t tty$console | sed -n -re 's,.*/X .*:([0-9]+).*,\1,p'` -@@ -27,11 +35,41 @@ - getXuser +@@ -28,10 +36,40 @@ fi } -+ + +ac_adapters() { + for x in /sys/class/power_supply/*; do + if [ -d "$x" ] ; then @@ -44,7 +45,7 @@ + fi + done +} - ++ getState() { - /usr/bin/on_ac_power - if [ "$?" -eq 1 ]; then diff --git a/debian/patches/screenblank.diff b/debian/patches/screenblank.diff index 883efd5..e5f6425 100644 --- a/debian/patches/screenblank.diff +++ b/debian/patches/screenblank.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.122.orig/lib/screenblank -+++ acpi-support-0.122/lib/screenblank +Index: b/lib/screenblank +=================================================================== +--- a/lib/screenblank 2010-08-07 11:33:51.000000000 +0200 ++++ b/lib/screenblank 2010-08-07 11:35:20.000000000 +0200 @@ -4,7 +4,14 @@ su $user -c "(xscreensaver-command -lock)" fi diff --git a/debian/patches/sleep.sh.diff b/debian/patches/sleep.sh.diff index 24f2cbd..9e416a1 100644 --- a/debian/patches/sleep.sh.diff +++ b/debian/patches/sleep.sh.diff @@ -1,6 +1,7 @@ -diff -ruN acpi-support.orig/sleep.sh acpi-support/sleep.sh ---- acpi-support.orig/sleep.sh 2009-11-22 12:27:18.000000000 +0100 -+++ acpi-support/sleep.sh 2009-11-22 12:27:41.000000000 +0100 +Index: b/sleep.sh +=================================================================== +--- a/sleep.sh 2010-08-07 11:33:51.000000000 +0200 ++++ b/sleep.sh 2010-08-07 11:34:56.000000000 +0200 @@ -1,5 +1,4 @@ -#!/bin/bash -# TODO: Change above to /bin/sh diff --git a/debian/patches/sleepbtn.sh.diff b/debian/patches/sleepbtn.sh.diff index ca84af3..a150b16 100644 --- a/debian/patches/sleepbtn.sh.diff +++ b/debian/patches/sleepbtn.sh.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.114.orig/sleepbtn.sh -+++ acpi-support-0.114/sleepbtn.sh +Index: b/sleepbtn.sh +=================================================================== +--- a/sleepbtn.sh 2010-08-07 11:33:51.000000000 +0200 ++++ b/sleepbtn.sh 2010-08-07 11:34:56.000000000 +0200 @@ -8,5 +8,28 @@ test -f /usr/share/acpi-support/key-constants || exit 0 diff --git a/debian/patches/state-funcs.diff b/debian/patches/state-funcs.diff index 8024e20..d3a6859 100644 --- a/debian/patches/state-funcs.diff +++ b/debian/patches/state-funcs.diff @@ -1,5 +1,7 @@ ---- acpi-support-0.137.orig/lib/state-funcs -+++ acpi-support-0.137/lib/state-funcs +Index: b/lib/state-funcs +=================================================================== +--- a/lib/state-funcs 2010-08-07 11:33:51.000000000 +0200 ++++ b/lib/state-funcs 2010-08-07 11:34:56.000000000 +0200 @@ -1,91 +1,66 @@ -#!/bin/sh # Paul Sladen, 2006-03-28, 2007-03-26 diff --git a/debian/patches/su_shell.diff b/debian/patches/su_shell.diff index bd53fcf..9ffebf0 100644 --- a/debian/patches/su_shell.diff +++ b/debian/patches/su_shell.diff @@ -1,18 +1,20 @@ -diff -ruN acpi-support.orig/lib/policy-funcs acpi-support/lib/policy-funcs ---- acpi-support.orig/lib/policy-funcs 2009-11-22 12:16:55.000000000 +0100 -+++ acpi-support/lib/policy-funcs 2009-11-22 12:17:11.000000000 +0100 -@@ -28,7 +28,7 @@ +Index: b/lib/policy-funcs +=================================================================== +--- a/lib/policy-funcs 2010-08-07 11:34:56.000000000 +0200 ++++ b/lib/policy-funcs 2010-08-07 11:35:19.000000000 +0200 +@@ -36,7 +36,7 @@ test -r /proc/$p/environ || continue - local DBUS_SESS=$(cat /proc/$p/environ | grep -z "DBUS_SESSION_BUS_ADDRESS=") + local DBUS_SESS=$(cat /proc/$p/environ | grep -a -z "DBUS_SESSION_BUS_ADDRESS=") test "$DBUS_SESS" != "" || continue - (su - $(ps -o user= $p) -c "$DBUS_SESS dbus-send --print-reply --dest=org.kde.kded /kded org.kde.kded.loadedModules" | grep -q powerdevil) && return 0 + (su $(ps -o user= $p) -s /bin/sh -c "$DBUS_SESS dbus-send --print-reply --dest=org.kde.kded /kded org.kde.kded.loadedModules" | grep -q powerdevil) && return 0 done return 1 -diff -ruN acpi-support.orig/lib/screenblank acpi-support/lib/screenblank ---- acpi-support.orig/lib/screenblank 2009-11-22 12:17:22.000000000 +0100 -+++ acpi-support/lib/screenblank 2009-11-22 12:17:40.000000000 +0100 +Index: b/lib/screenblank +=================================================================== +--- a/lib/screenblank 2010-08-07 11:34:56.000000000 +0200 ++++ b/lib/screenblank 2010-08-07 11:35:20.000000000 +0200 @@ -1,7 +1,7 @@ if [ `pidof xscreensaver` ]; then - su $user -c "(xscreensaver-command -throttle)" @@ -23,9 +25,10 @@ diff -ruN acpi-support.orig/lib/screenblank acpi-support/lib/screenblank fi elif [ `pidof dcopserver` ]; then if [ x$LOCK_SCREEN = xtrue ]; then -diff -ruN acpi-support.orig/lid.sh acpi-support/lid.sh ---- acpi-support.orig/lid.sh 2009-11-22 12:15:59.000000000 +0100 -+++ acpi-support/lid.sh 2009-11-22 12:16:05.000000000 +0100 +Index: b/lid.sh +=================================================================== +--- a/lid.sh 2010-08-07 11:34:56.000000000 +0200 ++++ b/lid.sh 2010-08-07 11:35:19.000000000 +0200 @@ -31,16 +31,16 @@ if [ $? = 1 ] then diff --git a/debian/patches/xset.diff b/debian/patches/xset.diff index 17d16de..db0c8c0 100644 --- a/debian/patches/xset.diff +++ b/debian/patches/xset.diff @@ -1,5 +1,7 @@ ---- acpi-support/lib/screenblank 2009-12-11 16:05:32.000000000 +0100 -+++ acpi-support/lib/screenblank 2009-12-11 16:05:53.000000000 +0100 +Index: b/lib/screenblank +=================================================================== +--- a/lib/screenblank 2010-08-07 11:34:56.000000000 +0200 ++++ b/lib/screenblank 2010-08-07 11:35:19.000000000 +0200 @@ -14,7 +14,7 @@ fi fi -- 1.7.1
>From 079a6029d3fd0a8c297a2c66d38b56e803a8a1e9 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <Nicolas Boulenguez nicolas.bouleng...@free.fr> Date: Sat, 7 Aug 2010 12:12:32 +0200 Subject: [PATCH 3/4] Removed quilt-related build dependency and README.source. --- debian/README.source | 58 -------------------------------------------------- debian/control | 2 +- 2 files changed, 1 insertions(+), 59 deletions(-) delete mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 5dde0bf..0000000 --- a/debian/README.source +++ /dev/null @@ -1,58 +0,0 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To configure quilt to use debian/patches instead of patches, you want -either to export QUILT_PATCHES=debian/patches in your environment -or use this snippet in your ~/.quiltrc: - - for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do - if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then - export QUILT_PATCHES=debian/patches - break - fi - done - -To get the fully patched source after unpacking the source package, cd to -the root level of the source package and run: - - quilt push -a - -The last patch listed in debian/patches/series will become the current -patch. - -To add a new set of changes, first run quilt push -a, and then run: - - quilt new <patch> - -where <patch> is a descriptive name for the patch, used as the filename in -debian/patches. Then, for every file that will be modified by this patch, -run: - - quilt add <file> - -before editing those files. You must tell quilt with quilt add what files -will be part of the patch before making changes or quilt will not work -properly. After editing the files, run: - - quilt refresh - -to save the results as a patch. - -Alternately, if you already have an external patch and you just want to -add it to the build system, run quilt push -a and then: - - quilt import -P <patch> /path/to/patch - quilt push -a - -(add -p 0 to quilt import if needed). <patch> as above is the filename to -use in debian/patches. The last quilt push -a will apply the patch to -make sure it works properly. - -To remove an existing patch from the list of patches that will be applied, -run: - - quilt delete <patch> - -You may need to run quilt pop -a to unapply patches first before running -this command. diff --git a/debian/control b/debian/control index 15bf79c..351dd09 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Debian Acpi Team <pkg-acpi-de...@lists.alioth.debian.org> Uploaders: Michael Meskes <mes...@debian.org> -Build-Depends: debhelper (>= 7), quilt (>= 0.40) +Build-Depends: debhelper (>= 7) Vcs-Git: git://git.debian.org/git/pkg-acpi/acpi-support.git Vcs-Browser: http://git.debian.org/?p=pkg-acpi/acpi-support.git Standards-Version: 3.9.0 -- 1.7.1
>From 60bebbdaff5fd922364be3c371b74d73d0b368ae Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <Nicolas Boulenguez nicolas.bouleng...@free.fr> Date: Sat, 7 Aug 2010 12:48:48 +0200 Subject: [PATCH 4/4] Close bug in changelog. --- debian/changelog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian/changelog b/debian/changelog index 30051ed..0369b58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ acpi-support (0.137-3.1) unstable; urgency=low * Non-maintainer upload. - * Switched to source format 3.0 (quilt). (See #591815). + * Switched to source format 3.0 (quilt). (Closes #591815). -- Nicolas Boulenguez <nicolas.bouleng...@free.fr> Sat, 07 Aug 2010 10:29:59 +0200 -- 1.7.1