* merged with apt--ubuntu--0

Patches applied:

 * apt@packages.debian.org/apt--ubuntu--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-88

 * apt@packages.debian.org/apt--ubuntu--0--patch-1
   Merge from Debian branch

 * apt@packages.debian.org/apt--ubuntu--0--patch-2
   0.6.38ubuntu1

 * apt@packages.debian.org/apt--ubuntu--0--patch-3
   Merge with mainline

 * apt@packages.debian.org/apt--ubuntu--0--patch-4
   Improved arch-build rule

 * apt@packages.debian.org/apt--ubuntu--0--patch-5
   Merge with mainline

 * apt@packages.debian.org/apt--ubuntu--0--patch-6
   Merge with mvo

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-79

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-1
   * merged with mainline and apt--fixes--0

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-2
   * patch from aj (slighly modified to use auto_ptr<>) applied

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-3
   * changelog updated

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-4
   * work for arch=all packages too now

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-87

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-1
   * report timeouts (from Connect) and fail if they happen in pkgAcqMetaSig 

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-2
   * merged with the fixes branch to make it build again

 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-1
   tag of apt@packages.debian.org/apt--main--0--patch-88

 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-2
   * merged apt--mvo (to make pining on components work again)

 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-3
   * merged with apt--fixes--0 (to make the building of the french manpages work and to fix a incorrect man-page example

 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-4
   * merged with the bts225947 code

 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-5
   * merged the imporoved timoeut handling patch

 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-6
   * merged with matt

 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-7
   * removed another conflict with apt--main

2 files changed, 34 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index ad775c230..78559fd56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.39) unstable; urgency=low
+apt (0.6.38ubuntu1mvo1) unstable; urgency=low
 
   * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
   * Merge mvo's changes from 0.6.36ubuntu1:
@@ -6,8 +6,38 @@ apt (0.6.39) unstable; urgency=low
   * Merge aggregated translation updates:
     bubulle@debian.org--2005/apt--main--0
   * Update priority of apt-utils to important, to match the override file
+  * Michael Vogt
+    - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+    - Fix a incorrect example in the man-page (closes: #282918)
+    - Support architecture-specific extra overrides 
+      (closes: #225947). Thanks to  Anthony Towns for idea and 
+      the patch, thanks to Colin Watson for testing it.
+    - better report network timeouts from the methods to the acuire code, 
+      only timeout once per sources.list line 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Jun 2005 11:18:24 +0200
+
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+  * First release from Ubuntu branch
+  * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 25 Jun 2005 16:52:41 -0700
 
- -- 
+apt (0.6.38) unstable; urgency=low
+
+  * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
+    for the French man pages' failure to build
+  * Branch Debian and Ubuntu
+    - apt.postinst, apt-key: use the appropriate keyring
+    - debian/rules: install all keyrings
+  * Add the current Debian archive signing key (4F368D5D) to
+    debian-archive.gpg
+  * make pinning on the "component" work again (using the section of the 
+    archive, we don't use per-section Release files anymore with apt-0.6)
+    (closes ubuntu #9935)
+  
+ -- Matt Zimmerman <mdz@debian.org>  Sat, 25 Jun 2005 09:51:00 -0700
 
 apt (0.6.38) unstable; urgency=low
 
@@ -24,6 +54,7 @@ apt (0.6.38) unstable; urgency=low
   
  -- Matt Zimmerman <mdz@debian.org>  Sat, 25 Jun 2005 09:51:00 -0700
 
+>>>>>>> MERGE-SOURCE
 apt (0.6.37) breezy; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81
diff --git a/debian/rules b/debian/rules
index d6ae540ee..ee02baeb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -336,4 +336,4 @@ arch-build:
 	mkdir -p debian/arch-build/apt-$(APT_DEBVER)
 	baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER)
 	$(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc
-	(cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG))
+	(cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)