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
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 Pending
Review via email: mp+7773@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Tony Espy (awe) wrote :

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

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

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

-include /usr/share/cdbs/1/class/autotools.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS += \
- --with-pppd-plugin-dir=/usr/lib/pppd/2.4.5/ \
- $(NULL)

You moved those lines on top of the other includes ... is there any particular reason?

Also i saw that previously this package used NOCONFIGURE=1 ./autogen.sh ... maybe we should use that as well (to not create config.log etc.)?

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-22 19:26:12 +0000
4@@ -1,3 +1,3 @@
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
10=== modified file 'changelog'
11--- changelog 2009-04-20 22:57:45 +0000
12+++ changelog 2009-06-22 19:27:47 +0000
13@@ -1,3 +1,9 @@
14+network-manager-pptp (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 15:47:28 -0400
19+
20 network-manager-pptp (0.7.1~rc4.20090316+bzr23-0ubuntu3) jaunty; urgency=low
21
22 * backout permission patch which isn't needed as root is already allowed
23
24=== modified file 'control'
25--- control 2009-04-20 22:57:45 +0000
26+++ control 2009-06-22 19:27:47 +0000
27@@ -6,9 +6,9 @@
28 Build-Depends: debhelper (>= 5.0.0),
29 cdbs,
30 autotools-dev,
31- network-manager-dev (>= 0.7.1~),
32- libnm-util-dev (>= 0.7.1~),
33- libnm-glib-dev (>= 0.7.1~),
34+ network-manager-dev (>= 0.7.1),
35+ libnm-util-dev (>= 0.7.1),
36+ libnm-glib-dev (>= 0.7.1),
37 ppp-dev (>= 2.4.5~git),
38 automake1.9,
39 gnome-common,
40
41=== modified file 'rules'
42--- rules 2009-02-15 02:51:24 +0000
43+++ rules 2009-06-22 19:25:33 +0000
44@@ -1,23 +1,39 @@
45 #!/usr/bin/make -f
46+
47+GIT_URL = git://git.gnome.org/network-manager-pptp
48+TAG_PREFIX = "NETWORKMANAGER_PPTP_"
49+
50+DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //')
51+DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //')
52+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//')
53+DEB_TAG_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\./_/g')
54+
55+DEB_CONFIGURE_EXTRA_FLAGS += \
56+ --with-pppd-plugin-dir=/usr/lib/pppd/2.4.5/ \
57+ $(NULL)
58
59+include /usr/share/cdbs/1/class/autotools.mk
60 include /usr/share/cdbs/1/rules/debhelper.mk
61 include /usr/share/cdbs/1/rules/simple-patchsys.mk
62-include /usr/share/cdbs/1/class/autotools.mk
63-
64-DEB_CONFIGURE_EXTRA_FLAGS += \
65- --with-pppd-plugin-dir=/usr/lib/pppd/2.4.5/ \
66- $(NULL)
67-
68-makebuilddir/network-manager-pptp:: debian/stamp-bootstrap
69-
70-debian/stamp-bootstrap:
71- NOCONFIGURE=1 ./autogen.sh
72- touch debian/stamp-bootstrap
73-
74-clean::
75- rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \
76- config.h.in config.sub configure depcomp install-sh \
77- intltool-extract.in intltool-merge.in intltool-update.in \
78- ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \
79- properties/Makefile.in src/Makefile.in debian/stamp-bootstrap
80-
81+
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

Subscribers

People subscribed via source and target branches