diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-06-05 15:47:14 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-06-05 15:47:14 -0300 |
| commit | ee53e05fbff3509a7cdb9bc510c891922f9a8bca (patch) | |
| tree | a6f2abc279391e5202cbb7860380bb8a1575d79f /scripts/build_debian_package.sh | |
| parent | 16851aa62858fb1eac1b725f5415a334a093fa51 (diff) | |
| parent | bff6444cc2a119a49f5c259644ffc2d6862f779e (diff) | |
Merge remote-tracking branch 'refs/remotes/drebs/bug/5739_fix-multipart-put-problem-2' into develop
Diffstat (limited to 'scripts/build_debian_package.sh')
| -rwxr-xr-x | scripts/build_debian_package.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build_debian_package.sh b/scripts/build_debian_package.sh index cc62c3ac..1ec9b00a 100755 --- a/scripts/build_debian_package.sh +++ b/scripts/build_debian_package.sh @@ -26,7 +26,7 @@ export GIT_DIR=${workdir}/soledad/.git export GIT_WORK_TREE=${workdir}/soledad git remote add leapcode ${SOLEDAD_MAIN_REPO} git fetch leapcode -git checkout debian +git checkout -b debian leapcode/debian git merge --no-edit ${branch} (cd ${workdir}/soledad && debuild -uc -us) echo "Packages generated in ${workdir}" |