From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 27 Jun 2007 11:15:46 +0000 (+0200)
Subject: * fixed compile errors with g++ 7.3 (thanks to
X-Git-Tag: 0.7.24ubuntu1~178
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/9e830fd5e9c71c384275f0c63dfe80595723d614

* 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)
---

9e830fd5e9c71c384275f0c63dfe80595723d614
diff --cc configure.in
index 59e3d6fe1,34d4dcc78..d20c79680
--- a/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.2ubuntu1")
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.2")
++AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu2")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --cc debian/changelog
index fccdaf90e,ea8113e95..50c050dcb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,11 +1,35 @@@
 -apt (0.7.3) unstable; urgency=low
++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
    
diff --cc debian/control
index 7dc0b377f,760c0176f..ffb387b62
--- a/debian/control
+++ b/debian/control
@@@ -1,13 -1,12 +1,13 @@@
  Source: apt
  Section: admin
  Priority: important
 -Maintainer: APT Development Team <deity@lists.debian.org>
 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 +XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
  Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
  Standards-Version: 3.7.2.2
- Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5)
+ Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5)
  Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
 -XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 +XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/apt/ubuntu
  
  Package: apt
  Architecture: any