diff -u network-manager-openvpn-0.7~~svn20080928t225540/debian/patches/series network-manager-openvpn-0.7~~svn20080928t225540/debian/patches/series
--- network-manager-openvpn-0.7~~svn20080928t225540/debian/patches/series
+++ network-manager-openvpn-0.7~~svn20080928t225540/debian/patches/series
@@ -6,0 +7,2 @@
+07_fileselectors_order.diff
+08_passwords_unswap.diff
diff -u network-manager-openvpn-0.7~~svn20080928t225540/debian/changelog network-manager-openvpn-0.7~~svn20080928t225540/debian/changelog
--- network-manager-openvpn-0.7~~svn20080928t225540/debian/changelog
+++ network-manager-openvpn-0.7~~svn20080928t225540/debian/changelog
@@ -1,3 +1,12 @@
+network-manager-openvpn (0.7~~svn20080928t225540-0ubuntu2) intrepid; urgency=low
+
+  * debian/patches/07_fileselectors_order.diff: Fix ordering of certificate
+    file selectors in the "Passwords with certificates" case (LP: #275608)
+  * debian/patches/08_passwords_unswap.diff: Fix passwords swapping when
+    reloading a "Passwords with certificates" configuration (same bug number)
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Thu, 09 Oct 2008 15:03:25 +0200
+
 network-manager-openvpn (0.7~~svn20080928t225540-0ubuntu1) intrepid; urgency=low
 
   * New upstream snapshot
only in patch2:
unchanged:
--- network-manager-openvpn-0.7~~svn20080928t225540.orig/debian/patches/07_fileselectors_order.diff
+++ network-manager-openvpn-0.7~~svn20080928t225540/debian/patches/07_fileselectors_order.diff
@@ -0,0 +1,22 @@
+Index: network-manager-openvpn-0.7~~svn20080928t225540/properties/nm-openvpn-dialog.glade
+===================================================================
+--- network-manager-openvpn-0.7~~svn20080928t225540.orig/properties/nm-openvpn-dialog.glade	2008-10-06 11:30:15.000000000 +0200
++++ network-manager-openvpn-0.7~~svn20080928t225540/properties/nm-openvpn-dialog.glade	2008-10-06 11:31:09.000000000 +0200
+@@ -912,7 +912,7 @@
+ 			      <property name="right_padding">0</property>
+ 
+ 			      <child>
+-				<widget class="GtkFileChooserButton" id="pw_tls_ca_cert_chooser">
++				<widget class="GtkFileChooserButton" id="pw_tls_user_cert_chooser">
+ 				  <property name="visible">True</property>
+ 				  <property name="title" translatable="yes">Select A File</property>
+ 				  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+@@ -945,7 +945,7 @@
+ 			      <property name="right_padding">0</property>
+ 
+ 			      <child>
+-				<widget class="GtkFileChooserButton" id="pw_tls_user_cert_chooser">
++				<widget class="GtkFileChooserButton" id="pw_tls_ca_cert_chooser">
+ 				  <property name="visible">True</property>
+ 				  <property name="title" translatable="yes">Select A File</property>
+ 				  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
only in patch2:
unchanged:
--- network-manager-openvpn-0.7~~svn20080928t225540.orig/debian/patches/08_passwords_unswap.diff
+++ network-manager-openvpn-0.7~~svn20080928t225540/debian/patches/08_passwords_unswap.diff
@@ -0,0 +1,16 @@
+Index: network-manager-openvpn-0.7~~svn20080928t225540/properties/auth-helpers.c
+===================================================================
+--- network-manager-openvpn-0.7~~svn20080928t225540.orig/properties/auth-helpers.c	2008-10-09 14:59:15.000000000 +0200
++++ network-manager-openvpn-0.7~~svn20080928t225540/properties/auth-helpers.c	2008-10-09 15:00:45.000000000 +0200
+@@ -115,9 +115,9 @@
+ 	else if (!strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) {
+ 		GtkWidget *w2 = NULL;
+ 
+-		w = fill_password (xml, "pw_tls_password_entry", connection, TRUE);
++		w = fill_password (xml, "pw_tls_password_entry", connection, FALSE);
+ 	
+-		w2 = fill_password (xml, "pw_tls_cert_password_entry", connection, FALSE);
++		w2 = fill_password (xml, "pw_tls_cert_password_entry", connection, TRUE);
+ 		if (w2) {
+ 			gtk_size_group_add_widget (group, w2);
+ 			g_signal_connect (w2, "changed", G_CALLBACK (changed_cb), user_data);