From: Michael Vogt Date: Fri, 24 Jun 2005 14:37:24 +0000 (+0000) Subject: * merged with apt--main and apt--fixes X-Git-Tag: 0.7.24ubuntu1~254^2~23 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a0732d0baf2d71a9360a2206b94236a0e3496097 * merged with apt--main and apt--fixes 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--misc-abi-changes--0--patch-4 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6 Collapse both pkgAcquire::Run() methods into one, with a default value * 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--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1 * merged obvious fixes into the tree to make it easy for matt to merge * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2 * more merges from otavio that looks good/uncritical * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3 * merged Matts misc-abi-changes tree * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4 * finalized the changelog for a ubuntu build * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-5 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6 * build fix for apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7 * fixed incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8 * changelog udpate * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-9 * we only need to check once for xmlto * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26 * fix the cache-control header generation * otavio@debian.org--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-71 * otavio@debian.org--2005/apt--fixes--0--patch-1 Fix comments about the need of xmlto * otavio@debian.org--2005/apt--fixes--0--patch-2 Fix a compile warning * otavio@debian.org--2005/apt--fixes--0--patch-3 Sync with apt--main--0--patch-76 * otavio@debian.org--2005/apt--fixes--0--patch-4 Sync with apt--main--0--patch-78 * otavio@debian.org--2005/apt--fixes--0--patch-5 Add fixes that was wrongly included on DDTP changes. * otavio@debian.org--2005/apt--fixes--0--patch-8 Add information about the other fixes include on this branch now. * otavio@debian.org--2005/apt--fixes--0--patch-9 Merge last changes from apt--main--0. * otavio@debian.org--2005/apt--fixes--0--patch-10 Fix warnings about min/max change in gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-11 Fix remaning warnings while compiling gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-12 Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler. * 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 --- a0732d0baf2d71a9360a2206b94236a0e3496097 diff --cc configure.in index 12d3ecae7,767399b52..806e4b6ef --- a/configure.in +++ b/configure.in @@@ -181,9 -181,9 +181,6 @@@ AC_PATH_PROG(DOCBOOK2MAN,docbook2man dnl Check for the XML tools needed to build man pages AC_PATH_PROG(XMLTO,xmlto) --dnl Check for the XML tools needed to build man pages --AC_PATH_PROG(XMLTO,xmlto) -- dnl Check for YODL dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") diff --cc debian/changelog index 87e713d3d,57b746a56..7717705d3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,3 -1,36 +1,37 @@@ + apt (0.6.37) breezy; urgency=low + + * 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) ++ * Fix a incorrect example in the man-page (closes: #282918) + + -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 + + apt (0.6.36ubuntu1) breezy; urgency=low + + * make it possible to write a cache-control: no-cache header even if + no proxy is set to support transparent proxies (closes ubuntu: #10773) + + * Merge otavio@debian.org--2005/apt--fixes--0.6: + - Fix comment about the need of xmlto while building from Arch; + - Fix StatStore struct on cachedb.h to use time_t and then fix a compile + warning; + - Lock database at start of DoInstall routine to avoid concurrent + runs of install/remove and update commands (Closes: #194467) + - Fix warnings while compiling with GCC 4.0 compiler + + -- Michael Vogt Mon, 23 May 2005 11:57:53 +0200 + apt (0.6.36) experimental; urgency=low * Merge apt--mvo--0: diff --cc doc/apt_preferences.5.xml index 3e50bef8c,3e50bef8c..12b03196a --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@@ -183,7 -183,7 +183,7 @@@ belonging to any distribution whose Arc Package: * Pin: release a=unstable --Pin-Priority: 50 ++Pin-Priority: 500 The following record assigns a high priority to all package versions diff --cc doc/fr/makefile index 2b9278457,6544ee9e0..c0e7fa7ed --- a/doc/fr/makefile +++ b/doc/fr/makefile @@@ -8,6 -8,6 +8,48 @@@ include ../../buildlib/defaults.ma # 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 $(SGML_MANPAGE_H) -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 --cc po/he.po index ebab198ec,e2aea1c77..242155eff --- a/po/he.po +++ b/po/he.po @@@ -637,6 -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"