NetworkManager

Merge lp://staging/~cyphermox/network-manager/openvpn-ubuntu.head.20090907t153314 into lp://staging/~network-manager/network-manager/openvpn-ubuntu.head

  1. openvpn-ubuntu.head.20090907t153314
  2. Merge into openvpn-ubuntu.head
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~cyphermox/network-manager/openvpn-ubuntu.head.20090907t153314
Merge into: lp://staging/~network-manager/network-manager/openvpn-ubuntu.head
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~cyphermox/network-manager/openvpn-ubuntu.head.20090907t153314
Reviewer Review Type Date Requested Status
Alexander Sack Approve
Review via email: mp+11314@code.staging.launchpad.net
To post a comment you must log in.
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 'debian/changelog'
2--- debian/changelog 2009-09-01 20:25:36 +0000
3+++ debian/changelog 2009-09-07 15:32:51 +0000
4@@ -1,3 +1,16 @@
5+network-manager-openvpn (0.8~a~git.20090831t215704.5dd87bd-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * update GET_SOURCE code: exit on any error
8+ - update debian/rules
9+ * make GET_SOURCE not go mad for git versions that use a different abbrev-id syntax
10+ - update debian/rules
11+ * fix noisy output: use grep -q -c rather than just -c in GET_SOURCE etc.
12+ - update debian/rules
13+ * add rule for get-snapshot-info
14+ - update debian/rules
15+
16+ -- Mathieu Trudel <mathieu.tl@gmail.com> Mon, 07 Sep 2009 11:31:53 -0400
17+
18 network-manager-openvpn (0.8~a~git.20090831t215704.5dd87bd-0ubuntu1) karmic; urgency=low
19
20 * upstream snapshot 2009-08-31 21:57:04 (GMT)
21
22=== modified file 'debian/rules'
23--- debian/rules 2009-08-21 00:35:42 +0000
24+++ debian/rules 2009-09-07 15:32:51 +0000
25@@ -36,15 +36,16 @@
26 intltoolize -f -c
27
28 GET_SOURCE = \
29+ set -e; \
30 tmpdir=`mktemp -d -t`; \
31 cd $$tmpdir; \
32 echo "cloning upstream repository ..."; \
33 git clone $(if $(LOCAL_BRANCH),$(call LOCAL_REAL_BRANCH)/$(GIT_BRANCH_NAME),$(GIT_URL)) $(GIT_BRANCH_NAME); \
34 echo "getting specific upstream revision/tag: $(1)"; \
35 cd `ls | head -n 1`; git checkout -b orig $(1); \
36- commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //'`; \
37+ commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //' | sed -e 's/\.\.\.$$//'`; \
38 raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y%m%dt%H%M%S"`; \
39- if echo $(1) | grep -c "orig" || echo $(DEB_VERSION) | grep -c "git"; \
40+ if echo $(1) | grep -q -c "orig" || echo $(DEB_VERSION) | grep -q -c "git"; \
41 then \
42 upstream_version=$(DEB_MAJOR_VERSION)git.$$raw.$$commit_id; \
43 else \
44@@ -54,7 +55,7 @@
45 cd $(CURDIR); rm -rf $$tmpdir;
46
47 get-current-source:: $(if $(LOCAL_BRANCH),update-local-branch)
48- set -e; if echo $(DEB_VERSION) | grep -c "git"; \
49+ set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \
50 then \
51 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \
52 else \
53@@ -71,3 +72,10 @@
54 @set -e; if ! test -d $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); then git clone $(GIT_URL) $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); fi
55 @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git pull -f
56 @echo "updated local branch ($(LOCAL_BRANCH))"
57+
58+get-snapshot-info:: $(if $(LOCAL_BRANCH),update-local-branch)
59+ @set -e; \
60+ git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \
61+ cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); \
62+ raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc $$git_version | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y-%m-%d %H:%M:%S (GMT)"`; \
63+ git log -n1 $$git_version --format="%n%s%n%n * upstream snapshot $$raw%n + %H%n";

Subscribers

People subscribed via source and target branches