Merge lp:~smoser/ubuntu/natty/netbase/lp-681012-sync into lp:ubuntu/natty/netbase

[Scott Moser]

[lp:~smoser/ubuntu/natty/netbase/lp-681012-sync]

26. By Scott Moser on 2010-12-14

update changelog entry, copying the ubuntu changes list from 4.43ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-08 12:25:31 +0000
+++ debian/changelog	2010-12-14 16:17:32 +0000
@@ -1,3 +1,27 @@
+netbase (4.44ubuntu1) natty; urgency=low
+
+  [Kay Roepke]
+  * Merge from debian unstable (LP: #681012), remaining changes:
+    - debian/netbase.init:
+      + silence ifup/ifdown if VERBOSE == no
+      + silence debuging output if VERBOSE == no
+      + Temporarily increase usplash timeout to 120 seconds
+        to cope with slop DHCP server responses. LP: #21617
+      + Replace the "start" command with a call to upstart-job
+    - debian/control: Depend on upstart-job
+    - debian/netbase.postinst:
+      + Remove old start symlinks on upgrade
+      + Only install symlinks for runlevel 0 and 6
+
+ -- Scott Moser <[e-mail]>  Tue, 14 Dec 2010 10:03:27 -0500
+
+netbase (4.44) unstable; urgency=medium
+
+  * etc-services: added 5666 (nrpe/tcp), mysql-proxy (6446).
+    (Closes: #604830)
+
+ -- Marco d'Itri <[e-mail]>  Sun, 05 Dec 2010 19:59:54 +0100
+
 netbase (4.43ubuntu1) natty; urgency=low
 
   * Merge from debian unstable (LP: #671193), remaining changes:
 
=== modified file 'etc-services'
--- etc-services	2010-11-08 12:25:31 +0000
+++ etc-services	2010-12-14 16:17:32 +0000
@@ -401,6 +401,8 @@
 sge_qmaster	6444/udp			# Grid Engine Qmaster Service
 sge_execd	6445/tcp			# Grid Engine Execution Service
 sge_execd	6445/udp			# Grid Engine Execution Service
+mysql-proxy	6446/tcp			# MySQL Proxy
+mysql-proxy	6446/udp			# MySQL Proxy
 afs3-fileserver 7000/tcp	bbs		# file server itself
 afs3-fileserver 7000/udp	bbs
 afs3-callback	7001/tcp			# callbacks to cache managers
@@ -551,6 +553,7 @@
 hostmon		5355/tcp			# hostmon uses TCP (nocol)
 hostmon		5355/udp			# hostmon uses UDP (nocol)
 rplay		5555/udp			# RPlay audio service
+nrpe		5666/tcp			# Nagios Remote Plugin Executor
 nsca		5667/tcp			# Nagios Agent - NSCA
 mrtd		5674/tcp			# MRT Routing Daemon
 bgpsim		5675/tcp			# MRT Routing Simulator