NetworkManager

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

  1. vpnc-ubuntu.0.7.1
  2. Merge into vpnc-ubuntu.0.7.1
Proposed by Tony Espy
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~awe/network-manager/vpnc-ubuntu.0.7.1
Merge into: lp://staging/~network-manager/network-manager/vpnc-ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~awe/network-manager/vpnc-ubuntu.0.7.1
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+7772@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-vpnc 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:48:03 +0000
3+++ .bzr-builddeb/default.conf 2009-06-22 19:56:38 +0000
4@@ -1,3 +1,3 @@
5 [BUILDDEB]
6 merge = True
7-export-upstream-revision = revid:svn-v3-trunk0:6a32631f-a044-41e0-9dd8-d04e6a31006c:branches%2FNETWORKMANAGER_0_7:47
8+
9
10=== modified file 'changelog'
11--- changelog 2009-04-09 00:07:38 +0000
12+++ changelog 2009-06-22 19:57:35 +0000
13@@ -1,3 +1,9 @@
14+network-manager-vpnc (0.7.1-0ubuntu1) karmic; urgency=low
15+
16+ * New upstream release 0.7.1 final
17+
18+ -- Tony Espy <espy@ubuntu.com> Thu, 18 Jun 2009 17:25:06 -0400
19+
20 network-manager-vpnc (0.7.1~rc4.20090316+bzr21-0ubuntu2) jaunty; urgency=low
21
22 * add missing build dependency (libglade2-dev) to fix build failures
23
24=== modified file 'control'
25--- control 2009-04-09 00:07:38 +0000
26+++ control 2009-06-22 19:57:35 +0000
27@@ -4,8 +4,8 @@
28 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
29 Build-Depends: cdbs,
30 debhelper (>= 5),
31- network-manager-dev (>= 0.7.1~),
32- libnm-glib-dev (>= 0.7.1~),
33+ network-manager-dev (>= 0.7.1),
34+ libnm-glib-dev (>= 0.7.1),
35 automake1.9,
36 gnome-common,
37 intltool,
38@@ -14,6 +14,7 @@
39 patchutils,
40 libglade2-dev
41 Standards-Version: 3.7.2
42+Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/vpnc-ubuntu.0.7.1
43
44 Package: network-manager-vpnc
45 Architecture: any
46
47=== modified file 'rules'
48--- rules 2009-02-15 02:47:34 +0000
49+++ rules 2009-06-22 19:55:35 +0000
50@@ -1,19 +1,36 @@
51 #!/usr/bin/make -f
52-
53+
54+GIT_URL = git://git.gnome.org/network-manager-vpnc
55+TAG_PREFIX = "NETWORKMANAGER_VPNC_"
56+
57+DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //')
58+DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //')
59+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//')
60+DEB_TAG_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\./_/g')
61+
62+include /usr/share/cdbs/1/class/autotools.mk
63 include /usr/share/cdbs/1/rules/debhelper.mk
64 include /usr/share/cdbs/1/rules/simple-patchsys.mk
65-include /usr/share/cdbs/1/class/autotools.mk
66-
67-makebuilddir/network-manager-vpnc:: debian/stamp-bootstrap
68-
69-debian/stamp-bootstrap:
70- NOCONFIGURE=1 ./autogen.sh
71- touch debian/stamp-bootstrap
72-
73-clean::
74- rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \
75- config.h.in config.sub configure depcomp install-sh \
76- intltool-extract.in intltool-merge.in intltool-update.in \
77- ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \
78- properties/Makefile.in src/Makefile.in debian/stamp-bootstrap
79+
80+DEB_DESTDIR = $(CURDIR)/debian/tmp/
81+
82+get-orig-source::
83+ set -e; if echo $(DEB_VERSION) | grep -c "git"; \
84+ then \
85+ git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9]*\.\)*\(.*\)-.*$$/\2/g'`; \
86+ else \
87+ git_version=$(TAG_PREFIX)$(DEB_TAG_VERSION); \
88+ fi; \
89+ tmpdir=`mktemp -d -t`; \
90+ cd $$tmpdir; \
91+ echo "cloning upstream repository ..."; \
92+ git clone $(GIT_URL); echo "getting specific upstream revision/tag: $$git_version"; \
93+ cd `ls | head -n 1`; git checkout -b orig $$git_version; \
94+ echo "autotools bootstrapping ..."; \
95+ sh ./autogen.sh; \
96+ echo "cleaning up autotools caches (autom4te.cache) ..."; \
97+ rm -rf autom4te.cache; \
98+ echo "OK!"; \
99+ cd ..; tar --exclude=.git -cvzf $(CURDIR)/$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz `ls | head -n 1`; \
100+ cd $(CURDIR); rm -rf $$tmpdir
101

Subscribers

People subscribed via source and target branches