~ubuntu-branches/ubuntu/maverick/gnome-power-manager/maverick-proposed

« back to all changes in this revision

Viewing changes to compile

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-01 16:59:38 UTC
  • mfrom: (2.1.50 upstream)
  • Revision ID: james.westby@ubuntu.com-20100301165938-qjgkk86bgdr58fbn
Tags: 2.29.91-0ubuntu1
* New upstream version
  - DeviceKit-disks is now called UDisks
  - Ensure we clear all notification bubbles on resume
  - Set the timeout for critical battery notification to never
  - Increase the critical action timeout to 20 seconds
  - When we're critically low, don't give a time as it's often imprecise
* Dropped 11-add-error-logging.patch - merged upstream
* Refreshed patches:
  - 13-dont-query-notify-caps.patch
  - 90-autotools.patch
* debian/patches/12-add-appindicators.patch:
  - Update labels and remove images from the menu (LP: #528522).
    Thanks to Jan Arne Petersen
  - Refreshed to apply cleanly again
* debian/patches/14-critical-message-timeout.patch:
  - Revert upstream change to set the critical warning to never expire.
    This causes a fallback alert to appear with notify-osd
* debian/patches/15-declare-gerror.patch:
  - Add a missing declaration to fix FTBFS

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#! /bin/sh
2
2
# Wrapper for compilers which do not understand `-c -o'.
3
3
 
4
 
scriptversion=2009-04-28.21; # UTC
 
4
scriptversion=2009-10-06.20; # UTC
5
5
 
6
6
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
7
7
# Foundation, Inc.
124
124
ret=$?
125
125
 
126
126
if test -f "$cofile"; then
127
 
  mv "$cofile" "$ofile"
 
127
  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
128
128
elif test -f "${cofile}bj"; then
129
 
  mv "${cofile}bj" "$ofile"
 
129
  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
130
130
fi
131
131
 
132
132
rmdir "$lockdir"