diff --git a/debian/changelog b/debian/changelog index 75048bcc..786d2c65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,11 +16,11 @@ byobu (2.81) unreleased; urgency=low - usr/bin/byobu - usr/bin/byobu-export - usr/bin/byobu-janitor - * usr/bin/byobu-status: save a conditional - * usr/bin/byobu-config, usr/share/doc/byobu/help.txt: improve help text, per feedback from Turnkey Linux users + * debian/release,sh, debian/release-build.sh: drop, no longer needed, + now in lp:~kirkland/+junk/bin -- Dustin Kirkland Wed, 16 Jun 2010 12:46:29 -0500 diff --git a/debian/release-build.sh b/debian/release-build.sh deleted file mode 100755 index 7ca479fe..00000000 --- a/debian/release-build.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -e - -PKG="byobu" - -error() { - echo "ERROR: $@" - exit 1 -} - -head -n1 debian/changelog | grep "unreleased" || error "This version must be 'unreleased'" - -./debian/rules get-orig-source -if tar -tvf ../byobu_*.orig.tar.gz | egrep "bzr|debian"; then - echo "ERROR: release tarball has invalid files" - exit 1 -fi -if tar -tvf ../byobu_*.orig.tar.gz | egrep "/bin/|/lib/" | grep -v "rwxr-xr-x"; then - echo "ERROR: release tarball has binaries with incorrect permissions" - exit 1 -fi - -bzr bd -sed -i "s/) unreleased;/-0ubuntu1~ppa1) hardy;/" debian/changelog -bzr bd -S -sed -i "s/ppa1) hardy;/ppa2) intrepid;/" debian/changelog -bzr bd -S -sed -i "s/ppa2) intrepid;/ppa3) jaunty;/" debian/changelog -bzr bd -S -sed -i "s/ppa3) jaunty;/ppa4) karmic;/" debian/changelog -bzr bd -S -sed -i "s/~ppa4) karmic;/) lucid;/" debian/changelog -bzr bd -S - -echo -echo -echo "# Test this build:" -echo " sudo dpkg -Oi ../byobu_*.deb" -echo -echo "# If everything looks good, release:" -echo " ./debian/release.sh" -echo -echo diff --git a/debian/release.sh b/debian/release.sh deleted file mode 100755 index b2657fd0..00000000 --- a/debian/release.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -e - -PKG="byobu" -MAJOR=2 - -error() { - echo "ERROR: $@" - exit 1 -} - -head -n1 debian/changelog | grep "lucid" || error "This version must be ready for 'lucid'" - -# Tag the release in bzr -minor=`head -n1 debian/changelog | sed "s/^.*($MAJOR.//" | sed "s/-.*$//"` -dch --release -bzr tag --delete $MAJOR.$minor-0ubuntu1 || true -debcommit --release --message="releasing $MAJOR.$minor" - -# Sign the tarball -gpg --armor --sign --detach-sig ../"$PKG"_*.orig.tar.gz - -# Create the rpm export -sudo alien --to-rpm ../$PKG"_"$MAJOR.$minor"_all.deb" -mv -f *.rpm .. -rsync -azP ../*.rpm kirkland@people.canonical.com:~kirkland/public_html/$PKG/rpm - -# Create the tarball export -rm -f /tmp/$PKG.tar.gz -$PKG-export -f /tmp/$PKG.tar.gz -rsync -azP /tmp/$PKG.tar.gz kirkland@people.canonical.com:~kirkland/public_html - -# Do the Ubuntu packaging -#cd .. -#rm -rf byobu-ubuntu -#bzr branch lp:ubuntu/byobu byobu-ubuntu -#... - -# Open the next release for development -nextminor=`expr $minor + 1` -sed -i "s/^VERSION=.*$/VERSION=$MAJOR.$nextminor/" usr/bin/$PKG -dch -v "$MAJOR.$nextminor" "UNRELEASED" -sed -i "s/$MAJOR.$nextminor) .*;/$MAJOR.$nextminor) unreleased;/" debian/changelog -sed -i "s/^Version:.*$/Version: $MAJOR.$nextminor/" rpm/$PKG.spec -sed -i "s%^Source0:.*$%Source0: http://code.launchpad.net/$PKG/trunk/$MAJOR.$nextminor/+download/byobu_$MAJOR.$nextminor.orig.tar.gz%" rpm/$PKG.spec -bzr commit -m "opening $MAJOR.$nextminor" - -echo -echo "# To push:" -echo " bzr push lp:$PKG" -echo -echo "# To upload PPA packages:" -echo " dput $PKG-ppa ../*ppa*changes" -echo -echo "# Publish tarball at:" -echo " https://launchpad.net/$PKG/trunk/+addrelease" -echo -echo "# Upload to Ubuntu:" -echo " dput ../${PKG}_${MAJOR}.${minor}-0ubuntu1_source.changes" -echo -echo