@@ -23,16 +23,20 @@ trap on_exit EXIT
23
23
git config user.email
" [email protected] "
24
24
git config user.name " Evergreen Build"
25
25
26
+ # Note that here, on the r1.30 branch, the tag debian/1.30.4-1 is used rather
27
+ # than the branch debian/unstable. This is because the branch has advanced and
28
+ # now contains updated packaging for the 2.x releases.
29
+
26
30
if [ " ${IS_PATCH} " = " true" ]; then
27
31
git diff HEAD > ../upstream.patch
28
32
git clean -fdx
29
33
git reset --hard HEAD
30
34
git remote add upstream https://github.com/mongodb/mongo-c-driver
31
35
git fetch upstream
32
36
CURRENT_BRANCH=$( git rev-parse --abbrev-ref HEAD)
33
- git checkout upstream/ debian/unstable
37
+ git checkout debian/1.30.4-1
34
38
git checkout ${CURRENT_BRANCH}
35
- git checkout upstream/ debian/unstable -- ./debian/
39
+ git checkout debian/1.30.4-1 -- ./debian/
36
40
if [ -s ../upstream.patch ]; then
37
41
[ -d debian/patches ] || mkdir debian/patches
38
42
mv ../upstream.patch debian/patches/
@@ -59,9 +63,9 @@ sudo chroot ./unstable-chroot /bin/bash -c '(\
59
63
git remote add upstream https://github.com/mongodb/mongo-c-driver && \
60
64
git fetch upstream && \
61
65
export CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" && \
62
- git checkout upstream/ debian/unstable && \
66
+ git checkout debian/1.30.4-1 && \
63
67
git checkout ${CURRENT_BRANCH} && \
64
- git checkout upstream/ debian/unstable -- ./debian/ && \
68
+ git checkout debian/1.30.4-1 -- ./debian/ && \
65
69
git commit -m "fetch debian directory from the debian/unstable branch" && \
66
70
LANG=C /bin/bash ./debian/build_snapshot.sh && \
67
71
debc ../*.changes && \
@@ -91,9 +95,9 @@ sudo chroot ./unstable-i386-chroot /bin/bash -c '(\
91
95
git remote add upstream https://github.com/mongodb/mongo-c-driver && \
92
96
git fetch upstream && \
93
97
export CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" && \
94
- git checkout upstream/ debian/unstable && \
98
+ git checkout debian/1.30.4-1 && \
95
99
git checkout ${CURRENT_BRANCH} && \
96
- git checkout upstream/ debian/unstable -- ./debian/ && \
100
+ git checkout debian/1.30.4-1 -- ./debian/ && \
97
101
git commit -m "fetch debian directory from the debian/unstable branch" && \
98
102
LANG=C /bin/bash ./debian/build_snapshot.sh && \
99
103
debc ../*.changes && \
0 commit comments