Join with aliencode

Author: jgg
Date: 2001-02-20 07:03:16 GMT
Join with aliencode

11 files changed, 254 insertions, 49 deletions

diff --git a/debian/apt-utils.dirs b/debian/apt-utils.dirs
new file mode 100644
index 000000000..14f5b95d7
--- /dev/null
+++ b/debian/apt-utils.dirs
@@ -0,0 +1,2 @@
+usr/lib
+usr/bin
diff --git a/debian/changelog b/debian/changelog
index b723440da..5cd0dbfd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,104 @@
-apt (0.3.19) frozen unstable; urgency=low
-
-  * Added --dry-run to match docs. Closes: #65153, #64292
+apt (0.5.0) unstable; urgency=low
+
+  * Fixed an obscure bug with missing final double new lines in 
+    package files
+  * Changed the apt-cdrom index copy routine to use the new section
+    rewriter
+  * Added a package file sorter, apt-sortpkgs
+  * Parse obsolete Optional dependencies.
+  * Added Ben's rsh method. Closes: #57794
+  * Added IPv6 FTP support and better DNS rotation support.
+  * Include the server IP in error messages when using a DNS rotation.
+    Closes: #64895
+  * Made most of the byte counters into doubles to prevent 32bit overflow.
+    Closes: #65349
+  * HTTP Authorization. Closes: #61158
+  * Ability to parse and return source index build depends from Randolph.
+  * new 'apt-get build-dep' command from Randolph. Closes: #63982
+  * Added apt-ftparchive the all dancing all singing FTP archive
+    maintinance program
+  * Allow version specifications with =1.2.4-3 and /2.2 or /stable postfixes
+    in apt-get. 
+  * Removed useless internal cruft including the xstatus file.
+  * Fixed config parser bugs. Closes: #67848, #71108
+  * Brain Damanged apt-get config options changed, does not change the command
+    line interface, except to allow --enable-* to undo a configuration
+    option:
+      No-Remove -> Remove
+      No-Download -> Download
+      No-Upgrade -> Upgrade
+  * Made this fix configable (DSelect::CheckDir) and default to disabled:
+     * No remove prompt if the archives dir has not changed. Closes: #55709
+    Because it is stupid in the case where no files were downloaded due to
+    a resumed-aborted install, or a full cache! Closes: #65952
   * Obscure divide by zero problem. Closes: #64394
   * Update sizetable for mips. Closes: #62288
   * Fixed a bug with passive FTP connections
   * Has sizetable entry for sparc64. Closes: #64869
+  * Escape special characters in the ::Label section of the cdroms.lst
+  * Created apt-utils and python-apt packages
+  * Due to the new policy engine, the available file may contain entries
+    from the status file. These are generated if the package is not obsolete
+    but the policy engine prohibits using the version from the package files. 
+    They can be identified by the lack of a Filename field.
+  * The new policy engine. Closes: #66509, #66944, #45122, #45094, #40006,
+    #36223, #33468, #22551
+  * Fixed deb-src line for non-us. Closes: #71501, #71601
+  * Fixes for G++ 2.96, s/friend/friend class/
+  * Fixed mis doc of APT::Get::Fix-Missing. Closes: #69269
+  * Confirmed fix for missing new line problem. Closes: #69386
+  * Fixed up dhelp files. Closes: #71312
+  * Added some notes about dselect and offline usage. Closes: #66473, #38316
+  * Lock files on read only file systems are ignored w/ warning. 
+    Closes: #61701
+  * apt-get update foo now gives an error! Closes: #42891
+  * Added test for shlibs on hurd. Closes: #71499
+  * Clarified apt-cache document. Closes: #71934
+  * DocBook SGML man pages and some improvements in the text.. 
+  * sigwinch thing. Closes: #72382
+  * Caching can be turned off by setting the cache file names blank.
+  * Ignores arches it does not know about when autocleaning. Closes: #72862
+  * New function in apt-config to return dirs, files, bools and integers.
+  * Fixed an odd litle bug in MarkInstall and fixed it up to handle 
+    complex cases involving OR groups and provides.
+    68754 describes confusing messages which are the result of this..
+    Closes: #63149, #69394, #68754, #77683, #66806, #81486, #78712
+  * Speeling mistake and return code for the 'wicked' resolver error
+    Closes: #72621, #75226, #77464
+  * Solved unable to upgrade libc6 from potato to woody due to 3 package
+    libc6 dependency loop problem.
+  * Leading sources.list spaces. Closes: #76010
+  * Removed a possible infinite loop while processing installations.
+  * Man page updates. Closes: #75411, #75560, #64292, #78469
+  * ReduceSourceList bug. Closes: #76027
+  * --only-source option. Closes: #76320
+  * Typos. Closes: #77812, #77999
+  * Different status messages. Closes: #76652, #78353
+  * /etc/apt/apt.conf.d/ directory for Joey and Matt and pipe protocol 2
+  * OS detection an support for the new pseduo standard of os-arch for the
+    Architecture string. Also uses regexing.. Closes: #39227, #72349
+  * Various i18n stuff. Note that this still needs some i18n wizard
+    to do the last gettextization right. Closes: #62386
+  * Fixed a problem with some odd http servers/proxies that did not return
+    the content size in the header. Closes: #79878, #44379
+  * Little acquire bugs. Closes: #77029, #55820
+  * _POSIX_THREADS may not be defined to anything, just defined..
+    Closes: #78996
+  * Spelling of Ignore-Hold correctly. Closes: #78042
+  * Unlock the dpkg db if in download only mode. Closes: #84851
+  * Brendan O'Dea's dselect admindir stuff. Closes: #62811
+  * Patch from BenC. Closes: #80810
+  * Single output of some names in lists. Closes: #80498, #43286  
+  * Nice message for people who can't read syserror output. Closes: #84734
+  * OR search function. Closes: #82894
+  * User's guide updates. Closes: #82469  
+  * The AJ/JoeyH var/state to var/lib transition patch. Closes: #59094
+  * Various CD bugs, again thanks to Greenbush 
+    Closes: #80946, #76547, #71810, #70049, #69482
+  * Using potato debhelper. Closes: #57977
+  * I cannot self-terminate. Closes: #74928
   
- -- Ben Gertzfield <che@debian.org>  Fri, 12 May 2000 21:10:54 -0700
+ -- Jason Gunthorpe <jgg@debian.org>  Wed, 25 Oct 2000 00:11:06 -0600
  
 apt (0.3.19) frozen unstable; urgency=low
   
diff --git a/debian/control b/debian/control
index 365c6bef0..00e35ee59 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,13 @@ Section: admin
 Priority: standard
 Maintainer: APT Development Team <deity@lists.debian.org>
 Standards-Version: 3.1.1
-Build-Depends: debhelper, debiandoc-sgml
+Build-Depends: debhelper, debiandoc-sgml, python-dev, libdb2-dev
 
 Package: apt
 Architecture: any
 Depends: ${shlibs:Depends}
 Priority: standard
-Conflicts: deity
-Replaces: deity, libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
+Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: libapt-pkg${libapt-pkg:major}
 Suggests: dpkg-dev
 Description: Advanced front-end for dpkg
@@ -37,3 +36,12 @@ Priority: optional
 Description: Documentation for APT development
  This package contains documentation for development of the APT
  Debian package manipulation program and its libraries.
+
+Package: apt-utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Priority: optional
+Provides: libapt-inst${libapt-inst:major}
+Description: APT utility programs
+ This package contains some infrequently used APT utility programs such
+ as apt-ftparchive and apt-sortpkgs.
diff --git a/debian/dhelp b/debian/dhelp
index e24a7c08d..091c49956 100644
--- a/debian/dhelp
+++ b/debian/dhelp
@@ -3,10 +3,10 @@
 <dirtitle>Debian Utilities
 <linkname>APT User's Guide
 <filename>guide.html/index.html
-<descrip>
+<description>
 The APT User's Guide provides an overview of how to use the the APT package
 manager, and provides a detailed look at the apt-get tool.
-</descrip>
+</description>
 </item>
 
 <item>
@@ -14,8 +14,8 @@ manager, and provides a detailed look at the apt-get tool.
 <dirtitle>Debian Utilities
 <linkname>APT Offline Usage Guide
 <filename>offline.html/index.html
-<descrip>
+<description>
 The APT Offline Usage Guide provides detailed instructions and examples
 of how to use APT on an unconnected computer.
-</descrip>
+</description>
 </item>
diff --git a/debian/dirs b/debian/dirs
index 1551a2083..fd2a36929 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -3,4 +3,4 @@ usr/lib/apt/methods
 usr/lib/dpkg/methods/apt
 etc/apt
 var/cache/apt/archives/partial
-var/state/apt/lists/partial
+var/lib/apt/lists/partial
diff --git a/debian/libapt-pkg-doc.dhelp b/debian/libapt-pkg-doc.dhelp
index 7458cd09b..7c93c736b 100644
--- a/debian/libapt-pkg-doc.dhelp
+++ b/debian/libapt-pkg-doc.dhelp
@@ -3,7 +3,7 @@
 <dirtitle>Development Tools
 <linkname>APT Cache Specification
 <filename>../apt/cache.html/index.html
-<descrip>
+<description>
 The APT Cache Specification describes the complete implementation and 
 format of the APT Cache file. The APT Cache file is a way for APT to parse 
 and store a large number of package files for display in the UI. It's primary
@@ -11,7 +11,7 @@ design goal is to make display of a single package in the tree very
 fast by pre-linking important things like dependencies and provides.
 The specification doubles as documentation for one of the in-memory
 structures used by the package library and the APT GUI.
-</descrip>
+</description>
 </item>
 
 <item>
@@ -19,11 +19,11 @@ structures used by the package library and the APT GUI.
 <dirtitle>Development Tools
 <linkname>APT Design Document
 <filename>../apt/design.html/index.html
-<descrip>
+<description>
 The APT Design Document is an overview of the specifications and design goals 
-of the APT project. It also attempts to give a broad description of the
+of the APT project. It also attempts to give a broad descriptiontion of the
 implementation as well.
-</descrip>
+</description>
 </item>
 
 <item>
@@ -31,10 +31,10 @@ implementation as well.
 <dirtitle>Development Tools
 <linkname>DPkg Technical Manual
 <filename>../apt/design.html/index.html
-<descrip>
+<description>
 The DPkg Technical Manual gives an overview of dpkg's external functions
 and describes how it views the world.
-</descrip>
+</description>
 </item>
  
 <item>
@@ -42,11 +42,11 @@ and describes how it views the world.
 <dirtitle>Development Tools
 <linkname>APT Files
 <filename>../apt/files.html/index.html
-<descrip>
+<description>
 The APT Files document describes the complete implementation and format of 
 the installed APT directory structure. It also serves as guide to how
 APT views the Debian archive.     
-</descrip>
+</description>
 </item>
  
 <item>
@@ -54,8 +54,8 @@ APT views the Debian archive.
 <dirtitle>Development Tools
 <linkname>APT Method Interface
 <filename>../apt/method.html/index.html
-<descrip>
+<description>
 The APT Method Interface document describes the interface that APT uses to 
 the archive access methods.
-</descrip>
+</description>
 </item>
diff --git a/debian/postrm b/debian/postrm
index 625280034..b1bb971d4 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -13,8 +13,8 @@ case "$1" in
 		echo -n "Removing APT cache and state files... "
 		echo -n "/var/cache/apt"
 		rm -rf /var/cache/apt
-		echo -n ", /var/state/apt"
-		rm -rf /var/state/apt
+		echo -n ", /var/lib/apt"
+		rm -rf /var/lib/apt
 		echo ". Done."
 esac
 
diff --git a/debian/preinst b/debian/preinst
new file mode 100755
index 000000000..141db6e45
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+# dpkg does this for us while we are upgrading..
+#if [ "$1" = "upgrade" -a -L /var/state/apt -a -e /var/lib/apt -a ! -L /var/state/apt ] && dpkg --compare-versions "$2" ">=" "0.4.10"; then
+#  rm /var/state/apt
+#fi
+
+if [ "$1" = "upgrade" -o "$1" = "install" -a "$2" != "" ]; then
+  if [ ! -e /var/lib/apt -a -e /var/state/apt ]; then
+    # upgrading from /var/state/apt using apt.
+    # it's probably running now so we want to ensure /var/state/apt
+    # is still valid afterwards. and since we're upgrading
+
+    if [ -x /usr/bin/perl -a -d /var/state/apt -a ! -L /var/state/apt ] &&
+      perl -e 'exit 1 if ((stat("/var/lib"))[0] != (stat("/var/state/apt"))[0])'
+    then
+      # same fs, we can mv it
+      mv /var/state/apt /var/lib/apt
+      ln -s ../lib/apt /var/state/apt
+      # note that this symlink (/var/state/apt) will be removed when
+      # dpkg finishes unpacking the apt we're about to install; this is okay
+    else
+      # scary, let's just symlink it and hope
+      ln -s /var/state/apt /var/lib/apt
+    fi
+  fi
+  touch /var/lib/apt/lists/partial/.delete-me-later || true
+fi
diff --git a/debian/prerm b/debian/prerm
new file mode 100755
index 000000000..64b3635c5
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] && 
+   dpkg --compare-versions "$2" "<<" 0.4.10
+then
+  if [ ! -d /var/state/apt/ ]; then
+    ln -s /var/lib/apt /var/state/apt
+    touch /var/lib/apt/lists/partial/.delete-me-later
+  fi
+fi
+  
diff --git a/debian/python-apt.dirs b/debian/python-apt.dirs
new file mode 100644
index 000000000..621814dff
--- /dev/null
+++ b/debian/python-apt.dirs
@@ -0,0 +1 @@
+usr/lib/python1.5/site-packages
diff --git a/debian/rules b/debian/rules
index d194ba1cf..13912e9f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,10 @@
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.23 2000/06/04 05:37:30 doogie Exp $
+# $Id: rules,v 1.24 2001/02/20 07:03:17 jgg Exp $
 
+# LD_LIBRARY_PATH=pwd/debian/tmp/usr/lib dh_shlibdeps -papt
+# dpkg: /home/jgg/work/apt2/debian/tmp/usr/lib/libapt-pkg.so.2.9 not found.
 
 # For the deb builder, you can run 'debian/rules cvs-build', which does all
 # steps nescessary to produce a proper source tarball with the CVS/ removed.
@@ -12,6 +14,12 @@
 # create ../upload-<VER>, with all the files needed to be uploaded placed
 # in it.
 
+# See below
+include build/environment.mak
+
+# Default rule
+build:
+
 DEB_BUILD_PROG:=debuild -us -uc
 APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
@@ -31,6 +39,7 @@ ifeq ($(words $(BLD)),0)
 override BLD := ./build
 endif
 
+# Rebuild configure.in to have the correct version from the change log
 ifneq ($(APT_DEBVER),$(APT_CONFVER))
 .PHONY: configure.in
 configure.in:
@@ -39,27 +48,46 @@ else
 configure.in:
 endif
 
+# APT Programs in apt-utils
+APT_UTILS=ftparchive sortpkgs
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # Find the libapt-pkg major version for use in other control files
-export LIBAPT_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '=' -f 2)
+export LIBAPTPKG_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '=' -f 2)
+export LIBAPTINST_MAJOR:=$(shell egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)
 debian/shlibs.local: apt-pkg/makefile
-	rm -f $@
-	echo "libapt-pkg $(LIBAPT_MAJOR) libapt-pkg$(LIBAPT_MAJOR)" >> $@
-	echo "libapt-pkg $(LIBAPT_MAJOR) apt $(APT_DEBVER)" >> $@
+        # We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and
+	# one for the rest of the packages. This ensures that each package gets
+	# the right overrides.. 
+	rm -rf $@ $@.apt $@.apt-utils
+	echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt
+
+	echo "libapt-pkg $(LIBAPTPKG_MAJOR) libapt-pkg$(LIBAPTPKG_MAJOR)" > $@.apt-utils
+	echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils
 
-build: build-stamp
-build-stamp: configure
+	echo "libapt-pkg $(LIBAPTPKG_MAJOR) libapt-pkg$(LIBAPTPKG_MAJOR)" > $@
+	echo "libapt-inst $(LIBAPTINST_MAJOR) libapt-inst$(LIBAPTINST_MAJOR)" >> $@
+	
+build: build/build-stamp	
+
+# Note that this is unconditionally done first as part of loading environment.mak
+# The true is needed to force make to reload environment.mak after running
+# configure-stamp. Otherwise we can get stale or invalid, or missing config data.
+build/environment.mak: build/configure-stamp
+	@true
+	
+configure: configure.in
+build/configure-stamp: configure
 	dh_testdir
 	-mkdir build
 	(cd build; ../configure)
-#	cd build && CXXFLAGS="-g -Wall -D_POSIX_C_SOURCE=199309" ../configure --disable-nls --disable-static --prefix=/usr
-#	cd build && make all-hdr
-#	cd build && make -s
+	touch $@
 
+build/build-stamp: build/configure-stamp
 	# Add here commands to compile the package.
-	$(MAKE)
+	$(MAKE) -s
 	touch $@
 
 clean:
@@ -67,7 +95,8 @@ clean:
 #	dh_testroot
 	rm -f build-stamp debian/shlibs.local
 	rm -rf build
-
+	rm -f debian/shlibs.local.apt debian/shlibs.local.apt-utils
+	
 	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
 	-$(MAKE) distclean
@@ -84,7 +113,8 @@ libapt-pkg-doc: build debian/shlibs.local
 # libapt-pkg-doc install
 #	
 	dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
-                            $(BLD)/docs/files* $(BLD)/docs/method*
+                            $(BLD)/docs/files* $(BLD)/docs/method* \
+			    doc/libapt-pkg2_to_3.txt doc/style.txt
 			    
 	-cp -a debian/libapt-pkg-doc.dhelp debian/libapt-pkg-doc/usr/doc/libapt-pkg-doc/.dhelp
 	-cp -a debian/libapt-pkg-doc.dhelp debian/libapt-pkg-doc/usr/share/doc/libapt-pkg-doc/.dhelp
@@ -102,14 +132,14 @@ libapt-pkg-doc: build debian/shlibs.local
 	dh_fixperms -p$@
 #	dh_suidregister -p$@
 	dh_installdeb -p$@
-	dh_gencontrol -p$@ -u -Vlibapt-pkg:major=${LIBAPT_MAJOR}
+	dh_gencontrol -p$@ -u -Vlibapt-pkg:major=$(LIBAPTPKG_MAJOR)
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
 
 # Build architecture-dependent files here.
 
-binary-arch: apt libapt-pkg-dev
+binary-arch: apt libapt-pkg-dev apt-utils 
 apt: build debian/shlibs.local
 	dh_testdir -p$@
 	dh_testroot -p$@
@@ -120,6 +150,9 @@ apt: build debian/shlibs.local
 #
 	cp $(BLD)/bin/apt-* debian/tmp/usr/bin/
 	
+	# Remove the bits that are in apt-utils
+	rm $(addprefix debian/tmp/usr/bin/apt-,$(APT_UTILS))
+	
 	# install the shared libs
 	find $(BLD)/bin/ -type f -name "libapt-pkg.so.*" -exec cp -a "{}" debian/tmp/usr/lib/ \;
 	find $(BLD)/bin/ -type l -name "libapt-pkg.so.*" -exec cp -a "{}" debian/tmp/usr/lib/ \;
@@ -129,26 +162,27 @@ apt: build debian/shlibs.local
 	cp $(BLD)/scripts/dselect/* debian/tmp/usr/lib/dpkg/methods/apt/
 
 	# Copy the guides
-	dh_installdocs -p$@ $(BLD)/docs/guide.text $(BLD)/docs/guide.html \
+	dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \
 	               $(BLD)/docs/offline.text $(BLD)/docs/offline.html
 	
 	# One or the other..
 	-cp -a debian/dhelp debian/tmp/usr/doc/apt/.dhelp
-	-cp -a debian/dhelp debian/tmp/usr/share/doc/apt/.dhelp 
+	-cp -a debian/dhelp debian/tmp/usr/share/doc/apt/.dhelp
 	
 #	head -n 500 ChangeLog > debian/ChangeLog
 
 	dh_installexamples -p$@ $(BLD)/docs/examples/*
-	dh_installmanpages -p$@
+	dh_installmanpages -p$@ apt-ftparchive.1 apt-sortpkgs.1
 
 	dh_installchangelogs -p$@
 	dh_strip -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	LD_LIBRARY_PATH=`pwd`/debian/tmp/usr/lib dh_shlibdeps -papt
-	dh_gencontrol -p$@ -u -Vlibapt-pkg:major=${LIBAPT_MAJOR}
-	dh_makeshlibs -m${LIBAPT_MAJOR} -Vlibapt-pkg${LIBAPT_MAJOR} -papt
+	dh_shlibdeps -papt -l`pwd`/debian/tmp/usr/lib -- -Ldebian/shlibs.local.apt
+#	LD_LIBRARY_PATH=`pwd`/debian/tmp/usr/lib dh_shlibdeps -papt
+	dh_gencontrol -p$@ -u -Vlibapt-pkg:major=$(LIBAPTPKG_MAJOR)
+	dh_makeshlibs -m$(LIBAPTPKG_MAJOR) -V 'libapt-pkg$(LIBAPTPKG_MAJOR)' -papt
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
@@ -161,7 +195,8 @@ libapt-pkg-dev: build debian/shlibs.local
 # libapt-pkg-dev install
 #
 	cp -a $(BLD)/bin/libapt-pkg.so debian/libapt-pkg-dev/usr/lib/
-	#ln -s libapt-pkg.so.${LIBAPT_MAJOR} debian/libapt-pkg-dev/usr/lib/libapt-pkg.so
+	cp -a $(BLD)/bin/libapt-inst.so debian/libapt-pkg-dev/usr/lib/
+	#ln -s libapt-pkg.so.$(LIBAPTPKG_MAJOR) debian/libapt-pkg-dev/usr/lib/libapt-pkg.so
 	cp $(BLD)/include/apt-pkg/*.h debian/libapt-pkg-dev/usr/include/apt-pkg/
 
 	dh_installdocs -p$@
@@ -176,11 +211,39 @@ libapt-pkg-dev: build debian/shlibs.local
 	dh_fixperms -p$@
 #	dh_suidregister -p$@
 	dh_installdeb -p$@
-	dh_gencontrol -p$@ -u -Vlibapt-pkg:major=${LIBAPT_MAJOR}
+	dh_gencontrol -p$@ -u -Vlibapt-pkg:major=$(LIBAPTPKG_MAJOR)
+	dh_md5sums -p$@
+	dh_builddeb -p$@
+
+apt-utils: build debian/shlibs.local
+	dh_testdir -p$@
+	dh_testroot -p$@
+	dh_clean -p$@ -k
+	dh_installdirs -p$@
+
+	# install the shared libs
+	find $(BLD)/bin/ -type f -name "libapt-inst.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
+	find $(BLD)/bin/ -type l -name "libapt-inst.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
+
+	cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
+	dh_installdocs -p$@
+	
+	# Install the man pages..
+	mkdir -p debian/$@/usr/share/man/man1
+	cp doc/apt-sortpkgs.1 doc/apt-ftparchive.1 debian/$@/usr/share/man/man1/
+	
+	dh_installchangelogs -p$@
+	dh_strip -p$@
+	dh_compress -p$@
+	dh_fixperms -p$@
+	dh_installdeb -p$@
+	LD_LIBRARY_PATH=`pwd`/debian/tmp/usr/lib:`pwd`/debian/$@/usr/lib dh_shlibdeps -p$@ -- -Ldebian/shlibs.local.apt-utils
+	dh_gencontrol -p$@ -u -Vlibapt-inst:major=$(LIBAPTINST_MAJOR)
+	dh_makeshlibs -m$(LIBAPTINST_MAJOR) -V 'libapt-inst$(LIBAPTINST_MAJOR)' -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
-source diff:                                                                  
+source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 # Update from CVS