Merge branch 'branch-1.2' into debian

diff --combined debian/rules
index a4cbe2c112147f66a3078cc62f9c6dba11c207e6,122a0fed2349bfcc7cbe9895e8fe9b095c730888..4e927977fe8a9f55481cd355f669409bf240e569
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -3,10 -3,17 +3,10 @@@
  
  export DH_VERBOSE=1
  PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
 -DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; fi | tr - +)
  
  # this target invoked by git-buildpackage using a clean hook, see .gbp.conf
  prebuild:
 -      echo $(DEB_VERSION)
 -      git-dch --release --new-version=$(DEB_VERSION) --multimaint-merge
 -      git log > ChangeLog
 -      git commit -n ChangeLog debian/changelog \
 -              -m "update changelogs for Debian build"
 -#     git tag debian/$(DEB_VERSION)
 -#     git push --tags origin master
 +      echo "not frobbing changelog for official builds"
  
  configure: configure-stamp
  configure-stamp:
@@@ -20,7 -27,7 +20,7 @@@ build-indep: build-stam
  
  build-stamp: configure-stamp  
        dh_testdir
-       $(MAKE) VERSION=$(PKG_VERSION)
+       $(MAKE)
        (cd doc ; $(MAKE))
        touch $@