NetworkManager

Merge lp://staging/~awe/network-manager/openvpn-ubuntu.0.7.1 into lp://staging/~network-manager/network-manager/openvpn-ubuntu.0.7.1

  1. openvpn-ubuntu.0.7.1
  2. Merge into openvpn-ubuntu.0.7.1
Proposed by Tony Espy
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~awe/network-manager/openvpn-ubuntu.0.7.1
Merge into: lp://staging/~network-manager/network-manager/openvpn-ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~awe/network-manager/openvpn-ubuntu.0.7.1
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+7774@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Tony Espy (awe) wrote :

Please merge the 0.7.1 final bits of network-manager-openvpn from my branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 2009-04-08 23:49:59 +0000
+++ .bzr-builddeb/default.conf 2009-06-22 18:10:09 +0000
@@ -1,3 +1,2 @@
1[BUILDDEB]1[BUILDDEB]
2export-upstream-revision = revid:svn-v3-trunk0:bcea4615-760a-421e-8543-3a9231f862fb:branches%2FNETWORKMANAGER_0_7:64
3merge = True2merge = True
43
=== modified file 'changelog'
--- changelog 2009-04-08 23:59:22 +0000
+++ changelog 2009-06-22 19:12:20 +0000
@@ -1,3 +1,9 @@
1network-manager-openvpn (0.7.1-0ubuntu1) karmic; urgency=low
2
3 * New upstream release 0.7.1 final
4
5 -- Tony Espy <espy@ubuntu.com> Thu, 18 Jun 2009 14:11:55 -0400
6
1network-manager-openvpn (0.7.1~rc4.1.20090323+bzr27-0ubuntu2) jaunty; urgency=low7network-manager-openvpn (0.7.1~rc4.1.20090323+bzr27-0ubuntu2) jaunty; urgency=low
28
3 * fix build failure by adding libglade2-dev to build-depends9 * fix build failure by adding libglade2-dev to build-depends
410
=== modified file 'control'
--- control 2009-04-08 23:59:22 +0000
+++ control 2009-06-22 19:12:20 +0000
@@ -5,9 +5,9 @@
5XSBC-Original-Maintainer: Soren Hansen <sh@linux2go.dk>5XSBC-Original-Maintainer: Soren Hansen <sh@linux2go.dk>
6Build-Depends: cdbs,6Build-Depends: cdbs,
7 debhelper (>= 5),7 debhelper (>= 5),
8 network-manager-dev (>= 0.7.1~),8 network-manager-dev (>= 0.7.1),
9 libnm-util-dev (>= 0.7.1~),9 libnm-util-dev (>= 0.7.1),
10 libnm-glib-dev (>= 0.7.1~),10 libnm-glib-dev (>= 0.7.1),
11 automake1.9,11 automake1.9,
12 gnome-common,12 gnome-common,
13 intltool,13 intltool,
@@ -17,6 +17,7 @@
17 quilt,17 quilt,
18 libglade2-dev18 libglade2-dev
19Standards-Version: 3.7.219Standards-Version: 3.7.2
20Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/openvpn-ubuntu.0.7.1
2021
21Package: network-manager-openvpn22Package: network-manager-openvpn
22Architecture: any23Architecture: any
2324
=== modified file 'rules'
--- rules 2009-02-15 02:49:33 +0000
+++ rules 2009-06-22 18:07:34 +0000
@@ -1,22 +1,35 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2 2
3include /usr/share/cdbs/1/class/makefile.mk3GIT_URL = git://git.gnome.org/network-manager-openvpn
4TAG_PREFIX := "NETWORKMANAGER_OPENVPN_"
5
6DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //')
7DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //')
8DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//')
9DEB_TAG_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\./_/g')
10
11include /usr/share/cdbs/1/class/autotools.mk
4include /usr/share/cdbs/1/rules/debhelper.mk12include /usr/share/cdbs/1/rules/debhelper.mk
5include /usr/share/cdbs/1/rules/patchsys-quilt.mk13include /usr/share/cdbs/1/rules/patchsys-quilt.mk
6include /usr/share/cdbs/1/class/autotools.mk14
715DEB_DESTDIR = $(CURDIR)/debian/tmp/
8#DEB_DH_MAKESHLIBS_ARGS_network-manager-openvpn := -n16
917get-orig-source::
10makebuilddir/network-manager-openvpn:: debian/stamp-bootstrap18 set -e; if echo $(DEB_VERSION) | grep -c "git"; \
1119 then \
12debian/stamp-bootstrap:20 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9]*\.\)*\(.*\)-.*$$/\2/g'`; \
13 NOCONFIGURE=1 ./autogen.sh21 else \
14 touch debian/stamp-bootstrap22 git_version=$(TAG_PREFIX)$(DEB_TAG_VERSION); \
1523 fi; \
16clean::24 tmpdir=`mktemp -d -t`; \
17 rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \25 cd $$tmpdir; \
18 config.h.in config.sub configure depcomp install-sh \26 echo "cloning upstream repository ..."; \
19 intltool-extract.in intltool-merge.in intltool-update.in \27 git clone $(GIT_URL); echo "getting specific upstream revision/tag: $$git_version"; \
20 ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \28 cd `ls | head -n 1`; git checkout -b orig $$git_version; \
21 properties/Makefile.in src/Makefile.in debian/stamp-bootstrap29 echo "autotools bootstrapping ..."; \
2230 sh ./autogen.sh; \
31 echo "cleaning up autotools caches (autom4te.cache) ..."; \
32 rm -rf autom4te.cache; \
33 echo "OK!"; \
34 cd ..; tar --exclude=.git -cvzf $(CURDIR)/$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz `ls | head -n 1`; \
35 cd $(CURDIR); rm -rf $$tmpdir

Subscribers

People subscribed via source and target branches