NetworkManager

Merge lp://staging/~cyphermox/network-manager/pptp-ubuntu.head.20090907t163210 into lp://staging/~network-manager/network-manager/pptp-ubuntu.head

  1. pptp-ubuntu.head.20090907t163210
  2. Merge into pptp-ubuntu.head
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~cyphermox/network-manager/pptp-ubuntu.head.20090907t163210
Merge into: lp://staging/~network-manager/network-manager/pptp-ubuntu.head
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~cyphermox/network-manager/pptp-ubuntu.head.20090907t163210
Reviewer Review Type Date Requested Status
Alexander Sack Approve
Review via email: mp+11316@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
=== modified file 'debian/changelog'
--- debian/changelog 2009-09-01 21:39:28 +0000
+++ debian/changelog 2009-09-07 16:32:03 +0000
@@ -1,3 +1,16 @@
1network-manager-pptp (0.8~a~git.20090828t162339.8aaca8b-0ubuntu2) UNRELEASED; urgency=low
2
3 * update GET_SOURCE code: exit on any error
4 - update debian/rules
5 * make GET_SOURCE not go mad for git versions that use a different abbrev-id syntax
6 - update debian/rules
7 * add rule for get-snapshot-info
8 - update debian/rules
9 * fix noisy output: use grep -q -c rather than just -c in GET_SOURCE etc.
10 - update debian/rules
11
12 -- Mathieu Trudel <mathieu.tl@gmail.com> Mon, 07 Sep 2009 12:31:42 -0400
13
1network-manager-pptp (0.8~a~git.20090828t162339.8aaca8b-0ubuntu1) karmic; urgency=low14network-manager-pptp (0.8~a~git.20090828t162339.8aaca8b-0ubuntu1) karmic; urgency=low
215
3 * upstream snapshot 2009-08-28 16:23:39 (GMT)16 * upstream snapshot 2009-08-28 16:23:39 (GMT)
417
=== modified file 'debian/rules'
--- debian/rules 2009-08-21 16:23:37 +0000
+++ debian/rules 2009-09-07 16:32:03 +0000
@@ -38,15 +38,16 @@
38 intltoolize -f -c38 intltoolize -f -c
3939
40GET_SOURCE = \40GET_SOURCE = \
41 set -e; \
41 tmpdir=`mktemp -d -t`; \42 tmpdir=`mktemp -d -t`; \
42 cd $$tmpdir; \43 cd $$tmpdir; \
43 echo "cloning upstream repository ..."; \44 echo "cloning upstream repository ..."; \
44 git clone $(if $(LOCAL_BRANCH),$(call LOCAL_REAL_BRANCH)/$(GIT_BRANCH_NAME),$(GIT_URL)) $(GIT_BRANCH_NAME); \45 git clone $(if $(LOCAL_BRANCH),$(call LOCAL_REAL_BRANCH)/$(GIT_BRANCH_NAME),$(GIT_URL)) $(GIT_BRANCH_NAME); \
45 echo "getting specific upstream revision/tag: $(1)"; \46 echo "getting specific upstream revision/tag: $(1)"; \
46 cd `ls | head -n 1`; git checkout -b orig $(1); \47 cd `ls | head -n 1`; git checkout -b orig $(1); \
47 commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //'`; \48 commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //' | sed -e 's/\.\.\.$$//'`; \
48 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"`; \49 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"`; \
49 if echo $(1) | grep -c "orig" || echo $(DEB_VERSION) | grep -c "git"; \50 if echo $(1) | grep -q -c "orig" || echo $(DEB_VERSION) | grep -q -c "git"; \
50 then \51 then \
51 upstream_version=$(DEB_MAJOR_VERSION)git.$$raw.$$commit_id; \52 upstream_version=$(DEB_MAJOR_VERSION)git.$$raw.$$commit_id; \
52 else \53 else \
@@ -56,7 +57,7 @@
56 cd $(CURDIR); rm -rf $$tmpdir; 57 cd $(CURDIR); rm -rf $$tmpdir;
5758
58get-current-source:: $(if $(LOCAL_BRANCH),update-local-branch)59get-current-source:: $(if $(LOCAL_BRANCH),update-local-branch)
59 set -e; if echo $(DEB_VERSION) | grep -c "git"; \60 set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \
60 then \61 then \
61 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \62 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \
62 else \63 else \
@@ -73,3 +74,10 @@
73 @set -e; if ! test -d $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); then git clone $(GIT_URL) $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); fi74 @set -e; if ! test -d $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); then git clone $(GIT_URL) $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); fi
74 @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git pull -f75 @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git pull -f
75 @echo "updated local branch ($(LOCAL_BRANCH))"76 @echo "updated local branch ($(LOCAL_BRANCH))"
77
78get-snapshot-info:: $(if $(LOCAL_BRANCH),update-local-branch)
79 @set -e; \
80 git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \
81 cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); \
82 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)"`; \
83 git log -n1 $$git_version --format="%n%s%n%n * upstream snapshot $$raw%n + %H%n";

Subscribers

People subscribed via source and target branches