add spaces around PACKAGE_VERSION to fix FTBFS with -std=c++11

diff --git a/debian/changelog b/debian/changelog
index 64af5bf6075b5677cbe605206ad229828a49970e..bcc29eb86ee7f921ac527832479e2dee9970f2bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apt (0.9.4) UNRELEASED; urgency=low
     - after many years of pointless discussions disable http/1.1 pipelining
       by default as many webservers and proxies seem to be unable to conform
       to specification must's (rfc2616 section 8.1.2.2) (LP: #996151)
     - after many years of pointless discussions disable http/1.1 pipelining
       by default as many webservers and proxies seem to be unable to conform
       to specification must's (rfc2616 section 8.1.2.2) (LP: #996151)

+    - add spaces around PACKAGE_VERSION to fix FTBFS with -std=c++11

   * apt-pkg/pkgcachegen.cc:
     - make IsDuplicatedDescription static so that it is really private
       as we don't need a symbol for it as it is not in a header
   * apt-pkg/pkgcachegen.cc:
     - make IsDuplicatedDescription static so that it is really private
       as we don't need a symbol for it as it is not in a header


@@ -42,9 +43,6 @@ apt (0.9.4) UNRELEASED; urgency=low
   * apt-pkg/algorithms.cc:
     - fix memory leak of Flags in pkgSimulate by a proper destructor
 
   * apt-pkg/algorithms.cc:
     - fix memory leak of Flags in pkgSimulate by a proper destructor
 

-  [ David Kalnischkies ]
-  * 
-

  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 11 May 2012 23:26:59 +0200
 
 apt (0.9.3) unstable; urgency=low
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 11 May 2012 23:26:59 +0200
 
 apt (0.9.3) unstable; urgency=low

diff --git a/methods/http.cc b/methods/http.cc
index c8e6f1b7b51903e35aa818f990b05d4d3377bee0..acf25a42a06b4eb11c222ea4e3d4fa1c99bc6fc0 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -758,7 +758,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }
    Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }
    Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",

-               "Debian APT-HTTP/1.3 ("PACKAGE_VERSION")") + "\r\n\r\n";
+               "Debian APT-HTTP/1.3 (" PACKAGE_VERSION ")") + "\r\n\r\n";

    
    if (Debug == true)
       cerr << Req << endl;
    
    if (Debug == true)
       cerr << Req << endl;

diff --git a/methods/https.cc b/methods/https.cc
index fac7ba7907eab896027cd7d743f6e0ad901d10d5..c1a49ba6093b621743dd2726f329d79f1f3eeff9 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -219,7 +219,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_USERAGENT,
        _config->Find("Acquire::https::User-Agent",
                _config->Find("Acquire::http::User-Agent",
    curl_easy_setopt(curl, CURLOPT_USERAGENT,
        _config->Find("Acquire::https::User-Agent",
                _config->Find("Acquire::http::User-Agent",

-                       "Debian APT-CURL/1.0 ("PACKAGE_VERSION")").c_str()).c_str());
+                       "Debian APT-CURL/1.0 (" PACKAGE_VERSION ")").c_str()).c_str());

 
    // set timeout
    int const timeout = _config->FindI("Acquire::https::Timeout",
 
    // set timeout
    int const timeout = _config->FindI("Acquire::https::Timeout",