diff -Nru varnish-3.0.5/debian/changelog varnish-3.0.5/debian/changelog
--- varnish-3.0.5/debian/changelog	2013-12-02 15:06:51.000000000 +0100
+++ varnish-3.0.5/debian/changelog	2014-02-26 19:39:41.000000000 +0100
@@ -1,3 +1,17 @@
+varnish (3.0.5-1ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable (LP: #1285299).  Remaining changes:
+    - debian/patches/aarch64-support.patch: dropped, incorporeted in Debian
+      differently.
+    - debian/varnish.init:
+      + add confingtest action (LP: #1284095, thanks Samuele Giovanni Tonon
+        for the patch).
+      + Remove PID file on stop (LP: #1014793, thanks Jonathan Davies for the
+        patch).
+      + Use start-stop-deamon to get status.
+
+ -- Mattia Rizzolo <mapreri@ubuntu.com>  Mon, 24 Feb 2014 19:57:58 +0100
+
 varnish (3.0.5-1) unstable; urgency=low
 
   * Imported upstream version 3.0.5
@@ -15,6 +29,19 @@
 
  -- Stig Sandbeck Mathisen <ssm@debian.org>  Sun, 24 Nov 2013 18:55:59 +0100
 
+varnish (3.0.4-1ubuntu2) trusty; urgency=medium
+
+  * Build using dh-autoreconf.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 30 Dec 2013 12:18:38 +0100
+
+varnish (3.0.4-1ubuntu1) saucy; urgency=low
+
+  * debian/patches/aarch64-support.patch: Add jemalloc definitions for
+    aarch64.
+
+ -- William Grant <wgrant@ubuntu.com>  Thu, 17 Oct 2013 01:41:42 +1100
+
 varnish (3.0.4-1) unstable; urgency=low
 
   [ Stig Sandbeck Mathisen ]
@@ -499,3 +526,4 @@
   * Initial release (Closes: #382451)
 
  -- Lars Bahner <bahner@debian.org>  Fri,  6 Oct 2006 16:26:57 +0200
+
diff -Nru varnish-3.0.5/debian/control varnish-3.0.5/debian/control
--- varnish-3.0.5/debian/control	2013-12-02 15:06:51.000000000 +0100
+++ varnish-3.0.5/debian/control	2014-02-25 21:37:40.000000000 +0100
@@ -1,7 +1,8 @@
 Source: varnish
 Section: web
 Priority: optional
-Maintainer: Varnish Package Maintainers <pkg-varnish-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Varnish Package Maintainers <pkg-varnish-devel@lists.alioth.debian.org>
 Uploaders:
  Jan Wagner <waja@cyconet.org>,
  Lars Bahner <bahner@debian.org>,
diff -Nru varnish-3.0.5/debian/varnish.init varnish-3.0.5/debian/varnish.init
--- varnish-3.0.5/debian/varnish.init	2013-12-02 15:06:51.000000000 +0100
+++ varnish-3.0.5/debian/varnish.init	2014-02-25 21:25:53.000000000 +0100
@@ -73,6 +73,15 @@
     else
         log_end_msg 1
     fi
+
+    if test -r $PIDFILE; then
+        read -r PID < $PIDFILE
+        if test ! -d /proc/$PID ; then
+            # stale pidfile
+            unset PID
+            rm -f $PIDFILE
+        fi
+    fi
 }
 
 reload_varnishd() {
@@ -85,10 +94,17 @@
 }
 
 status_varnishd() {
-    status_of_proc -p "${PIDFILE}" "${DAEMON}" "${NAME}"
+    start-stop-daemon \
+        --status --quiet --pidfile $PIDFILE \
+        --exec $DAEMON
     exit $?
 }
 
+configtest() {
+    $DAEMON ${DAEMON_OPTS} -C -n /tmp > /dev/null && echo "Syntax ok"
+}
+
+
 case "$1" in
     start)
         case "${START:-}" in
@@ -113,8 +129,11 @@
         $0 stop
         $0 start
         ;;
+    configtest)
+        configtest
+        ;;
     *)
-        log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload}"
+        log_success_msg "Usage: $0 {start|stop|restart|reload|force-reload|configtest}"
         exit 1
         ;;
 esac