NetworkManager

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

  1. pptp-ubuntu.0.7.1
  2. Merge into pptp-ubuntu.0.7.1
Proposed by Tony Espy
Status: Merged
Approved by: Alexander Sack
Approved revision: 13
Merged at revision: not available
Proposed branch: lp://staging/~awe/network-manager/pptp-ubuntu.0.7.1
Merge into: lp://staging/~network-manager/network-manager/pptp-ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~awe/network-manager/pptp-ubuntu.0.7.1
Reviewer Review Type Date Requested Status
Alexander Sack Approve
Review via email: mp+7904@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) :
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-09 00:04:04 +0000
3+++ .bzr-builddeb/default.conf 2009-06-25 17:36:29 +0000
4@@ -1,3 +1,2 @@
5 [BUILDDEB]
6 merge = True
7-export-upstream-revision = revid:svn-v3-trunk0:42cba8c7-e2b8-49f4-950c-08e7c63a1d6e:branches%2FNETWORKMANAGER_0_7:51
8
9=== modified file 'changelog'
10--- changelog 2009-04-20 22:57:45 +0000
11+++ changelog 2009-06-25 18:26:38 +0000
12@@ -1,3 +1,15 @@
13+network-manager-pptp (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; added 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:25:09 -0400
24+
25 network-manager-pptp (0.7.1~rc4.20090316+bzr23-0ubuntu3) jaunty; urgency=low
26
27 * backout permission patch which isn't needed as root is already allowed
28
29=== modified file 'control'
30--- control 2009-04-20 22:57:45 +0000
31+++ control 2009-06-25 18:26:38 +0000
32@@ -6,9 +6,9 @@
33 Build-Depends: debhelper (>= 5.0.0),
34 cdbs,
35 autotools-dev,
36- network-manager-dev (>= 0.7.1~),
37- libnm-util-dev (>= 0.7.1~),
38- libnm-glib-dev (>= 0.7.1~),
39+ network-manager-dev (>= 0.7.1),
40+ libnm-util-dev (>= 0.7.1),
41+ libnm-glib-dev (>= 0.7.1),
42 ppp-dev (>= 2.4.5~git),
43 automake1.9,
44 gnome-common,
45
46=== modified file 'rules'
47--- rules 2009-02-15 02:51:24 +0000
48+++ rules 2009-06-25 17:52:24 +0000
49@@ -1,4 +1,12 @@
50 #!/usr/bin/make -f
51+
52+GIT_URL = git://git.gnome.org/network-manager-pptp
53+TAG_PREFIX = "NETWORKMANAGER_PPTP_"
54+
55+DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //')
56+DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //')
57+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//')
58+DEB_TAG_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\./_/g')
59
60 include /usr/share/cdbs/1/rules/debhelper.mk
61 include /usr/share/cdbs/1/rules/simple-patchsys.mk
62@@ -8,16 +16,24 @@
63 --with-pppd-plugin-dir=/usr/lib/pppd/2.4.5/ \
64 $(NULL)
65
66-makebuilddir/network-manager-pptp:: debian/stamp-bootstrap
67-
68-debian/stamp-bootstrap:
69- NOCONFIGURE=1 ./autogen.sh
70- touch debian/stamp-bootstrap
71-
72-clean::
73- rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \
74- config.h.in config.sub configure depcomp install-sh \
75- intltool-extract.in intltool-merge.in intltool-update.in \
76- ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \
77- properties/Makefile.in src/Makefile.in debian/stamp-bootstrap
78-
79+DEB_DESTDIR = $(CURDIR)/debian/tmp/
80+
81+get-orig-source::
82+ set -e; if echo $(DEB_VERSION) | grep -c "git"; \
83+ then \
84+ git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9]*\.\)*\(.*\)-.*$$/\2/g'`; \
85+ else \
86+ git_version=$(TAG_PREFIX)$(DEB_TAG_VERSION); \
87+ fi; \
88+ tmpdir=`mktemp -d -t`; \
89+ cd $$tmpdir; \
90+ echo "cloning upstream repository ..."; \
91+ git clone $(GIT_URL); echo "getting specific upstream revision/tag: $$git_version"; \
92+ cd `ls | head -n 1`; git checkout -b orig $$git_version; \
93+ echo "autotools bootstrapping ..."; \
94+ sh ./autogen.sh; \
95+ echo "cleaning up autotools caches (autom4te.cache) ..."; \
96+ rm -rf autom4te.cache; \
97+ echo "OK!"; \
98+ cd ..; tar --exclude=.git -cvzf $(CURDIR)/$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz `ls | head -n 1`; \
99+ cd $(CURDIR); rm -rf $$tmpdir

Subscribers

People subscribed via source and target branches