[maemo-commits] [maemo-commits] r16126 - projects/haf/trunk/apt/debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-09-15 21:02:01 +0300 (Mon, 15 Sep 2008)
New Revision: 16126

Modified:
   projects/haf/trunk/apt/debian/apt.postinst
   projects/haf/trunk/apt/debian/changelog
   projects/haf/trunk/apt/debian/control
   projects/haf/trunk/apt/debian/rules
Log:
  * Applied notdebian.patch


Modified: projects/haf/trunk/apt/debian/apt.postinst
===================================================================
--- projects/haf/trunk/apt/debian/apt.postinst	2008-09-15 18:00:40 UTC (rev 16125)
+++ projects/haf/trunk/apt/debian/apt.postinst	2008-09-15 18:02:01 UTC (rev 16126)
@@ -16,12 +16,6 @@
 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)

Modified: projects/haf/trunk/apt/debian/changelog
===================================================================
--- projects/haf/trunk/apt/debian/changelog	2008-09-15 18:00:40 UTC (rev 16125)
+++ projects/haf/trunk/apt/debian/changelog	2008-09-15 18:02:01 UTC (rev 16126)
@@ -2,6 +2,7 @@
 
   * Applied maemostrip.patch
   * Applied postrip.patch
+  * Applied notdebian.patch
   * Applied http-tablet-identification.patch
   
  -- Marius Vollmer <marius.vollmer at nokia.com>  Mon, 15 Sep 2008 19:50:25 +0300

Modified: projects/haf/trunk/apt/debian/control
===================================================================
--- projects/haf/trunk/apt/debian/control	2008-09-15 18:00:40 UTC (rev 16125)
+++ projects/haf/trunk/apt/debian/control	2008-09-15 18:02:01 UTC (rev 16126)
@@ -9,7 +9,7 @@
 
 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}

Modified: projects/haf/trunk/apt/debian/rules
===================================================================
--- projects/haf/trunk/apt/debian/rules	2008-09-15 18:00:40 UTC (rev 16125)
+++ projects/haf/trunk/apt/debian/rules	2008-09-15 18:02:01 UTC (rev 16126)
@@ -213,7 +213,7 @@
 	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