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
1=== modified file '.bzr-builddeb/default.conf'
2--- .bzr-builddeb/default.conf 2009-04-08 23:49:59 +0000
3+++ .bzr-builddeb/default.conf 2009-06-22 18:10:09 +0000
4@@ -1,3 +1,2 @@
5 [BUILDDEB]
6-export-upstream-revision = revid:svn-v3-trunk0:bcea4615-760a-421e-8543-3a9231f862fb:branches%2FNETWORKMANAGER_0_7:64
7 merge = True
8
9=== modified file 'changelog'
10--- changelog 2009-04-08 23:59:22 +0000
11+++ changelog 2009-06-22 19:12:20 +0000
12@@ -1,3 +1,9 @@
13+network-manager-openvpn (0.7.1-0ubuntu1) karmic; urgency=low
14+
15+ * New upstream release 0.7.1 final
16+
17+ -- Tony Espy <espy@ubuntu.com> Thu, 18 Jun 2009 14:11:55 -0400
18+
19 network-manager-openvpn (0.7.1~rc4.1.20090323+bzr27-0ubuntu2) jaunty; urgency=low
20
21 * fix build failure by adding libglade2-dev to build-depends
22
23=== modified file 'control'
24--- control 2009-04-08 23:59:22 +0000
25+++ control 2009-06-22 19:12:20 +0000
26@@ -5,9 +5,9 @@
27 XSBC-Original-Maintainer: Soren Hansen <sh@linux2go.dk>
28 Build-Depends: cdbs,
29 debhelper (>= 5),
30- network-manager-dev (>= 0.7.1~),
31- libnm-util-dev (>= 0.7.1~),
32- libnm-glib-dev (>= 0.7.1~),
33+ network-manager-dev (>= 0.7.1),
34+ libnm-util-dev (>= 0.7.1),
35+ libnm-glib-dev (>= 0.7.1),
36 automake1.9,
37 gnome-common,
38 intltool,
39@@ -17,6 +17,7 @@
40 quilt,
41 libglade2-dev
42 Standards-Version: 3.7.2
43+Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/openvpn-ubuntu.0.7.1
44
45 Package: network-manager-openvpn
46 Architecture: any
47
48=== modified file 'rules'
49--- rules 2009-02-15 02:49:33 +0000
50+++ rules 2009-06-22 18:07:34 +0000
51@@ -1,22 +1,35 @@
52 #!/usr/bin/make -f
53-
54-include /usr/share/cdbs/1/class/makefile.mk
55+
56+GIT_URL = git://git.gnome.org/network-manager-openvpn
57+TAG_PREFIX := "NETWORKMANAGER_OPENVPN_"
58+
59+DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //')
60+DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //')
61+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//')
62+DEB_TAG_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\./_/g')
63+
64+include /usr/share/cdbs/1/class/autotools.mk
65 include /usr/share/cdbs/1/rules/debhelper.mk
66 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
67-include /usr/share/cdbs/1/class/autotools.mk
68-
69-#DEB_DH_MAKESHLIBS_ARGS_network-manager-openvpn := -n
70-
71-makebuilddir/network-manager-openvpn:: debian/stamp-bootstrap
72-
73-debian/stamp-bootstrap:
74- NOCONFIGURE=1 ./autogen.sh
75- touch debian/stamp-bootstrap
76-
77-clean::
78- rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \
79- config.h.in config.sub configure depcomp install-sh \
80- intltool-extract.in intltool-merge.in intltool-update.in \
81- ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \
82- properties/Makefile.in src/Makefile.in debian/stamp-bootstrap
83-
84+
85+DEB_DESTDIR = $(CURDIR)/debian/tmp/
86+
87+get-orig-source::
88+ set -e; if echo $(DEB_VERSION) | grep -c "git"; \
89+ then \
90+ git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9]*\.\)*\(.*\)-.*$$/\2/g'`; \
91+ else \
92+ git_version=$(TAG_PREFIX)$(DEB_TAG_VERSION); \
93+ fi; \
94+ tmpdir=`mktemp -d -t`; \
95+ cd $$tmpdir; \
96+ echo "cloning upstream repository ..."; \
97+ git clone $(GIT_URL); echo "getting specific upstream revision/tag: $$git_version"; \
98+ cd `ls | head -n 1`; git checkout -b orig $$git_version; \
99+ echo "autotools bootstrapping ..."; \
100+ sh ./autogen.sh; \
101+ echo "cleaning up autotools caches (autom4te.cache) ..."; \
102+ rm -rf autom4te.cache; \
103+ echo "OK!"; \
104+ cd ..; tar --exclude=.git -cvzf $(CURDIR)/$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz `ls | head -n 1`; \
105+ cd $(CURDIR); rm -rf $$tmpdir

Subscribers

People subscribed via source and target branches