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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-09-15 20:03:57 +0300 (Mon, 15 Sep 2008)
New Revision: 16118

Modified:
   projects/haf/trunk/apt/maemostrip.patch
Log:
Updated patch for 0.7.14.


Modified: projects/haf/trunk/apt/maemostrip.patch
===================================================================
--- projects/haf/trunk/apt/maemostrip.patch	2008-09-15 17:03:01 UTC (rev 16117)
+++ projects/haf/trunk/apt/maemostrip.patch	2008-09-15 17:03:57 UTC (rev 16118)
@@ -1,18 +1,17 @@
 Index: debian/control
 ===================================================================
---- debian/control	(revision 14875)
+--- debian/control	(revision 16116)
 +++ debian/control	(working copy)
-@@ -4,8 +4,7 @@
+@@ -4,7 +4,7 @@ Priority: important
  Maintainer: APT Development Team <deity at lists.debian.org>
  Uploaders: Jason Gunthorpe <jgg at debian.org>, Adam Heath <doogie at debian.org>, Matt Zimmerman <mdz at debian.org>, Michael Vogt <mvo at debian.org>, Otavio Salvador <otavio at debian.org>
  Standards-Version: 3.7.2.2
--Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5)
--Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
+-Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12-1), xsltproc, docbook-xsl, xmlto
 +Build-Depends: debhelper (>= 5.0), gettext (>= 0.12)
  XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
  
  Package: apt
-@@ -24,15 +23,6 @@
+@@ -23,15 +23,6 @@ Description: Advanced front-end for dpkg
   APT features complete installation ordering, multiple source capability
   and several other unique features, see the Users Guide in apt-doc.
  
@@ -28,7 +27,7 @@
  Package: libapt-pkg-dev
  Architecture: any
  Priority: optional
-@@ -43,14 +33,6 @@
+@@ -42,14 +33,6 @@ Description: Development files for APT's
   developing with APT's libapt-pkg Debian package manipulation
   library and the libapt-inst deb/tar/ar library.
  
@@ -43,7 +42,7 @@
  Package: apt-utils
  Architecture: any
  Depends: ${shlibs:Depends}
-@@ -65,12 +47,3 @@
+@@ -64,12 +47,3 @@ Description: APT utility programs
   apt-extracttemplates is used by debconf to prompt for configuration 
   questions before installation. apt-ftparchive is used to create Package
   and other index files. apt-sortpkgs is a Package/Source file normalizer.
@@ -58,9 +57,9 @@
 - use 'deb https://foo distro main' lines in the sources.list.
 Index: debian/rules
 ===================================================================
---- debian/rules	(revision 14875)
+--- debian/rules	(revision 16116)
 +++ debian/rules	(working copy)
-@@ -133,7 +133,7 @@
+@@ -133,7 +133,7 @@ clean:
  	# 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
  
@@ -69,16 +68,16 @@
  # Build architecture-independent files here.
  libapt-pkg-doc: build-doc debian/shlibs.local
  	dh_testdir -p$@
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ apt-doc: build-doc
  
  # Build architecture-dependent files here.
  
--binary-arch: apt-transport-https apt libapt-pkg-dev apt-utils
-+binary-arch: apt libapt-pkg-dev apt-utils # apt-transport-https 
+-binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
++binary-arch: apt libapt-pkg-dev apt-utils # apt-transport-https
  apt: build debian/shlibs.local
  	dh_testdir -p$@
  	dh_testroot -p$@
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@ apt: build debian/shlibs.local
  	cp $(BLD)/bin/apt-* debian/$@/usr/bin/
  
  	# Remove the bits that are in apt-utils
@@ -87,7 +86,16 @@
  
  	# install the shared libs
  	find $(BLD)/bin/ -type f -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
-@@ -219,7 +219,7 @@
+@@ -205,7 +205,7 @@ apt: build debian/shlibs.local
+ 
+ 	cp $(BLD)/bin/methods/* debian/$@/usr/lib/apt/methods/
+ 	# https has its own package
+-	rm debian/$@/usr/lib/apt/methods/https
++	rm -f debian/$@/usr/lib/apt/methods/https
+ 
+ 	cp $(BLD)/scripts/dselect/* debian/$@/usr/lib/dpkg/methods/apt/
+ 	cp -r $(BLD)/locale debian/$@/usr/share/
+@@ -222,7 +222,7 @@ apt: build debian/shlibs.local
  	rm -f build/po/*.pot
  	rm -f po/*.pot
  
@@ -96,7 +104,7 @@
  	dh_installman -p$@ 
  	dh_installcron -p$@
  	dh_installdocs -p$@
-@@ -273,7 +273,9 @@
+@@ -276,7 +276,9 @@ apt-utils: build debian/shlibs.local
  	find $(BLD)/bin/ -type f -name "libapt-inst*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
  	find $(BLD)/bin/ -type l -name "libapt-inst*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
  
@@ -109,9 +117,9 @@
  
 Index: methods/makefile
 ===================================================================
---- methods/makefile	(revision 14875)
+--- methods/makefile	(revision 16116)
 +++ methods/makefile	(working copy)
-@@ -53,11 +53,11 @@
+@@ -53,11 +53,11 @@ SOURCE = http.cc rfc2553emu.cc connect.c
  include $(PROGRAM_H)
  
  # The https method
@@ -130,9 +138,9 @@
  PROGRAM=ftp
 Index: Makefile
 ===================================================================
---- Makefile	(revision 14875)
+--- Makefile	(revision 16116)
 +++ Makefile	(working copy)
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ all headers library clean veryclean bina
  	$(MAKE) -C cmdline $@
  	$(MAKE) -C ftparchive $@
  	$(MAKE) -C dselect $@