--- ppm-0.0.2.orig/debian/dirs +++ ppm-0.0.2/debian/dirs @@ -0,0 +1 @@ +etc/dbus-1/event.d --- ppm-0.0.2.orig/debian/compat +++ ppm-0.0.2/debian/compat @@ -0,0 +1 @@ +5 --- ppm-0.0.2.orig/debian/ppmd.event +++ ppm-0.0.2/debian/ppmd.event @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +. /lib/lsb/init-functions + +DAEMON=/usr/sbin/ppmd +DESC="Power Policy Manager" + +test -x $DAEMON || exit 0 + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "ppmd" + start-stop-daemon --start --quiet --pidfile /var/run/ppmd.pid --exec $DAEMON + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" "ppmd" + start-stop-daemon --stop --quiet --pidfile /var/run/ppmd.pid --oknodo --exec $DAEMON + log_end_msg $? + ;; + restart|reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/dbus-1/event.d/30ppmd {start|stop|restart|reload}" >&2 + exit 1 + ;; +esac + --- ppm-0.0.2.orig/debian/copyright +++ ppm-0.0.2/debian/copyright @@ -0,0 +1,41 @@ +PPM was downloaded from http://www.lesswatts.org/projects/power-policy + +Authors: Tariq Shureih + Arjan van de Ven + Mohamed Abbas + Sarah Sharp + +Copyright (from ppm and other files): + + * Copyright 2007 Intel Corporation + * + * 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 THE + * AUTHORS OR COPYRIGHT HOLDERS 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. + * + * Alternatively, the contents of this file may be used under the terms of the + * GNU General Public License version 2 (the "GPL"), in which case the + * provisions of the GPL are applicable instead of the above. If you wish to + * allow the use of your version of this file only under the terms of the GPL + * and not to allow others to use your version of this file under the MIT + * license, indicate your decision by deleting the provisions above and replace + * them with the notice and other provisions required by the GPL. If you do + * not delete the provisions above, a recipient may use your version of this + * file under either the GPL or the MIT license. + +On Ubuntu and Debian systems, the complete text of the GNU General Public +License version 2 can be found in `/usr/share/common-licenses/GPL-2'. --- ppm-0.0.2.orig/debian/postinst +++ ppm-0.0.2/debian/postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +/etc/dbus-1/event.d/30ppmd start + +#DEBHELPER# --- ppm-0.0.2.orig/debian/control +++ ppm-0.0.2/debian/control @@ -0,0 +1,16 @@ +Source: ppm +Section: admin +Priority: optional +Maintainer: Ubuntu Mobile Developers +XSBC-Original-Maintainer: Mohamed Abbas +Build-Depends: debhelper (>= 5), libdbus-1-dev, libdbus-glib-1-dev, libhal-dev, x11proto-core-dev, libx11-dev, x11proto-xext-dev, dpatch, libxext-dev +Standards-Version: 3.7.2 + +Package: ppm +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Power Policy Manager + Power Policy Manager is a layered, system-wide power policy framework. PPM + is a flexible power policy manager that allows users to select multiple + policies, and easily modify those policies to fit their system. + --- ppm-0.0.2.orig/debian/preinst +++ ppm-0.0.2/debian/preinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ -x /etc/dbus-1/event.d/30ppmd ]; then + /etc/dbus-1/event.d/30ppmd stop || true +fi + +#DEBHELPER# + --- ppm-0.0.2.orig/debian/changelog +++ ppm-0.0.2/debian/changelog @@ -0,0 +1,36 @@ +ppm (0.0.2-0ubuntu4) oneiric; urgency=low + + * Add libxext-dev to build dependencies. Fixes FTBFS. + (LP: #756193) + * Add incorrect_includes_fix.dpatch: Remove incorrect/ + unused header (dpmsstr.h). Fixes FTBFS. + + -- Daniel T Chen Mon, 12 Sep 2011 16:19:56 -0400 + +ppm (0.0.2-0ubuntu3) jaunty-proposed; urgency=low + + * debian/preinst: + - test for the existance of /etc/dbus-1/event.d/30ppmd before + calling it (LP: #365995) - this makes the package actually + installable + * debian/patches/makefix_fix.dpatch: + - fix makesfiles so that it builds + + -- Michael Vogt Fri, 24 Apr 2009 13:30:28 +0200 + +ppm (0.0.2-0ubuntu2) hardy; urgency=low + + * Add missing dh_strip call. + + -- Steve Kowalik Sat, 12 Jan 2008 01:02:07 +1100 + +ppm (0.0.2-0ubuntu1) hardy; urgency=low + + * Generate an orig tarball. + * Clean up the packaging, based off of Rusty Lynch's work. + * Add dpatch to taste, and add a patch that changes the prefix to /usr. + * Add a patch that fixes the Exec line in the dbus service file. + + -- Steve Kowalik Thu, 10 Jan 2008 14:52:08 +1100 + + --- ppm-0.0.2.orig/debian/rules +++ ppm-0.0.2/debian/rules @@ -0,0 +1,52 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/dpatch/dpatch.make + +build: patch build-stamp + +build-stamp: + dh_testdir + + $(MAKE) + + touch $@ + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/ppm install + install -m755 debian/ppmd.event $(CURDIR)/debian/ppm/etc/dbus-1/event.d/30ppmd + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_shlibdeps + dh_strip + dh_gencontrol + dh_fixperms + dh_compress + dh_installdeb + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- ppm-0.0.2.orig/debian/patches/incorrect_includes_fix.dpatch +++ ppm-0.0.2/debian/patches/incorrect_includes_fix.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## incorrect_includes_fix.dpatch by Daniel T Chen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't use dpmsstr.h; it wasn't intended for public +## DP: consumption. Fixes FTBFS in newer X.Org versions. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ppm-0.0.2~/plugins/display.c ppm-0.0.2/plugins/display.c +--- ppm-0.0.2~/plugins/display.c 2007-09-20 17:40:07.000000000 -0400 ++++ ppm-0.0.2/plugins/display.c 2011-09-12 16:28:00.000000000 -0400 +@@ -51,7 +51,6 @@ + #include + #include + #include +-#include + + #include "linuxppm.h" + --- ppm-0.0.2.orig/debian/patches/makefix_fix.dpatch +++ ppm-0.0.2/debian/patches/makefix_fix.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## makefix_fix.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad ppm-0.0.2~/daemon/Makefile ppm-0.0.2/daemon/Makefile +--- ppm-0.0.2~/daemon/Makefile 2009-04-24 13:52:02.000000000 +0200 ++++ ppm-0.0.2/daemon/Makefile 2009-04-24 13:52:49.000000000 +0200 +@@ -1,8 +1,8 @@ + include ../Makefile.include + + VERSION = 0.1 +-CFLAGS ?= -MD -O2 -D_FORTIFY_SOURCE=2 $(shell pkg-config --cflags glib-2.0 dbus-1 dbus-glib-1 hal) -I. -I../include -Wall -DVERSION +-LDFLAGS ?= -export-dynamic -ldl -lpthread $(shell pkg-config --libs glib-2.0 dbus-1 dbus-glib-1 hal) ++CFLAGS += -MD -O2 -D_FORTIFY_SOURCE=2 $(shell pkg-config --cflags glib-2.0 dbus-1 dbus-glib-1 hal) -I. -I../include -Wall -DVERSION ++LDFLAGS += -export-dynamic -ldl -lpthread $(shell pkg-config --libs glib-2.0 dbus-1 dbus-glib-1 hal) + LIBS = hal.o dbus-bind.o plugins.o policy.o ppmd.o + TEST_LIBS = plugins.o policy.o ppmtest.o + +diff -urNad ppm-0.0.2~/ppmtool/Makefile ppm-0.0.2/ppmtool/Makefile +--- ppm-0.0.2~/ppmtool/Makefile 2007-09-20 23:40:07.000000000 +0200 ++++ ppm-0.0.2/ppmtool/Makefile 2009-04-24 13:53:01.000000000 +0200 +@@ -1,7 +1,7 @@ + include ../Makefile.include + +-CFLAGS ?= -MD -O2 -g -D_FORTIFY_SOURCE=2 -DVERSION=0.1 `pkg-config --cflags glib-2.0 dbus-glib-1` -Wall -I../include +-LDFLAGS ?= -export-dynamic -ldl $(shell pkg-config --libs glib-2.0) ++CFLAGS += -MD -O2 -g -D_FORTIFY_SOURCE=2 -DVERSION=0.1 `pkg-config --cflags glib-2.0 dbus-glib-1` -Wall -I../include ++LDFLAGS += -export-dynamic -ldl $(shell pkg-config --libs glib-2.0) + LIBS = dbus-bind.o ppmtool.o + + all: ppmtool --- ppm-0.0.2.orig/debian/patches/prefix_fix.dpatch +++ ppm-0.0.2/debian/patches/prefix_fix.dpatch @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## prefix_fix.dpatch by Steve Kowalik +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change the prefix from /usr/local to /usr. + +@DPATCH@ +diff -urNad ppm-0.0.2~/Makefile.include ppm-0.0.2/Makefile.include +--- ppm-0.0.2~/Makefile.include 2007-09-21 07:40:07.000000000 +1000 ++++ ppm-0.0.2/Makefile.include 2008-01-10 12:50:19.000000000 +1100 +@@ -1,4 +1,4 @@ +-prefix = /usr/local ++prefix = /usr + exec_prefix = $(prefix) + bindir = $(exec_prefix)/bin + sbindir = $(exec_prefix)/sbin --- ppm-0.0.2.orig/debian/patches/dbus_service_file.dpatch +++ ppm-0.0.2/debian/patches/dbus_service_file.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## dbus_service_file.dpatch by Steve Kowalik +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Install the dbus service to the right name, and don't include $(DESTDIR) +## DP: in the Exec line. + +@DPATCH@ +diff -urNad ppm-0.0.2~/conf/Makefile ppm-0.0.2/conf/Makefile +--- ppm-0.0.2~/conf/Makefile 2007-09-21 07:40:07.000000000 +1000 ++++ ppm-0.0.2/conf/Makefile 2008-01-10 13:16:33.000000000 +1100 +@@ -5,10 +5,10 @@ + ppmd.service: Makefile ../Makefile.include + echo '[D-BUS Service]' > ppmd.service + echo 'Name=com.intel.ppmd' >> ppmd.service +- echo 'Exec=$(DESTDIR)$(sbindir)/ppmd' >> ppmd.service ++ echo 'Exec=$(sbindir)/ppmd' >> ppmd.service + + install: ppmd.service +- install -m644 -D ppmd.service $(DESTDIR)$(dbusdatadir)/services/ppmd.service ++ install -m644 -D ppmd.service $(DESTDIR)$(dbusdatadir)/services/com.intel.ppmd.service + install -m644 -D ppmd.conf $(DESTDIR)$(dbusconfdir)/system.d/ppmd.conf + + uninstall: --- ppm-0.0.2.orig/debian/patches/00list +++ ppm-0.0.2/debian/patches/00list @@ -0,0 +1,4 @@ +prefix_fix +dbus_service_file +makefix_fix.dpatch +incorrect_includes_fix.dpatch