* cmdline/apt-get.cc:

  - make the XS-Vcs-$foo warning more copy'n'paste
    friendly (thanks to Matt Zimmerman)

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc configure.in
index d20c796805830561985b87dd03fff5b5ab62b68a,34d4dcc78b1702a4281c4b57e373e8f4920b938e..e92f3ffd2aba731d7fb6db7e3a48b2df87a6a5ea
--- 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)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu2")
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.2")
++AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu3")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index 84cf54d7520d383a3afd69636de237aeb140bb23,41609bd743fae69e48c1296197873df0a4e5bae4..e14f154995e8d99682fde760d0d00c9d57ad4948
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,3 +1,52 @@@
++apt (0.7.2ubuntu4) unstable; urgency=low
++
++  * cmdline/apt-get.cc:
++    - make the XS-Vcs-$foo warning more copy'n'paste
++      friendly (thanks to Matt Zimmerman)
++
++ --
++
 +apt (0.7.2ubuntu3) gutsy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix InstallTask code when a pkgRecord ends 
 +      with a single '\n' (thanks to Soren Hansen for reporting)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Jun 2007 13:33:38 +0200
 +
 +apt (0.7.2ubuntu2) gutsy; urgency=low
 +
 +  * fixed compile errors with g++ 7.3 (thanks to 
 +    Daniel Burrows, closes: #429378)
 +  * fix FTFBFS by changing build-depends to
 +    libcurl4-gnutls-dev (closes: #428363)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Jun 2007 13:47:03 +0200
 +
 +apt (0.7.2ubuntu1) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - apport integration added, this means that a apport
 +      report is written on dpkg failures
 +  * cmdline/apt-get.cc:
 +    - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
 +      this will warn when Vcs- headers are found on apt-get source
 +      (Fixes LP:#115959)
 +  * merged from debian/unstable, remaining changes:
 +    - maintainer field changed
 +    - merged the apt--mirror branch 
 +      http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/
 +    - apport reporting on package install/upgrade/remove failure
 +    - support for "Originial-Maintainer" field
 +    - merged apt--xs-vcs-bzr branch
 +      (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/)
 +    - use ubuntu archive keyring by default
 +    - debian/apt.conf.autoremove
 +      + install recommands for section "metapackages"
 +      + do not mark direct dependencies of "metapackages" as autoremoved
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jun 2007 10:38:36 +0200
 +
  apt (0.7.2) unstable; urgency=low
    
    * merged the debian/experimental changes back