Merge branch 'v1.2' of github.com:mongodb/mongo into v1.2

Author: erh

debian/mongodb.upstart

@@ -5,6 +5,8 @@ pre-start script
     mkdir -p /var/log/mongodb/
 end script
 
-start on runlevel [345]
+start on runlevel [2345]
+stop on runlevel [06]
+
+exec start-stop-daemon --start --quiet --chuid mongodb --exec  /usr/bin/mongod -- --config /etc/mongodb.conf
 
-exec  su -c "/usr/bin/mongod --config /etc/mongodb.conf" -s "/bin/sh" mongodb

debian/postinst

@@ -29,11 +29,11 @@ case "$1" in
 
 	# create db -- note: this should agree with dbpath in mongodb.conf
 	mkdir -p /var/lib/mongodb
-	chown mongodb:mongodb /var/lib/mongodb
+	chown -R mongodb:mongodb /var/lib/mongodb
 
 	# create logdir -- note: this should agree with logpath in mongodb.conf
 	mkdir -p /var/log/mongodb
-	chown mongodb:mongodb /var/log/mongodb
+	chown -R mongodb:mongodb /var/log/mongodb
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

debian/rules

@@ -35,7 +35,10 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	scons -c
+	# FIXME: scons freaks out at the presence of target files
+	# under debian/mongodb.
+	#scons -c
+	rm -rf $(CURDIR)/debian/mongodb
 	rm -f config.log
 	rm -f mongo
 	rm -f mongod