From 137e839d06f054bf00bd897bbcbd585c6dbdcf5e Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Sun, 5 Jan 2014 10:43:21 +0100 Subject: [PATCH] Launchpad automation --- configure.ac | 4 ++-- debian/changelog | 2 +- debian/control | 2 +- dist/1-dist.sh | 2 +- dist/2-deb.sh | 16 ++++++++++++---- dist/3-deb-push.sh | 3 ++- dist/changelog-raring | 5 ----- dist/changelog-saucy | 5 ----- dist/env.sh | 13 +++++++++---- dist/make-ubuntu-distro.sh | 36 +++++++++++++++++++++++++----------- 10 files changed, 53 insertions(+), 35 deletions(-) delete mode 100644 dist/changelog-raring delete mode 100644 dist/changelog-saucy diff --git a/configure.ac b/configure.ac index 7e34ba6..9a28e3c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,8 +4,8 @@ AC_PREREQ([2.69]) -AC_INIT(hh, 0.7, martin.dvorak@mindforger.com) -AM_INIT_AUTOMAKE(hh, 0.7) +AC_INIT(hh, 0.73, martin.dvorak@mindforger.com) +AM_INIT_AUTOMAKE(hh, 0.73) AC_OUTPUT(Makefile src/Makefile man/Makefile) # Checks for src dir existence. diff --git a/debian/changelog b/debian/changelog index 2d0e8d5..2e0a5e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hh (0.71-0ubuntu1) raring; urgency=low +hh (0.72-0ubuntu1) raring; urgency=low * Case insensitive search with ctrl-i toggle. diff --git a/debian/control b/debian/control index 0656df0..cc822e3 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: hh -Section: universe/admin +Section: Utilities Priority: optional Maintainer: Martin Dvorak Build-Depends: debhelper (>= 8.0.0), autotools-dev, libreadline-dev, libncurses5-dev diff --git a/dist/1-dist.sh b/dist/1-dist.sh index 28f6283..825f367 100755 --- a/dist/1-dist.sh +++ b/dist/1-dist.sh @@ -7,7 +7,7 @@ aclocal automake --force-missing --add-missing autoconf -rm -rvf depcomp install-sh missing autom*te.cache +rm -rvf depcomp install-sh missing #autom*te.cache cp -vf /usr/share/automake-1.11/depcomp . cp -vf /usr/share/automake-1.11/install-sh . cp -vf /usr/share/automake-1.11/missing . diff --git a/dist/2-deb.sh b/dist/2-deb.sh index ae43b15..3313054 100755 --- a/dist/2-deb.sh +++ b/dist/2-deb.sh @@ -4,13 +4,21 @@ export SCRIPTHOME=`pwd` . ./env.sh +function createChangelog() { + export MYTS=`date "+%a, %d %b %Y %H:%M:%S"` + echo "Changelog timestamp: ${MYTS}" + echo -e "hh (${HHFULLVERSION}) ${UBUNTUVERSION}; urgency=low" > $1 + echo -e "\n" >> $1 + echo -e " * ${HHBZRMSG}" >> $1 + echo -e "\n" >> $1 + echo -e " -- Martin Dvorak (Dvorka) ${MYTS} +0100" >> $1 + echo -e "\n" >> $1 +} + rm -rvf ../debian cp -rvf ${HHSRC}/debian .. -cp changelog-${UBUNTUVERSION} ../debian/changelog -cd .. -dch -i -cd dist +createChangelog ../debian/changelog cd ../.. mv hh ${HH} diff --git a/dist/3-deb-push.sh b/dist/3-deb-push.sh index e40e0c5..ac32a2c 100755 --- a/dist/3-deb-push.sh +++ b/dist/3-deb-push.sh @@ -4,7 +4,8 @@ cd .. bzr commit -m "Sync." -bzr push lp:~ultradvorka/+junk/hh-package +bzr push :parent +#bzr push lp:~ultradvorka/+junk/hh-package cd .. dput ppa:ultradvorka ${HHRELEASE}_source.changes diff --git a/dist/changelog-raring b/dist/changelog-raring deleted file mode 100644 index 2d0e8d5..0000000 --- a/dist/changelog-raring +++ /dev/null @@ -1,5 +0,0 @@ -hh (0.71-0ubuntu1) raring; urgency=low - - * Case insensitive search with ctrl-i toggle. - - -- Martin Dvorak (Dvorka) Wed, 25 Dec 2013 17:21:31 +0100 diff --git a/dist/changelog-saucy b/dist/changelog-saucy deleted file mode 100644 index c32d218..0000000 --- a/dist/changelog-saucy +++ /dev/null @@ -1,5 +0,0 @@ -hh (0.71-0ubuntu1) saucy; urgency=low - - * Case insensitive search with ctrl-i toggle. - - -- Martin Dvorak (Dvorka) Wed, 25 Dec 2013 17:21:31 +0100 diff --git a/dist/env.sh b/dist/env.sh index 2cb75f9..ceabb3e 100755 --- a/dist/env.sh +++ b/dist/env.sh @@ -1,14 +1,19 @@ #!/bin/bash -export HHVERSION="0.71" +export HHVERSION="0.731" +export HHFULLVERSION=${HHVERSION}-0ubuntu1 export HH=hh_${HHVERSION} -export HHRELEASE=${HH}-0ubuntu1 +export HHRELEASE=hh_${HHFULLVERSION} export HHSRC=/home/dvorka/p/hstr/github/hstr export NOW=`date +%Y-%m-%d--%H-%M-%S` export HHBUILD=hstr-${NOW} -export UBUNTUVERSION=raring -# - when asked to change debian/changes, just copy the date and keep 0ubuntu1 +export UBUNTUVERSION=raring +#export UBUNTUVERSION=saucy + +export HHBZRMSG="Adding case insensitive search." + +# - edit config.am ... set new version # - user email must be as in gpg i.e. (Dvorka) must present # - hh_ must be with underscore diff --git a/dist/make-ubuntu-distro.sh b/dist/make-ubuntu-distro.sh index 1103826..dc16383 100755 --- a/dist/make-ubuntu-distro.sh +++ b/dist/make-ubuntu-distro.sh @@ -3,29 +3,43 @@ . /home/dvorka/p/hstr/github/hstr/dist/env.sh function branch_hh() { - bzr branch lp:hstr - #cd hstr - #mv .bzr .. - #rm -rvf debian dist man src LICENSE *.am *.md *.ac - #mv ../.bzr . - #cp -rvf ${HHSRC}/* ${HHSRC}/*.* . + bzr branch lp:~ultradvorka/+junk/hh-package + #bzr clone lp:~ultradvorka/+junk/hh-package + #bzr branch lp:hstr + mv hh-package ${HH} + cd ${HH} + mv .bzr .. + rm -rvf debian dist man src LICENSE *.am *.md *.ac auto*.* + mv ../.bzr . + cp -rvf ${HHSRC}/* ${HHSRC}/*.* . + cd .. + #tar zcf ${HH}.tgz ${HH} + #cp -vf ${H}.tgz ${HH}.orig.tar.gz + mv -v ${HH} hh + cd ./hh/dist && ./1-dist.sh && cd ../.. } function init_hh() { cp -rvf ${HHSRC} . + cd ./hstr/dist && ./1-dist.sh && rm -vrf ../debian && cd ../.. + cd ${1} mv hstr ${HH} tar zcf ${HH}.tgz ${HH} rm -rvf ${HH} - bzr dh-make hh ${HHVERSION} ${HH}.tgz + bzr dh-make -v hh ${HHVERSION} ${HH}.tgz } -rm -rvf *.*~ +rm -rvf *.*~ ./debian mkdir ${HHBUILD} cd ${HHBUILD} -init_hh -cd dist -#echo "Continue by editing debian/changes and dist/ directory: 1-dist.sh" +branch_hh `pwd` +#init_hh `pwd` + +cd hh/dist +./2-deb.sh + +echo -e "\n\nContinue by editing debian/changes and dist/ directory: 3-deb-push.sh\n" # eof