NetworkManager

Merge lp://qastaging/~awe/network-manager/vpnc-ubuntu.0.7.1 into lp://qastaging/~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://qastaging/~awe/network-manager/vpnc-ubuntu.0.7.1
Merge into: lp://qastaging/~network-manager/network-manager/vpnc-ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~awe/network-manager/vpnc-ubuntu.0.7.1
Reviewer Review Type Date Requested Status
Alexander Sack Approve
Review via email: mp+7905@code.qastaging.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
=== modified file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 2009-04-08 23:48:03 +0000
+++ .bzr-builddeb/default.conf 2009-06-25 17:38:57 +0000
@@ -1,3 +1,2 @@
1[BUILDDEB]1[BUILDDEB]
2merge = True2merge = True
3export-upstream-revision = revid:svn-v3-trunk0:6a32631f-a044-41e0-9dd8-d04e6a31006c:branches%2FNETWORKMANAGER_0_7:47
43
=== modified file 'changelog'
--- changelog 2009-04-09 00:07:38 +0000
+++ changelog 2009-06-25 18:46:44 +0000
@@ -1,3 +1,15 @@
1network-manager-vpnc (0.7.1-0ubuntu1) karmic; urgency=low
2
3 * New upstream release 0.7.1 final
4 * updated build-depends to 0.7.1 final; add Vcs-Bzr line
5 - update debian/control
6 * added get-orig-source to generate orig.tar.gz
7 - update debian/rules
8 * removed unused export-upstream-revision statement
9 - update .bzr-builddeb/default.conf
10
11 -- Tony Espy <espy@ubuntu.com> Thu, 25 Jun 2009 14:35:56 -0400
12
1network-manager-vpnc (0.7.1~rc4.20090316+bzr21-0ubuntu2) jaunty; urgency=low13network-manager-vpnc (0.7.1~rc4.20090316+bzr21-0ubuntu2) jaunty; urgency=low
214
3 * add missing build dependency (libglade2-dev) to fix build failures15 * add missing build dependency (libglade2-dev) to fix build failures
416
=== modified file 'control'
--- control 2009-04-09 00:07:38 +0000
+++ control 2009-06-25 18:46:44 +0000
@@ -4,8 +4,8 @@
4Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>4Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
5Build-Depends: cdbs,5Build-Depends: cdbs,
6 debhelper (>= 5),6 debhelper (>= 5),
7 network-manager-dev (>= 0.7.1~),7 network-manager-dev (>= 0.7.1),
8 libnm-glib-dev (>= 0.7.1~),8 libnm-glib-dev (>= 0.7.1),
9 automake1.9,9 automake1.9,
10 gnome-common,10 gnome-common,
11 intltool,11 intltool,
@@ -14,6 +14,7 @@
14 patchutils,14 patchutils,
15 libglade2-dev15 libglade2-dev
16Standards-Version: 3.7.216Standards-Version: 3.7.2
17Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/vpnc-ubuntu.0.7.1
1718
18Package: network-manager-vpnc19Package: network-manager-vpnc
19Architecture: any20Architecture: any
2021
=== modified file 'rules'
--- rules 2009-02-15 02:47:34 +0000
+++ rules 2009-06-25 17:53:26 +0000
@@ -1,19 +1,36 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2
3GIT_URL = git://git.gnome.org/network-manager-vpnc
4TAG_PREFIX = "NETWORKMANAGER_VPNC_"
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')
2 10
3include /usr/share/cdbs/1/rules/debhelper.mk11include /usr/share/cdbs/1/rules/debhelper.mk
4include /usr/share/cdbs/1/rules/simple-patchsys.mk12include /usr/share/cdbs/1/rules/simple-patchsys.mk
5include /usr/share/cdbs/1/class/autotools.mk13include /usr/share/cdbs/1/class/autotools.mk
614
7makebuilddir/network-manager-vpnc:: debian/stamp-bootstrap15DEB_DESTDIR = $(CURDIR)/debian/tmp/
816
9debian/stamp-bootstrap:17get-orig-source::
10 NOCONFIGURE=1 ./autogen.sh18 set -e; if echo $(DEB_VERSION) | grep -c "git"; \
11 touch debian/stamp-bootstrap19 then \
1220 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9]*\.\)*\(.*\)-.*$$/\2/g'`; \
13clean::21 else \
14 rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \22 git_version=$(TAG_PREFIX)$(DEB_TAG_VERSION); \
15 config.h.in config.sub configure depcomp install-sh \23 fi; \
16 intltool-extract.in intltool-merge.in intltool-update.in \24 tmpdir=`mktemp -d -t`; \
17 ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \25 cd $$tmpdir; \
18 properties/Makefile.in src/Makefile.in debian/stamp-bootstrap26 echo "cloning upstream repository ..."; \
27 git clone $(GIT_URL); echo "getting specific upstream revision/tag: $$git_version"; \
28 cd `ls | head -n 1`; git checkout -b orig $$git_version; \
29 echo "autotools bootstrapping ..."; \
30 sh ./autogen.sh; \
31 echo "cleaning up autotools caches (autom4te.cache) ..."; \
32 rm -rf autom4te.cache; \
33 echo "OK!"; \
34 cd ..; tar --exclude=.git -cvzf $(CURDIR)/$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz `ls | head -n 1`; \
35 cd $(CURDIR); rm -rf $$tmpdir
1936

Subscribers

People subscribed via source and target branches