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
Approved by: Alexander Sack
Approved revision: 9
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 Approve
Review via email: mp+7905@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Tony Espy (awe) wrote :

Here's my revised merge...

Revision history for this message
Alexander Sack (asac) wrote :

adding "make distclean" to produce cleaner tarball. Thanks! merging ...

review: Approve
Revision history for this message
Alexander Sack (asac) wrote :

also remember to use real topic names ... e.g. you cannot reuse this name without trashing this branch :) (so one cannot refer to this branch etc.)

review: Approve

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

Subscribers

People subscribed via source and target branches