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 @@
+07_fileselectors_order.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,10 @@
+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)
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Mon, 06 Oct 2008 11:38:50 +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>