Browse Source

move 'dump' solver from apt-utils to apt package

tags/debian/1.3_exp2
David Kalnischkies 4 years ago
parent
commit
ab07af708e
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      apt-private/private-main.cc
  2. +2
    -2
      debian/control
  3. +1
    -1
      debian/rules

+ 1
- 1
apt-private/private-main.cc View File

@@ -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:


+ 2
- 2
debian/control View File

@@ -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


+ 1
- 1
debian/rules View File

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


Loading…
Cancel
Save