From ccdee2c5e43bc2e619f873ffb8ace2fd68ec4cca Mon Sep 17 00:00:00 2001 From: Dennis Groenen Date: Sat, 3 Sep 2011 11:56:16 +0200 Subject: [PATCH] pull in kernel-power's new kernel-power-settings (0.12) --- kernel-power-settings/debian/changelog | 6 +++++ kernel-power-settings/debian/compat | 3 +-- kernel-power-settings/debian/control | 16 ++++++------- kernel-power-settings/debian/install | 9 +++++++ .../debian/kernel-power-settings.install | 9 ------- .../debian/kernel-power-settings.postinst | 23 ------------------ .../debian/kernel-power-settings.postrm | 17 ------------- kernel-power-settings/debian/postinst | 25 ++++++++++++++++++++ kernel-power-settings/debian/postrm | 19 +++++++++++++++ kernel-power-settings/debian/rules | 2 ++ 10 files changed, 70 insertions(+), 59 deletions(-) create mode 100644 kernel-power-settings/debian/install delete mode 100644 kernel-power-settings/debian/kernel-power-settings.install delete mode 100644 kernel-power-settings/debian/kernel-power-settings.postinst delete mode 100644 kernel-power-settings/debian/kernel-power-settings.postrm create mode 100644 kernel-power-settings/debian/postinst create mode 100644 kernel-power-settings/debian/postrm diff --git a/kernel-power-settings/debian/changelog b/kernel-power-settings/debian/changelog index b6380af..c02f300 100644 --- a/kernel-power-settings/debian/changelog +++ b/kernel-power-settings/debian/changelog @@ -1,3 +1,9 @@ +kernel-power-settings (0.12) fremantle; urgency=low + + * updated debian files + + -- Pali Rohár Sat, 09 Jul 2011 17:15:56 +0200 + kernel-power-settings (0.11) fremantle; urgency=low * reupload (broken autobuilder) diff --git a/kernel-power-settings/debian/compat b/kernel-power-settings/debian/compat index 733787e..7ed6ff8 100644 --- a/kernel-power-settings/debian/compat +++ b/kernel-power-settings/debian/compat @@ -1,2 +1 @@ -4 - +5 diff --git a/kernel-power-settings/debian/control b/kernel-power-settings/debian/control index 5ce0910..6f56c83 100644 --- a/kernel-power-settings/debian/control +++ b/kernel-power-settings/debian/control @@ -1,7 +1,7 @@ Source: kernel-power-settings Section: utils Priority: optional -Maintainer: Thomas Tanner +Maintainer: Pali Rohár XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=1528 Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.8.0 @@ -9,13 +9,11 @@ Standards-Version: 3.8.0 Package: kernel-power-settings Section: user/system Architecture: armel -Depends: kernel-power-flasher (>= 2.6.28-maemo25), sudo -XB-Maemo-Display-Name: Enhanced Linux kernel for power users (settings) -Description: Tools for the customization of kernel settings - of the enhanced Maemo 5 kernel 2.6.28.10. - . - Installing this package will automatically also install the - required power user kernel. By default, this package has no effect. +Depends: kernel-feature-overclock, sudo +XB-Maemo-Display-Name: Linux kernel for power user (settings and overclock) +Description: Tools for the customization and overclock Linux kernel + Installing this package will automatically also install Linux kernel + with overclock support (e.g Linux kernel for power user). . The command /usr/sbin/kernel-config can be used to load, save and show CPU frequency, voltage and DSP settings. @@ -24,7 +22,9 @@ Description: Tools for the customization of kernel settings . This package contains boot options to enable file system checks of /home before mounting or to start a SSH server with USB networking. + . Kernel modules specified in /etc/modules are loaded during boot. + . The boot scripts contain safety mechanisms to temporarily disable them after a crash for recovery. . diff --git a/kernel-power-settings/debian/install b/kernel-power-settings/debian/install new file mode 100644 index 0000000..d00e91a --- /dev/null +++ b/kernel-power-settings/debian/install @@ -0,0 +1,9 @@ +kernel-load /usr/sbin +kernel-config /usr/sbin +pre-mount /etc/kernel-power +kernel-modules /etc/event.d +kernel-power /etc/event.d +kernel-power-shutdown /etc/event.d +kernel-power.sudoers /etc/sudoers.d +kernel-power.conf /etc/osso-backup/applications +config/* /usr/share/kernel-power-settings diff --git a/kernel-power-settings/debian/kernel-power-settings.install b/kernel-power-settings/debian/kernel-power-settings.install deleted file mode 100644 index d00e91a..0000000 --- a/kernel-power-settings/debian/kernel-power-settings.install +++ /dev/null @@ -1,9 +0,0 @@ -kernel-load /usr/sbin -kernel-config /usr/sbin -pre-mount /etc/kernel-power -kernel-modules /etc/event.d -kernel-power /etc/event.d -kernel-power-shutdown /etc/event.d -kernel-power.sudoers /etc/sudoers.d -kernel-power.conf /etc/osso-backup/applications -config/* /usr/share/kernel-power-settings diff --git a/kernel-power-settings/debian/kernel-power-settings.postinst b/kernel-power-settings/debian/kernel-power-settings.postinst deleted file mode 100644 index d70e93c..0000000 --- a/kernel-power-settings/debian/kernel-power-settings.postinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# move old upstart scripts out of the way -cd /etc/event.d -test -f kernel && mv kernel /root/kernel.upstart.old -test -f kernel-maemo && mv kernel-maemo /root/kernel-maemo.upstart.old -cd /etc -test -f lastboot && rm lastboot -test -f lastreboot && rm lastreboot - -# install premount hook -if ! grep -q "# KERNEL-POWER-HOOK" /etc/default/mount-opts; then - echo "test -x /etc/kernel-power/pre-mount && /etc/kernel-power/pre-mount # KERNEL-POWER-HOOK" >> /etc/default/mount-opts -fi - -bootcfg=/etc/default/kernel-boot -test -f $bootcfg || cp /usr/share/kernel-power-settings/boot $bootcfg - -update-sudoers - -#DEBHELPER# - -exit 0 diff --git a/kernel-power-settings/debian/kernel-power-settings.postrm b/kernel-power-settings/debian/kernel-power-settings.postrm deleted file mode 100644 index f8e8555..0000000 --- a/kernel-power-settings/debian/kernel-power-settings.postrm +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -if grep -q "# KERNEL-POWER-HOOK" /etc/default/mount-opts; then - grep -v "# KERNEL-POWER-HOOK" /etc/default/mount-opts > /etc/default/mount-opts.tmp - mv /etc/default/mount-opts.tmp /etc/default/mount-opts -fi - -case "$1" in -purge) - rm -f /etc/default/kernel-power /etc/default/kernel-boot - rm -rf /etc/kernel-power - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/kernel-power-settings/debian/postinst b/kernel-power-settings/debian/postinst new file mode 100644 index 0000000..2d9e607 --- /dev/null +++ b/kernel-power-settings/debian/postinst @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e + +# move old upstart scripts out of the way +cd /etc/event.d +test -f kernel && mv kernel /root/kernel.upstart.old +test -f kernel-maemo && mv kernel-maemo /root/kernel-maemo.upstart.old +cd /etc +test -f lastboot && rm lastboot +test -f lastreboot && rm lastreboot + +# install premount hook +if ! grep -q "# KERNEL-POWER-HOOK" /etc/default/mount-opts; then + echo "sh /etc/kernel-power/pre-mount || true # KERNEL-POWER-HOOK" >> /etc/default/mount-opts +fi + +bootcfg=/etc/default/kernel-boot +test -f $bootcfg || cp /usr/share/kernel-power-settings/boot $bootcfg + +update-sudoers + +#DEBHELPER# + +exit 0 diff --git a/kernel-power-settings/debian/postrm b/kernel-power-settings/debian/postrm new file mode 100644 index 0000000..bab1bab --- /dev/null +++ b/kernel-power-settings/debian/postrm @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +if grep -q "# KERNEL-POWER-HOOK" /etc/default/mount-opts; then + grep -v "# KERNEL-POWER-HOOK" /etc/default/mount-opts > /etc/default/mount-opts.tmp + mv /etc/default/mount-opts.tmp /etc/default/mount-opts +fi + +case "$1" in +purge) + rm -f /etc/default/kernel-power /etc/default/kernel-boot + rm -rf /etc/kernel-power + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/kernel-power-settings/debian/rules b/kernel-power-settings/debian/rules index 67d586d..74b3262 100755 --- a/kernel-power-settings/debian/rules +++ b/kernel-power-settings/debian/rules @@ -1,6 +1,8 @@ #!/usr/bin/make -f clean: + dh_testdir + dh_testroot dh_clean binary: -- 1.7.9.5