From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 6 Sep 2006 17:25:51 +0000 (+0200)
Subject: * merged from the auto-install branch
X-Git-Tag: 0.7.24ubuntu1~238
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/59e4486eb632f4e56eb336fe5a7dc694059e741c

* merged from the auto-install branch
---

59e4486eb632f4e56eb336fe5a7dc694059e741c
diff --cc debian/rules
index 333d4ad5b,6a142e759..ffc23402e
--- a/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$@