summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-05-21 19:20:03 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-05-21 19:20:03 +0200
commit9c30a078c04fe1e86b0aea64cc9cb790e95a7c57 (patch)
treec36790770a73a4523871ca69c11ffa4e61cadabf
parent07d95bc7558cc96b15d633c920d498d855718699 (diff)
downloadapt-9c30a078c04fe1e86b0aea64cc9cb790e95a7c57.tar.gz
* debian/rules:
- move internal-solver as 'apt' to his friend dump-solver in /usr/lib/apt/solvers to avoid writing a manpage for it
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/rules5
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 69ac5bde2..7af0dd75f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ apt (0.9.5) UNRELEASED; urgency=low
* debian/control:
- moving debiandoc-sgml to Build-Depends-Indep was one step too much
for the buildds as we still build two sgml files in arch:any
+ * debian/rules:
+ - move internal-solver as 'apt' to his friend dump-solver in
+ /usr/lib/apt/solvers to avoid writing a manpage for it
-- David Kalnischkies <kalnischkies@gmail.com> Mon, 21 May 2012 15:10:49 +0200
diff --git a/debian/rules b/debian/rules
index 7b221fc2a..ee001fe12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ override BLD := ./build
endif
# APT Programs in apt-utils
-APT_UTILS=ftparchive sortpkgs extracttemplates internal-solver
+APT_UTILS=ftparchive sortpkgs extracttemplates
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -191,7 +191,7 @@ apt: build build-manpages
dh_install -p$@ --sourcedir=$(BLD)
# Remove the bits that are in apt-utils
- rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver)
+ rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver internal-solver)
# https has its own package
rm debian/$@/usr/lib/apt/methods/https
@@ -245,6 +245,7 @@ apt-utils: build build-manpages
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)
dh_link -p$@