diff -Nru vpnc-0.4.0/debian/changelog vpnc-0.4.0/debian/changelog
--- vpnc-0.4.0/debian/changelog	2007-03-14 13:52:23.000000000 +0100
+++ vpnc-0.4.0/debian/changelog	2007-03-14 13:52:23.000000000 +0100
@@ -1,3 +1,12 @@
+vpnc (0.4.0-2ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - gcc optimizations
+    - auth failed return code
+    - Update maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Mon, 05 Mar 2007 12:46:15 +0000
+
 vpnc (0.4.0-2) unstable; urgency=medium
 
   * proper increment variable picking when emulating Target networks
@@ -24,6 +33,26 @@
 
  -- Eduard Bloch <blade@debian.org>  Mon, 19 Feb 2007 22:33:12 +0100
 
+vpnc (0.3.3+SVN20051028-3ubuntu3) feisty; urgency=low
+
+  * Exit with return code 2 when authentication fails. (Closes: LP#89735)
+  * Update maintainer field in debian/control
+
+ -- Soren Hansen <sh@linux2go.dk>  Sun, 4 Mar 2007 23:06:46 +0100
+
+vpnc (0.3.3+SVN20051028-3ubuntu2) edgy; urgency=low
+
+  * Now build with -O0, as any GCC 4.1 optimizations cause it to break (closes
+    Malone #53341).
+
+ -- William Alexander Grant <william.grant@ubuntu.com.au>  Thu, 20 Jul 2006 11:00:23 +1000
+
+vpnc (0.3.3+SVN20051028-3ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- William Alexander Grant <william.grant@ubuntu.com.au>  Sun, 16 Jul 2006 14:34:02 +1000
+
 vpnc (0.3.3+SVN20051028-3) unstable; urgency=low
 
   * 08_keepalive_and_rekeying.dpatch: patch for basic rekeying and keepalive
@@ -36,6 +65,13 @@
 
  -- Eduard Bloch <blade@debian.org>  Fri, 14 Apr 2006 23:30:36 +0200
 
+vpnc (0.3.3+SVN20051028-2ubuntu1) dapper; urgency=low
+
+  * 09_ubuntu_var_run.dpatch:
+    + recreate /var/run/vpnc if missing
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Sun, 26 Feb 2006 12:07:52 +0100
+
 vpnc (0.3.3+SVN20051028-2) unstable; urgency=low
 
   * TARGET_NETWORKS code was accidentaly removed in 04_debianitis.dpatch, now
diff -Nru vpnc-0.4.0/debian/control vpnc-0.4.0/debian/control
--- vpnc-0.4.0/debian/control	2007-03-14 13:52:23.000000000 +0100
+++ vpnc-0.4.0/debian/control	2007-03-14 13:52:23.000000000 +0100
@@ -1,7 +1,8 @@
 Source: vpnc
 Section: net
 Priority: extra
-Maintainer: Eduard Bloch <blade@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Eduard Bloch <blade@debian.org>
 Build-Depends: debhelper (>= 4.0.0), libgcrypt11-dev, dpatch
 Standards-Version: 3.6.2.1
 
diff -Nru vpnc-0.4.0/debian/patches/00list vpnc-0.4.0/debian/patches/00list
--- vpnc-0.4.0/debian/patches/00list	2007-03-14 13:52:23.000000000 +0100
+++ vpnc-0.4.0/debian/patches/00list	2007-03-14 13:52:23.000000000 +0100
@@ -2,3 +2,5 @@
 04_debianitis
 05_vpnc.conf
 06_stolen_from_head
+07_gcc_optimizations.dpatch
+08_auth_failed_return_code.dpatch
diff -Nru vpnc-0.4.0/debian/patches/07_gcc_optimizations.dpatch vpnc-0.4.0/debian/patches/07_gcc_optimizations.dpatch
--- vpnc-0.4.0/debian/patches/07_gcc_optimizations.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ vpnc-0.4.0/debian/patches/07_gcc_optimizations.dpatch	2007-03-14 13:52:23.000000000 +0100
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_gcc_optimizations.dpatch by William Grant <william.grant@ubuntu.com.au>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad vpnc-0.4.0~/Makefile vpnc-0.4.0/Makefile
+--- vpnc-0.4.0~/Makefile	2007-02-19 21:51:12.000000000 +0100
++++ vpnc-0.4.0/Makefile	2007-03-14 13:48:16.000000000 +0100
+@@ -35,7 +35,7 @@
+ RELEASE_VERSION := $(shell cat VERSION)
+ 
+ CC=gcc
+-CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
++CFLAGS += -W -Wall -O0 -Wmissing-declarations -Wwrite-strings -g
+ CPPFLAGS = -DVERSION=\"$(VERSION)\"
+ LDFLAGS = -g $(shell libgcrypt-config --libs)
+ CFLAGS +=  $(shell libgcrypt-config --cflags)
diff -Nru vpnc-0.4.0/debian/patches/08_auth_failed_return_code.dpatch vpnc-0.4.0/debian/patches/08_auth_failed_return_code.dpatch
--- vpnc-0.4.0/debian/patches/08_auth_failed_return_code.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ vpnc-0.4.0/debian/patches/08_auth_failed_return_code.dpatch	2007-03-14 13:52:23.000000000 +0100
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_auth_failed_return_code.dpatch by Soren Hansen <sh@linux2go.dk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad vpnc-0.4.0~/vpnc.c vpnc-0.4.0/vpnc.c
+--- vpnc-0.4.0~/vpnc.c	2007-03-14 13:48:59.000000000 +0100
++++ vpnc-0.4.0/vpnc.c	2007-03-14 13:49:28.000000000 +0100
+@@ -1370,7 +1370,7 @@
+ 			expected_hash = gcry_md_read(hm, 0);
+ 
+ 			if (memcmp(expected_hash, hash->u.hash.data, s->ike.md_len) != 0) {
+-				error(1, 0, "hash comparison failed: %s(%d)\ncheck group password!",
++				error(2, 0, "hash comparison failed: %s(%d)\ncheck group password!",
+ 					val_to_string(ISAKMP_N_AUTHENTICATION_FAILED, isakmp_notify_enum_array),
+ 					ISAKMP_N_AUTHENTICATION_FAILED);
+ 			}