Просмотр исходного кода

* 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 лет назад: 14
Родитель
Сommit
9c30a078c0
2 измененных файлов с 6 добавлено и 2 удалено
  1. 3 0
      debian/changelog
  2. 3 2
      debian/rules

+ 3 - 0
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
 

+ 3 - 2
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$@