My FBReader mini-fork
=====================

In general, see http://bazaar-vcs.org/TrackingUpstream


Importing new upstream version
------------------------------

./import-upstream.sh $version
cd upstream
bzr commit -m "imported upstream version $version"

cd ../mg
bzr merge ../upstream
# review changes, fix conflicts
# change ./fbreader/VERSION
# update distributions/debian/maemo2/changelog
# update distributions/debian/maemo4/changelog
# change description in distributions/debian/maemo2/control
# change description in distributions/debian/maemo4/control
bzr commit -m "merge from upstream"

# double-check my changes
bzr diff -r ancestor:../upstream > ../fbreader-$version-mg.diff


Making changes
--------------

update distributions/debian/maemo2/changelog
update distributions/debian/maemo4/changelog
update distributions/debian/maemo2/control
update distributions/debian/maemo4/control
update diff from upstream


Building an armel package
-------------------------

# assumes a setup described in
# http://inz.fi/blog/2007/10/22/multi-target-development-for-maemo/
# plus a symlink ~/scratchbox -> /scratchbox/users/mg/home/mg/

mount --bind mg ~/scratchbox/src/fbreader-mg
sb-conf se bora-armel # or mistral-armel, or chinook-armel
# short version
/scratchbox/login -d src/fbreader-mg ./build-maemo2.sh # maemo4 for chinook


Publishing debs
---------------

distro=mistral # or bora, or chinook
mv ~/www/fbreader/mg/*_armel.deb ~/www/770/dists/$distro/user/binary-armel/
mv ~/www/fbreader/mg/*.dsc       ~/www/770/dists/$distro/user/source/
mv ~/www/fbreader/mg/*.tar.gz    ~/www/770/dists/$distro/user/source/
~/www/770/rescan-packages.sh