Merge lp:~cyphermox/network-manager/openvpn.lucid into lp:~network-manager/network-manager/openvpn-ubuntu.head

[Mathieu Trudel-Lapierre]

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-14 21:58:16 +0000
+++ debian/changelog	2009-12-22 19:30:26 +0000
@@ -1,3 +1,16 @@
+network-manager-openvpn (0.8~rc1-0ubuntu1) lucid; urgency=low
+
+  * upstream release tagged 0.7.997 (NM 0.8~rc1)
+    + 0.7.997
+    - export: implement export and fix a few import/export bugs (LP: #264144)
+    - tls: handle PEM files without an ending newline (rh #507315)
+    - export: implement export for static-key configurations (bgo #573986)
+  * Add logic to map ~rc1 to 0.7.997 tag, as per the main NM branch.
+  * Bump build-deps to require NM 0.8~rc1.
+  * Update Standards-Version to 3.8.3.
+
+ -- Mathieu Trudel <[e-mail]>  Tue, 22 Dec 2009 13:55:04 -0500
+
 network-manager-openvpn (0.8~a~git.20091008t123607.7c184a9-0ubuntu1) karmic; urgency=low
 
   * new upstream snapshot 2009-10-08 12:36:07 (GMT)

=== modified file 'debian/control'
--- debian/control	2009-10-01 11:18:43 +0000
+++ debian/control	2009-12-22 19:30:26 +0000
@@ -5,9 +5,9 @@
 XSBC-Original-Maintainer: Soren Hansen <[e-mail]>
 Build-Depends: cdbs,
 	debhelper (>= 5),
-	network-manager-dev (>= 0.8~a~git.20090930t162132),
-	libnm-util-dev (>= 0.8~a~git.20090930t162132),
-	libnm-glib-dev (>= 0.8~a~git.20090930t162132),
+	network-manager-dev (>= 0.8~rc1),
+	libnm-util-dev (>= 0.8~rc1),
+	libnm-glib-dev (>= 0.8~rc1),
 	automake1.9,
 	gnome-common,
 	intltool,
@@ -16,7 +16,7 @@
 	patchutils,
 	quilt,
 	libglade2-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/openvpn-ubuntu.head
 
 Package: network-manager-openvpn

=== modified file 'debian/rules'
--- debian/rules	2009-09-07 15:32:51 +0000
+++ debian/rules	2009-12-22 19:30:26 +0000
@@ -58,6 +58,9 @@
 	set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \
 	then \
 		git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \
+	elif echo $(DEB_VERSION) | grep -q -c "rc1"; \
+	then \
+		git_version="0.7.997"; \
 	else \
 		git_version=$(DEB_UPSTREAM_VERSION); \
 	fi; \