merged previous bzr commit

diff --combined configure.in
index fb58174d5c50ae273d3c225cf1f6e6bfc0a9e26c,fe2392934e81a4d1f33184c599e8ae778637f461..541d0e95fac2c43edc1a4500cbfb9680603a19cb
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  PACKAGE="apt"
- PACKAGE_VERSION="0.9.8~20130516"
 -PACKAGE_VERSION="0.9.8"
++PACKAGE_VERSION="0.9.8.1"
  PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

diff --combined debian/changelog
index f6ff4457887e1a52943f6d6738b0082366036f5d,6eb44a47c5a514d6776a7386ec3b384b33cd170a..625519fffae0d28f5bed720ce0dff78f62a1a817
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,4 +1,16 @@@
- apt (0.9.8) UNRELEASED; urgency=low
 +apt (0.9.8.1) UNRELEASED; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/indexcopy.cc:
 +    - non-inline RunGPGV methods to restore ABI compatibility with previous
 +      versions to fix partial upgrades (Closes: #707771)
 +  
 +  [ Michael Vogt ]
 +  * moved to git, updated gbp.conf to match the bzr version
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 11 May 2013 09:53:59 +0200
 +
+ apt (0.9.8) unstable; urgency=low
  
    [ Ludovico Cavedon ]
    * properly handle if-modfied-since with libcurl/https 
@@@ -79,7 -67,7 +79,7 @@@
        directive ("DIRECT") in apt.conf
      - disregard all_proxy environment variable, like other methods
    
-  -- Michael Vogt <mvo@debian.org>  Mon, 08 Apr 2013 08:43:21 +0200
+  -- Michael Vogt <mvo@debian.org>  Wed, 08 May 2013 18:43:28 +0200
  
  apt (0.9.7.9~exp2) experimental; urgency=low