Sfoglia il codice sorgente

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

David Kalnischkies 14 anni fa
parent
commit
335e2c82af
3 ha cambiato i file con 3 aggiunte e 5 eliminazioni
  1. 1 3
      debian/changelog
  2. 1 1
      methods/http.cc
  3. 1 1
      methods/https.cc

+ 1 - 3
debian/changelog

@@ -5,6 +5,7 @@ apt (0.9.4) UNRELEASED; urgency=low
     - after many years of pointless discussions disable http/1.1 pipelining
     - after many years of pointless discussions disable http/1.1 pipelining
       by default as many webservers and proxies seem to be unable to conform
       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)
       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:
   * apt-pkg/pkgcachegen.cc:
     - make IsDuplicatedDescription static so that it is really private
     - 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
       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:
   * apt-pkg/algorithms.cc:
     - fix memory leak of Flags in pkgSimulate by a proper destructor
     - 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
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 11 May 2012 23:26:59 +0200
 
 
 apt (0.9.3) unstable; urgency=low
 apt (0.9.3) unstable; urgency=low

+ 1 - 1
methods/http.cc

@@ -758,7 +758,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }
    }
    Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
    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)
    if (Debug == true)
       cerr << Req << endl;
       cerr << Req << endl;

+ 1 - 1
methods/https.cc

@@ -219,7 +219,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_USERAGENT,
    curl_easy_setopt(curl, CURLOPT_USERAGENT,
 	_config->Find("Acquire::https::User-Agent",
 	_config->Find("Acquire::https::User-Agent",
 		_config->Find("Acquire::http::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
    // set timeout
    int const timeout = _config->FindI("Acquire::https::Timeout",
    int const timeout = _config->FindI("Acquire::https::Timeout",