diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-06-07 20:08:27 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-06-08 13:07:21 +0200 |
| commit | ab07af708e49c9219940ffd3e20a01c763267e03 (patch) | |
| tree | a3cecba21d4efa2bd61fdb9a837f01d9ed203520 | |
| parent | 385d9f2f23057bc5808b5e013e77ba16d1c94da4 (diff) | |
move 'dump' solver from apt-utils to apt package
| -rw-r--r-- | apt-private/private-main.cc | 2 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc index 5a5940b7e..60ba422b6 100644 --- a/apt-private/private-main.cc +++ b/apt-private/private-main.cc @@ -29,12 +29,12 @@ void InitLocale(APT_CMD const binary) /*{{{*/ case APT_CMD::APT_CACHE: case APT_CMD::APT_CDROM: case APT_CMD::APT_CONFIG: + case APT_CMD::APT_DUMP_SOLVER: case APT_CMD::APT_HELPER: case APT_CMD::APT_GET: case APT_CMD::APT_MARK: textdomain("apt"); break; - case APT_CMD::APT_DUMP_SOLVER: case APT_CMD::APT_EXTRACTTEMPLATES: case APT_CMD::APT_FTPARCHIVE: case APT_CMD::APT_INTERNAL_SOLVER: diff --git a/debian/control b/debian/control index b8f6397b2..f5c5a757b 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,8 @@ Testsuite: autopkgtest Package: apt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gpgv | gpgv2, adduser -Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~), bash-completion (<< 1:2.1-4.2+fakesync1) -Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~), apt-utils (<< 1.1.3) +Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~), bash-completion (<< 1:2.1-4.2+fakesync1), apt-utils (<< 1.3~exp2~) +Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~), apt-utils (<< 1.3~exp2~) Recommends: gnupg | gnupg2 Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt Description: commandline package manager diff --git a/debian/rules b/debian/rules index cbe7e70b6..cd21f30ef 100755 --- a/debian/rules +++ b/debian/rules @@ -190,6 +190,7 @@ apt: build-binary build-manpages debian/apt.install # Remove the bits that are in apt-utils rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver internal-solver) + cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump # https has its own package rm debian/$@/usr/lib/apt/methods/https @@ -250,7 +251,6 @@ apt-utils: build-binary build-manpages dh_installdirs -p$@ cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/ - cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump cp $(BLD)/bin/apt-internal-solver debian/$@/usr/lib/apt/solvers/apt dh_install -p$@ --sourcedir=$(BLD) |