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
=== modified file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 2009-04-09 00:04:04 +0000
+++ .bzr-builddeb/default.conf 2009-06-22 19:26:12 +0000
@@ -1,3 +1,3 @@
1[BUILDDEB]1[BUILDDEB]
2merge = True2merge = True
3export-upstream-revision = revid:svn-v3-trunk0:42cba8c7-e2b8-49f4-950c-08e7c63a1d6e:branches%2FNETWORKMANAGER_0_7:513
44
=== modified file 'changelog'
--- changelog 2009-04-20 22:57:45 +0000
+++ changelog 2009-06-22 19:27:47 +0000
@@ -1,3 +1,9 @@
1network-manager-pptp (0.7.1-0ubuntu1) karmic; urgency=low
2
3 * New upstream release 0.7.1 final
4
5 -- Tony Espy <espy@ubuntu.com> Thu, 18 Jun 2009 15:47:28 -0400
6
1network-manager-pptp (0.7.1~rc4.20090316+bzr23-0ubuntu3) jaunty; urgency=low7network-manager-pptp (0.7.1~rc4.20090316+bzr23-0ubuntu3) jaunty; urgency=low
28
3 * backout permission patch which isn't needed as root is already allowed9 * backout permission patch which isn't needed as root is already allowed
410
=== modified file 'control'
--- control 2009-04-20 22:57:45 +0000
+++ control 2009-06-22 19:27:47 +0000
@@ -6,9 +6,9 @@
6Build-Depends: debhelper (>= 5.0.0),6Build-Depends: debhelper (>= 5.0.0),
7 cdbs,7 cdbs,
8 autotools-dev,8 autotools-dev,
9 network-manager-dev (>= 0.7.1~),9 network-manager-dev (>= 0.7.1),
10 libnm-util-dev (>= 0.7.1~),10 libnm-util-dev (>= 0.7.1),
11 libnm-glib-dev (>= 0.7.1~),11 libnm-glib-dev (>= 0.7.1),
12 ppp-dev (>= 2.4.5~git),12 ppp-dev (>= 2.4.5~git),
13 automake1.9,13 automake1.9,
14 gnome-common,14 gnome-common,
1515
=== modified file 'rules'
--- rules 2009-02-15 02:51:24 +0000
+++ rules 2009-06-22 19:25:33 +0000
@@ -1,23 +1,39 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2
3GIT_URL = git://git.gnome.org/network-manager-pptp
4TAG_PREFIX = "NETWORKMANAGER_PPTP_"
5
6DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //')
7DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //')
8DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//')
9DEB_TAG_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\./_/g')
10
11DEB_CONFIGURE_EXTRA_FLAGS += \
12 --with-pppd-plugin-dir=/usr/lib/pppd/2.4.5/ \
13 $(NULL)
2 14
15include /usr/share/cdbs/1/class/autotools.mk
3include /usr/share/cdbs/1/rules/debhelper.mk16include /usr/share/cdbs/1/rules/debhelper.mk
4include /usr/share/cdbs/1/rules/simple-patchsys.mk17include /usr/share/cdbs/1/rules/simple-patchsys.mk
5include /usr/share/cdbs/1/class/autotools.mk18
619DEB_DESTDIR = $(CURDIR)/debian/tmp/
7DEB_CONFIGURE_EXTRA_FLAGS += \20
8 --with-pppd-plugin-dir=/usr/lib/pppd/2.4.5/ \21get-orig-source::
9 $(NULL)22 set -e; if echo $(DEB_VERSION) | grep -c "git"; \
1023 then \
11makebuilddir/network-manager-pptp:: debian/stamp-bootstrap24 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9]*\.\)*\(.*\)-.*$$/\2/g'`; \
1225 else \
13debian/stamp-bootstrap:26 git_version=$(TAG_PREFIX)$(DEB_TAG_VERSION); \
14 NOCONFIGURE=1 ./autogen.sh27 fi; \
15 touch debian/stamp-bootstrap28 tmpdir=`mktemp -d -t`; \
1629 cd $$tmpdir; \
17clean::30 echo "cloning upstream repository ..."; \
18 rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \31 git clone $(GIT_URL); echo "getting specific upstream revision/tag: $$git_version"; \
19 config.h.in config.sub configure depcomp install-sh \32 cd `ls | head -n 1`; git checkout -b orig $$git_version; \
20 intltool-extract.in intltool-merge.in intltool-update.in \33 echo "autotools bootstrapping ..."; \
21 ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \34 sh ./autogen.sh; \
22 properties/Makefile.in src/Makefile.in debian/stamp-bootstrap35 echo "cleaning up autotools caches (autom4te.cache) ..."; \
2336 rm -rf autom4te.cache; \
37 echo "OK!"; \
38 cd ..; tar --exclude=.git -cvzf $(CURDIR)/$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz `ls | head -n 1`; \
39 cd $(CURDIR); rm -rf $$tmpdir

Subscribers

People subscribed via source and target branches