diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:25 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:25 +0100 |
| commit | 3b13b8a0b79d625d2913518529a34e92b4f41539 (patch) | |
| tree | 404745c04c1eb4548bd6151034229c98d97d36f6 /apt-inst | |
| parent | 4935c8af8acd8856211c0a527bf4dec4dace0d08 (diff) | |
| parent | e1024dc0acf72b9615c0821f005364543775a58a (diff) | |
Merge branch 'pu/abi6'
Diffstat (limited to 'apt-inst')
| -rw-r--r-- | apt-inst/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 4 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.h | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/apt-inst/CMakeLists.txt b/apt-inst/CMakeLists.txt index 31da115e4..55950679a 100644 --- a/apt-inst/CMakeLists.txt +++ b/apt-inst/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${PROJECT_BINARY_DIR}/include/apt-pkg) # Set the version of the library -set(MAJOR 2.0) +set(MAJOR 3.0) set(MINOR 0) set(APT_INST_MAJOR ${MAJOR} PARENT_SCOPE) diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 42032ad13..9bb0a55c0 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -76,10 +76,6 @@ ExtractTar::~ExtractTar() } /*}}}*/ // ExtractTar::Done - Reap the gzip sub process /*{{{*/ -bool ExtractTar::Done(bool) -{ - return Done(); -} bool ExtractTar::Done() { return InFd.Close(); diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index c0b340e89..adde21352 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -48,7 +48,6 @@ class ExtractTar // Fork and reap gzip bool StartGzip(); bool Done(); - APT_DEPRECATED_MSG("Parameter Force is ignored, use Done() instead.") bool Done(bool Force); public: |