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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-09-15 19:35:27 +0300 (Mon, 15 Sep 2008)
New Revision: 16115

Added:
   projects/haf/trunk/apt/maemostrip.patch
Removed:
   projects/haf/trunk/apt/maemostrip.diff
Log:
Renamed for consitency.


Deleted: projects/haf/trunk/apt/maemostrip.diff
===================================================================
--- projects/haf/trunk/apt/maemostrip.diff	2008-09-15 16:32:47 UTC (rev 16114)
+++ projects/haf/trunk/apt/maemostrip.diff	2008-09-15 16:35:27 UTC (rev 16115)
@@ -1,143 +0,0 @@
-Index: debian/control
-===================================================================
---- debian/control	(revision 14875)
-+++ debian/control	(working copy)
-@@ -4,8 +4,7 @@
- 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), gettext (>= 0.12)
- XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
- 
- Package: apt
-@@ -24,15 +23,6 @@
-  APT features complete installation ordering, multiple source capability
-  and several other unique features, see the Users Guide in apt-doc.
- 
--Package: apt-doc
--Architecture: all
--Priority: optional
--Replaces: apt (<< 0.5.4.9)
--Section: doc
--Description: Documentation for APT
-- This package contains the user guide and offline guide, for APT, an
-- Advanced Package Tool.
--
- Package: libapt-pkg-dev
- Architecture: any
- Priority: optional
-@@ -43,14 +33,6 @@
-  developing with APT's libapt-pkg Debian package manipulation
-  library and the libapt-inst deb/tar/ar library.
- 
--Package: libapt-pkg-doc
--Architecture: all
--Priority: optional
--Section: doc
--Description: Documentation for APT development
-- This package contains documentation for development of the APT
-- Debian package manipulation program and its libraries.
--
- Package: apt-utils
- Architecture: any
- Depends: ${shlibs:Depends}
-@@ -65,12 +47,3 @@
-  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.
--
--Package: apt-transport-https
--Architecture: any
--Depends: ${shlibs:Depends}
--Priority: optional
--Section: admin
--Description: APT https transport
-- This package contains a APT https transport. It makes it possible to
-- use 'deb https://foo distro main' lines in the sources.list.
-Index: debian/rules
-===================================================================
---- debian/rules	(revision 14875)
-+++ debian/rules	(working copy)
-@@ -133,7 +133,7 @@
- 	# 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
- 
--binary-indep: apt-doc libapt-pkg-doc
-+binary-indep: # apt-doc libapt-pkg-doc
- # Build architecture-independent files here.
- libapt-pkg-doc: build-doc debian/shlibs.local
- 	dh_testdir -p$@
-@@ -185,7 +185,7 @@
- 
- # 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 
- apt: build debian/shlibs.local
- 	dh_testdir -p$@
- 	dh_testroot -p$@
-@@ -197,7 +197,7 @@
- 	cp $(BLD)/bin/apt-* debian/$@/usr/bin/
- 
- 	# Remove the bits that are in apt-utils
--	rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS))
-+	rm -f $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS))
- 
- 	# install the shared libs
- 	find $(BLD)/bin/ -type f -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
-@@ -219,7 +219,7 @@
- 	rm -f build/po/*.pot
- 	rm -f po/*.pot
- 
--	dh_installexamples -p$@ $(BLD)/docs/examples/*
-+	# dh_installexamples -p$@ $(BLD)/docs/examples/*
- 	dh_installman -p$@ 
- 	dh_installcron -p$@
- 	dh_installdocs -p$@
-@@ -273,7 +273,9 @@
- 	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/ \;
- 
--	cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
-+	for f in $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)); do \
-+	  cp $$f debian/$@/usr/bin/ || true; \
-+	done
- 	dh_installdocs -p$@
- 	dh_installexamples -p$@
- 
-Index: methods/makefile
-===================================================================
---- methods/makefile	(revision 14875)
-+++ methods/makefile	(working copy)
-@@ -53,11 +53,11 @@
- include $(PROGRAM_H)
- 
- # The https method
--PROGRAM=https
--SLIBS = -lapt-pkg -lcurl
--LIB_MAKES = apt-pkg/makefile
--SOURCE = https.cc
--include $(PROGRAM_H)
-+#PROGRAM=https
-+#SLIBS = -lapt-pkg -lcurl
-+#LIB_MAKES = apt-pkg/makefile
-+#SOURCE = https.cc
-+#include $(PROGRAM_H)
- 
- # The ftp method
- PROGRAM=ftp
-Index: Makefile
-===================================================================
---- Makefile	(revision 14875)
-+++ Makefile	(working copy)
-@@ -17,7 +17,7 @@
- 	$(MAKE) -C cmdline $@
- 	$(MAKE) -C ftparchive $@
- 	$(MAKE) -C dselect $@
--	$(MAKE) -C doc $@
-+#	$(MAKE) -C doc $@
- 	$(MAKE) -C po $@
- 
- # Some very common aliases

Copied: projects/haf/trunk/apt/maemostrip.patch (from rev 16114, projects/haf/trunk/apt/maemostrip.diff)


Property changes on: projects/haf/trunk/apt/maemostrip.patch
___________________________________________________________________
Name: svn:mergeinfo
   +