X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=blobdiff_plain;f=release.sh;h=0190fcfb4f575c1bd77061219bb7a175f2d26071;hp=8f537c0e25d32cccbbb7ab4e48b9b06f98ceefa5;hb=HEAD;hpb=7af2faebd85e734ce1224c5b5666f7c88054d62c

diff --git a/release.sh b/release.sh
index 8f537c0e..0190fcfb 100755
--- a/release.sh
+++ b/release.sh
@@ -1,8 +1,8 @@
 #!/bin/zsh
 # This script is used to prepare a new release of i3.
 
-export RELEASE_VERSION="4.13"
-export PREVIOUS_VERSION="4.12"
+export RELEASE_VERSION="4.15"
+export PREVIOUS_VERSION="4.14"
 export RELEASE_BRANCH="next"
 
 if [ ! -e "../i3.github.io" ]
@@ -85,12 +85,12 @@ if [ "${RELEASE_BRANCH}" = "master" ]; then
 	git checkout master
 	git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
 	git checkout next
-	git merge --no-ff -X ours master -m "Merge branch 'master' into next"
+	git merge --no-ff -s recursive -X ours -X no-renames master -m "Merge branch 'master' into next"
 else
 	git checkout next
 	git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
 	git checkout master
-	git merge --no-ff -X theirs next -m "Merge branch 'next' into master"
+	git merge --no-ff -s recursive -X theirs -X no-renames next -m "Merge branch 'next' into master"
 fi
 
 git remote remove origin
@@ -126,6 +126,7 @@ WORKDIR /usr/src
 RUN mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' i3-${RELEASE_VERSION}/debian/control
 WORKDIR /usr/src/i3-${RELEASE_VERSION}
 RUN dpkg-buildpackage -sa -j8
+RUN dpkg-buildpackage -S -sa -j8
 EOT
 
 CONTAINER_NAME=$(echo "i3-${TMPDIR}" | sed 's,/,,g')
@@ -139,7 +140,7 @@ echo "Content of resulting package’s .changes file:"
 cat ${TMPDIR}/debian/*.changes
 
 # debsign is in devscripts, which is available in fedora and debian
-debsign -k4AC8EE1D ${TMPDIR}/debian/*.changes
+debsign --no-re-sign -k4AC8EE1D ${TMPDIR}/debian/*.changes
 
 # TODO: docker cleanup
 
@@ -227,14 +228,14 @@ echo "  cd ${TMPDIR}/i3.github.io"
 echo "  git push"
 echo ""
 echo "  cd ${TMPDIR}/debian"
-echo "  dput *.changes"
+echo "  dput"
 echo ""
 echo "  cd ${TMPDIR}"
 echo "  sendmail -t < email.txt"
 echo ""
-echo "Update milestones on GitHub:"
-echo "  Set due date of ${RELEASE_VERSION} to $(date +'%Y-$m-%d') and close the milestone"
-echo "  Create milestone for the next version with unset due date"
+echo "Update milestones on GitHub (only for new major versions):"
+echo "  Set due date of ${RELEASE_VERSION} to $(date +'%Y-%m-%d') and close the milestone"
+echo "  Create milestone for the next major version with unset due date"
 echo ""
 echo "Announce on:"
 echo "  twitter"