From d9e050800067f16ba49cb6932d7a52a6de22ab9d Mon Sep 17 00:00:00 2001
From: Matt Zimmerman <matt.zimmerman@canonical.com>
Date: Sat, 25 Jun 2005 23:52:00 +0000
Subject: [PATCH] Merge from Debian branch Patches applied:
* 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
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6
* build fix for apt--main--0
---
cmdline/apt-key | 6 ++---
configure.in | 2 +-
debian/apt.postinst | 2 +-
debian/changelog | 12 ++++++++++
debian/rules | 2 +-
doc/fr/makefile | 46 +++++++++++++++++++++++++++++++++++++--
po/he.po | 4 ++--
share/debian-archive.gpg | Bin 477 -> 1303 bytes
8 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/cmdline/apt-key b/cmdline/apt-key
index be2b19a1a..0685e36f7 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring
GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the ubuntu-keyring package installed?"
+ echo >&2 "Is the debian-keyring package installed?"
exit 1
fi
diff --git a/configure.in b/configure.in
index 767399b52..aa827cec1 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.37")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.38")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
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/changelog b/debian/changelog
index 57b746a56..be201057c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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
+
+ -- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700
+
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 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
diff --git a/doc/fr/makefile b/doc/fr/makefile
index 6544ee9e0..c0e7fa7ed 100644
--- a/doc/fr/makefile
+++ b/doc/fr/makefile
@@ -8,6 +8,48 @@ include ../../buildlib/defaults.mak
# Man pages
SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \
sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \
- apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1
+ apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 \
+ apt-key.fr.8
+
INCLUDES = apt.ent.fr
-include $(XML_MANPAGE_H)
+
+doc: $(SOURCE)
+
+$(SOURCE) :: % : %.xml $(INCLUDES)
+ echo Creating man page $@
+ $(XMLTO) man $<
+
+apt-cache.fr.8:: apt-cache.8
+ cp $< $@
+
+apt-get.fr.8:: apt-get.8
+ cp $< $@
+
+apt-cdrom.fr.8:: apt-cdrom.8
+ cp $< $@
+
+apt.conf.fr.5:: apt.conf.5
+ cp $< $@
+
+apt-config.fr.8:: apt-config.8
+ cp $< $@
+
+sources.list.fr.5:: sources.list.5
+ cp $< $@
+
+apt-sortpkgs.fr.1:: apt-sortpkgs.1
+ cp $< $@
+
+apt-ftparchive.fr.1:: apt-ftparchive.1
+ cp $< $@
+
+apt_preferences.fr.5:: apt_preferences.5
+ cp $< $@
+
+apt-extracttemplates.fr.1:: apt-extracttemplates.1
+ cp $< $@
+
+apt-key.fr.8:: apt-key.8
+ cp $< $@
+
+
diff --git a/po/he.po b/po/he.po
index e2aea1c77..242155eff 100644
--- a/po/he.po
+++ b/po/he.po
@@ -639,8 +639,8 @@ msgstr "×× ×צ××× ××ª×§× ×ª××××ת"
#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr ""
-+"× × × ×¨ ×: ××××××ת ××××× ××ת ××××ת ××סר×\n"
-+"×¢× ×פע××× ××עש×ת *רק* ×× ××ª× ××××¢ ×× ××ª× ×¢×ש×!"
+"× × × ×¨ ×: ××××××ת ××××× ××ת ××××ת ××סר×\n"
+"×¢× ×פע××× ××עש×ת *רק* ×× ××ª× ××××¢ ×× ××ª× ×¢×ש×!"
#: cmdline/apt-get.cc:658
msgid " Done"
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg
index 0db59e6742568ac83770e3e022d2aa0897f8ffdb..c391d8fa1e71897bfec9564216101b0f22b77114 100644
GIT binary patch
delta 800
zcmV+*1K<4J1D6W0-2s1@0ipy!{lI7u1OU7bgS&DM%?vxw*ku07<@|Q&O3*j4ge<+`
zG|e{7w_$@FTrzQqj#b<{d-lCqc*(LfM^+Yl>fhh=hw6~P^4qcAUapK}{c|1$%>Ow9
z`xKv_)gqo<ZoGTy>G8T#@6;Y%cp5oET~$RaX3gcVAe5iMcWi%DPq~qJ4J#}GRVf1i
zpuh`m2H^pe*}$riG$+zf8bU~VtpopB4AW4vuli(khJ^<p{)zD?(iSc$!Q-fMe0x<D
zferp-_Vs?(O&7C=bY?rWO-&z_RW&(0>e+@3&QDQs%$UJ>tNzb0n?z#kH}U}|mH_^X
zTHL%6vA9!Q>8O8EnV}O&9r|YRb#I3!NQwqMjIj43M8H;EF?{L>aSGdG=qUo51OI(*
z*qy#I8o?RgZWW<}?I4=Qez}sbq6`l4;-s2cDS_sOE_1z_wctBd9en#t7wr2xHXJ~h
zZ3T5)P%FXRCEWjbmuCu^=-Siz8}XS)Md4y@)|_W3pb03N2Vp)cj-6`BO)kP|{Viwc
zN(Niq<A-j4MmyR2cANkDpojKBw%*K<jVpgODIh#%bZ~89b97~LKxAcNX<=?IZ*pfo
zh+PB|5dr`m1p-0+z-R>t0pT-%1q%lX0|WyV0|EmU0s#USfB*^!5b@PLj88U=U8p+%
zpsQP&(Lwbi*B04LO4T~dP45mDDFB~Qm;kcp+e#-j;W|P~u(6W-O=umk0ssSuoCJRm
z0RaF81p-0+!g~M;2@r4kj`<z26yWf$1O6rP(K0-}uy!e(KdO(Z_1cT2!?o*KmZz5(
zIZVm+BI_1KrCpfW<!?d_c~~`e#Da1Ph}36^{$$0tHk9^?=vIhWQA@QZ7T(x8W5$Q}
z^c6{!h1f*T2sx694&^c>8t$k)6ESRUCwGvsMTHkYjvr@eq8jC*h_vd|bl845brE~8
z0ssJrMg$WP0ssaD0zv)5^Z*J85IYyVbSh3hsyA~0pqu%jheN-RaSFgi5VUqg@8!~Y
e>;RuoIZ9Ce(TDL&olX*{!D>V1+!6+`0ssI?er*B(
delta 7
OcmbQvb(eX=T}A*5i~|q=
--
2.47.2