--- apt.old/debian/rules	Sun Nov  9 00:18:35 2008
+++ /opt/emdebian/trunk/a/apt/trunk/apt-0.7.18/debian/rules	Sun Nov  9 00:34:35 2008
@@ -22,6 +22,10 @@
   confflags += --build $(DEB_HOST_GNU_TYPE)
 else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+  LIBSTDCPP_VER:=$(shell objdump -p /usr/$(DEB_HOST_GNU_TYPE)/lib/libstdc++.so.6 |grep SONAME | sed -e 's/.*SONAME.*libstdc++\(-libc.*\(-.*\)\)\?.so.\(.*\)/\3\2/')
+  GLIBC_VER:=$(shell grep __GLIBC_MINOR__ /usr/$(DEB_HOST_GNU_TYPE)/include/features.h | grep define | cut -f 3)
+  confflags += LIBSTDCPP_VER=$(LIBSTDCPP_VER) GLIBC_VER=libc6.$(GLIBC_VER)
+  confflags += ac_cv_glibc_ver=libc6.$(GLIBC_VER)
 endif
 
 # See below
@@ -127,13 +131,13 @@
 #	dh_testroot
 	[ -f Makefile ] && $(MAKE) clean
 	[ -f Makefile ] && $(MAKE) distclean
-
+	${RM} -r debian/apt-locale-*
 	rm -rf build
 
 	# Add here commands to clean up after the build process.
 	dh_clean debian/copyright debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils
 
-binary-indep: apt-doc libapt-pkg-doc
+binary-indep: 
 # Build architecture-independent files here.
 libapt-pkg-doc: build-doc debian/shlibs.local
 	dh_testdir -p$@
@@ -143,17 +147,11 @@
 #
 # libapt-pkg-doc install
 #	
-	dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
-                            $(BLD)/docs/files* $(BLD)/docs/method* \
-			    doc/libapt-pkg2_to_3.txt doc/style.txt
-	dh_installexamples -p$@
 #	dh_installmenu -p$@
 #	dh_installinit -p$@
 #	dh_installcron -p$@
-#	dh_installman -p$@
 
 #	dh_undocumented -p$@
-	dh_installchangelogs -p$@
 	dh_strip -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
@@ -171,9 +169,6 @@
 # apt-doc install
 #
 	# Copy the guides
-	dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \
-	               $(BLD)/docs/offline*.text $(BLD)/docs/offline*.html
-	dh_installchangelogs -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
@@ -206,9 +201,9 @@
 	cp $(BLD)/bin/methods/* debian/$@/usr/lib/apt/methods/
 	# https has its own package
 	rm debian/$@/usr/lib/apt/methods/https
-
+	rm debian/$@/usr/bin/apt-mark
 	cp $(BLD)/scripts/dselect/* debian/$@/usr/lib/dpkg/methods/apt/
-	cp -r $(BLD)/locale debian/$@/usr/share/
+	rm debian/$@/usr/lib/dpkg/methods/apt/setup
 
 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
 	cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
@@ -225,17 +220,13 @@
 	rm -f build/po/*.pot
 	rm -f po/*.pot
 
-	dh_installexamples -p$@ $(BLD)/docs/examples/*
-	dh_installman -p$@ 
 	dh_installcron -p$@
-	dh_installdocs -p$@
-	dh_installchangelogs -p$@
 	dh_strip -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_makeshlibs -p$@ -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)'
 	dh_installdeb -p$@
-	dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt
+	dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib:`pwd`/build/bin -- -Ldebian/shlibs.local.apt
 	dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
 	dh_md5sums -p$@
 	dh_builddeb -p$@
@@ -253,13 +244,10 @@
 #	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$@
 #	dh_installmenu -p$@
 #	dh_installinit -p$@
 #	dh_installcron -p$@
-#	dh_installman -p$@
 
-	dh_installchangelogs -p$@
 	dh_strip -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
@@ -280,19 +268,12 @@
 	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$@
-	dh_installexamples -p$@
-
-	# Install the man pages..
-	dh_installman -p$@
-
-	dh_installchangelogs -p$@
 	dh_strip -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_makeshlibs -m$(LIBAPTINST_MAJOR) -V '$(LIBAPTINST_PROVIDE)' -p$@
 	dh_installdeb -p$@
-	dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils
+	dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib:`pwd`/build/bin -- -Ldebian/shlibs.local.apt-utils
 	dh_gencontrol -p$@ -u -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
 	dh_md5sums -p$@
 	dh_builddeb -p$@
@@ -306,19 +287,11 @@
 	# install the method
 	mkdir -p debian/$@/usr/lib/apt/methods
 	cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods
-
-	dh_installdocs -p$@
-	dh_installexamples -p$@
-
-	# Install the man pages..
-	dh_installman -p$@
-
-	dh_installchangelogs -p$@
 	dh_strip -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib 
+	dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib:`pwd`/build/bin 
 	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@