* merged from the auto-install branch

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/rules
index 333d4ad5b802fe935a26e768d2c3b36ccaf7592f,6a142e759a32a5f784b5bffc5ee6abb6879e8976..ffc23402ece74a6758e21cf73ee21cefc57a0bf3
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -210,15 -210,10 +210,15 @@@ apt: build debian/shlibs.loca
  
        cp debian/bugscript debian/$@/usr/share/bug/apt/script
  
 -      cp share/debian-archive.gpg debian/$@/usr/share/$@
 +      cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
- 
+       cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
  #     head -n 500 ChangeLog > debian/ChangeLog
  
 +      # make rosetta happy and remove pot files in po/ (but leave stuff
 +      # in po/domains/* untouched) and cp *.po into each domain dir
 +      rm -f build/po/*.pot
 +      rm -f po/*.pot
 +
        dh_installexamples -p$@ $(BLD)/docs/examples/*
        dh_installman -p$@ 
        dh_installcron -p$@

diff --cc methods/http.cc
Simple merge