[maemo-commits] [maemo-commits] r16125 - projects/haf/trunk/apt

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-09-15 21:00:40 +0300 (Mon, 15 Sep 2008)
New Revision: 16125

Added:
   projects/haf/trunk/apt/notdebian.patch
Log:
New.


Added: projects/haf/trunk/apt/notdebian.patch
===================================================================
--- projects/haf/trunk/apt/notdebian.patch	2008-09-15 17:32:10 UTC (rev 16124)
+++ projects/haf/trunk/apt/notdebian.patch	2008-09-15 18:00:40 UTC (rev 16125)
@@ -0,0 +1,43 @@
+Index: debian/control
+===================================================================
+--- debian/control	(revision 16117)
++++ debian/control	(working copy)
+@@ -9,7 +9,7 @@ XS-Vcs-Bzr: http://bzr.debian.org/apt/de
+ 
+ Package: apt
+ Architecture: any
+-Depends: ${shlibs:Depends}, debian-archive-keyring
++Depends: ${shlibs:Depends}
+ Priority: important
+ Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
+ Provides: ${libapt-pkg:provides}
+Index: debian/rules
+===================================================================
+--- debian/rules	(revision 16120)
++++ debian/rules	(working copy)
+@@ -213,7 +213,7 @@ apt: build debian/shlibs.local
+ 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
+ 	cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
+ 
+-	cp share/debian-archive.gpg debian/$@/usr/share/$@
++	# cp share/debian-archive.gpg debian/$@/usr/share/$@
+ 	cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
+ #	head -n 500 ChangeLog > debian/ChangeLog
+ 
+Index: debian/apt.postinst
+===================================================================
+--- debian/apt.postinst	(revision 16116)
++++ debian/apt.postinst	(working copy)
+@@ -16,12 +16,6 @@ set -e
+ case "$1" in
+     configure)
+ 
+-        if ! test -f /etc/apt/trusted.gpg; then
+-                cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
+-        fi
+-
+-	apt-key update
+-
+     ;;
+ 
+     abort-upgrade|abort-remove|abort-deconfigure)