Merge lp:~ubuntu-branches/ubuntu/oneiric/sysvinit/oneiric-201107132118 into lp:ubuntu/oneiric/sysvinit

Proposed by James Westby
Status: Merged
Merged at revision: 155
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/sysvinit/oneiric-201107132118
Merge into: lp:ubuntu/oneiric/sysvinit
Diff against target: 49 lines (+40/-0) (has conflicts)
1 file modified
debian/src/initscripts/etc/init.d/ondemand (+40/-0)
Conflict adding file debian/src/initscripts/etc/init.d/ondemand.  Moved existing file to debian/src/initscripts/etc/init.d/ondemand.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/sysvinit/oneiric-201107132118
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+67902@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/sysvinit reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/sysvinit/oneiric-201107132118. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file 'debian/src/initscripts/etc/init.d/ondemand'
3--- debian/src/initscripts/etc/init.d/ondemand 1970-01-01 00:00:00 +0000
4+++ debian/src/initscripts/etc/init.d/ondemand 2011-07-13 21:22:48 +0000
5@@ -0,0 +1,40 @@
6+#! /bin/sh
7+### BEGIN INIT INFO
8+# Provides: ondemand
9+# Required-Start: $remote_fs $all
10+# Required-Stop:
11+# Default-Start: 2 3 4 5
12+# Default-Stop:
13+# Short-Description: Set the CPU Frequency Scaling governor to "ondemand"
14+### END INIT INFO
15+
16+
17+PATH=/sbin:/usr/sbin:/bin:/usr/bin
18+
19+. /lib/init/vars.sh
20+. /lib/lsb/init-functions
21+
22+case "$1" in
23+ start)
24+ start-stop-daemon --start --background --exec /etc/init.d/ondemand -- background
25+ ;;
26+ background)
27+ sleep 60 # probably enough time for desktop login
28+
29+ for CPUFREQ in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
30+ do
31+ [ -f $CPUFREQ ] || continue
32+ echo -n ondemand > $CPUFREQ
33+ done
34+ ;;
35+ restart|reload|force-reload)
36+ echo "Error: argument '$1' not supported" >&2
37+ exit 3
38+ ;;
39+ stop)
40+ ;;
41+ *)
42+ echo "Usage: $0 start|stop" >&2
43+ exit 3
44+ ;;
45+esac
46
47=== renamed file 'debian/src/initscripts/etc/init.d/ondemand' => 'debian/src/initscripts/etc/init.d/ondemand.moved'
48=== added directory 'debian/src/initscripts/etc/network'
49=== added directory 'debian/src/initscripts/etc/network/if-up.d'

Subscribers

People subscribed via source and target branches

to all changes: