From 6804503b9bd057fae67294bb8ca95c9f10e00194 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 26 Jun 2005 09:56:37 +0000 Subject: * merged/removed conflicts with apt--main--0 Patches applied: * apt@packages.debian.org/apt--main--0--patch-80 Merge michael.vogt@ubuntu.com--2005/apt--fixes--0 * apt@packages.debian.org/apt--main--0--patch-81 Open 0.6.37 * apt@packages.debian.org/apt--main--0--patch-82 merge bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-83 Update changelog * apt@packages.debian.org/apt--main--0--patch-84 Fix build of French man pages (now using XML, not SGML) * apt@packages.debian.org/apt--main--0--patch-85 Merge patch from Philippe Batailler for French man page build * apt@packages.debian.org/apt--main--0--patch-86 add Welsh translations from Dafydd Harries * apt@packages.debian.org/apt--main--0--patch-87 Update changelog * apt@packages.debian.org/apt--main--0--patch-88 Change debian/bugscript to use #!/bin/bash (Closes: #313402) * apt@packages.debian.org/apt--main--0--patch-89 Branch for Debian * apt@packages.debian.org/apt--main--0--patch-90 Update version in configure * apt@packages.debian.org/apt--main--0--patch-91 Fix French man page build * apt@packages.debian.org/apt--main--0--patch-92 Add the current Debian archive signing key * bubulle@debian.org--2005/apt--main--0--patch-66 Italian translation complete * bubulle@debian.org--2005/apt--main--0--patch-67 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-68 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-69 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-70 Re-generate the POT and PO files from sources * bubulle@debian.org--2005/apt--main--0--patch-71 Update French translation * bubulle@debian.org--2005/apt--main--0--patch-72 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-73 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-74 Hebres translation update * bubulle@debian.org--2005/apt--main--0--patch-75 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-76 Correct the Hebrew translation for #306658 * bubulle@debian.org--2005/apt--main--0--patch-77 Update French man pages translations * bubulle@debian.org--2005/apt--main--0--patch-78 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-79 Correct syntax errors in Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-80 Revert changes to debian/changelog and debian/apt.cron.daily * bubulle@debian.org--2005/apt--main--0--patch-81 Portuguese translation update * daf@muse.19inch.net--2005/apt--main--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-85 * daf@muse.19inch.net--2005/apt--main--0--patch-1 add Welsh translation * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6 * build fix for apt--main--0 * philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1 Passage sous arch * philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1 fix xml error --- debian/apt.postinst | 2 +- debian/bugscript | 2 +- debian/changelog | 32 +++++++++++++++++++++++++++++--- debian/rules | 2 +- 4 files changed, 32 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..ae1801198 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/bugscript b/debian/bugscript index 8423e07c2..f5ec9e05d 100755 --- a/debian/bugscript +++ b/debian/bugscript @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e # reportbug #169495 if [ -z "$YESNO" ]; then diff --git a/debian/changelog b/debian/changelog index 681684daa..28dfe0e58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,35 @@ -apt (0.6.37) breezy; urgency=low - +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 Sat, 25 Jun 2005 09:51:00 -0700 + +apt (0.6.37) breezy; urgency=low - -- Michael Vogt Mon, 23 May 2005 23:02:50 +0200 + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 + - patch-66: Italian update + - patch-71: French update + - patch-73: Basque update + - patch-74: Hebrew update + - patch-76: Correct Hebrew translation (Closes: #306658) + - patch-77: French man page update + - patch-79: Correct syntax errors in Hebrew translation + - patch-81: Portuguese update + * Fix build of French man pages (now using XML, not SGML) + * Add Welsh translation from Dafydd Harries + (daf@muse.19inch.net--2005/apt--main--0--patch-1) + * Change debian/bugscript to use #!/bin/bash (Closes: #313402) + + -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 apt (0.6.36ubuntu1) breezy; urgency=low @@ -59,6 +84,7 @@ apt (0.6.34) hoary; urgency=low -- Matt Zimmerman Fri, 4 Mar 2005 16:13:15 -0800 +>>>>>>> MERGE-SOURCE apt (0.6.33) hoary; urgency=low * Merge michael.vogt@ubuntu.com--2005/apt--mvo--0 (through patch-6) diff --git a/debian/rules b/debian/rules index e3254c2d2..d6ae540ee 100755 --- a/debian/rules +++ b/debian/rules @@ -209,7 +209,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + cp share/*.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog -- cgit v1.2.3-70-g09d2