diff -Nru /tmp/kEMaaOenk0/rpld-1.8beta1/debian/changelog /tmp/npXj8OSrR9/rpld-1.8beta1/debian/changelog
--- /tmp/kEMaaOenk0/rpld-1.8beta1/debian/changelog	2007-07-03 17:54:17.000000000 -0300
+++ /tmp/npXj8OSrR9/rpld-1.8beta1/debian/changelog	2007-07-03 17:54:17.000000000 -0300
@@ -1,3 +1,11 @@
+rpld (1.8beta1-8ubuntu0.1) feisty-proposed; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Fix init script to properly stop (LP: #1077).
+    - Change Maintainer/XSBC-Original-Maintainer field.
+
+ -- William Lima <wlima.amadeus@gmail.com>  Tue,  3 Jul 2007 17:28:39 -0300
+
 rpld (1.8beta1-8) unstable; urgency=low
 
   * Use local cdbs snippet for invoking dh-buildinfo.
diff -Nru /tmp/kEMaaOenk0/rpld-1.8beta1/debian/control /tmp/npXj8OSrR9/rpld-1.8beta1/debian/control
--- /tmp/kEMaaOenk0/rpld-1.8beta1/debian/control	2007-07-03 17:54:17.000000000 -0300
+++ /tmp/npXj8OSrR9/rpld-1.8beta1/debian/control	2007-07-03 17:54:17.000000000 -0300
@@ -1,7 +1,8 @@
 Source: rpld
 Section: net
 Priority: optional
-Maintainer: Jonas Smedegaard <dr@jones.dk>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jonas Smedegaard <dr@jones.dk>
 Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), patchutils (>= 0.2.25), dh-buildinfo, flex, byacc
 Standards-Version: 3.6.2
 
diff -Nru /tmp/kEMaaOenk0/rpld-1.8beta1/debian/init.d /tmp/npXj8OSrR9/rpld-1.8beta1/debian/init.d
--- /tmp/kEMaaOenk0/rpld-1.8beta1/debian/init.d	2007-07-03 17:54:17.000000000 -0300
+++ /tmp/npXj8OSrR9/rpld-1.8beta1/debian/init.d	2007-07-03 17:54:17.000000000 -0300
@@ -29,14 +29,12 @@
 case "$1" in
   start)
 	echo -n "Starting $DESC: $NAME"
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
+	start-stop-daemon --start --quiet --exec $DAEMON
 	echo "."
 	;;
   stop)
 	echo -n "Stopping $DESC: $NAME"
-	start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
+	start-stop-daemon --oknodo --stop --quiet --exec $DAEMON
 	echo "."
 	;;
   #reload)
@@ -48,8 +46,7 @@
 	#	directly anyway, make this a do-nothing entry.
 	#
 	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
+	# start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
   #;;
   restart|force-reload)
 	#
@@ -58,11 +55,9 @@
 	#	just the same as "restart".
 	#
 	echo -n "Restarting $DESC: $NAME"
-	start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
+	start-stop-daemon --oknodo --stop --quiet --exec $DAEMON
 	sleep 1
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
+	start-stop-daemon --start --quiet --exec $DAEMON
 	echo "."
 	;;
   *)