Browse Source

Merge with Matt

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

 * apt@packages.debian.org/apt--main--0--patch-93
   Merge with mvo

 * apt@packages.debian.org/apt--main--0--patch-94
   Update changelog

 * apt@packages.debian.org/apt--main--0--patch-95
   Merge Christian's branch

 * apt@packages.debian.org/apt--main--0--patch-96
   Update changelog

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6
   * build fix for apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22
   * added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23
   * apt-cache show <virtual-pkg> shows all virtual packages instead of nothing (thanks to otavio)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24
   * changelog updated

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25
   * make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27
   * updated the changelog 

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28
   * merged with my apt--fixes--0 branch

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29
   * added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30
   * fix a stupid bug in the depcache::Init() code

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31
   * merged/removed conflicts with apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32
   * merged apt--main and make sure that the po files come from apt--main (because they are more recent)
debian/1.8.y
Christian Perrier 18 years ago
parent
commit
b6fbb08776
  1. 4
      apt-pkg/deb/debindexfile.cc
  2. 11
      apt-pkg/deb/deblistparser.cc
  3. 3
      apt-pkg/deb/deblistparser.h
  4. 3
      apt-pkg/depcache.cc
  5. 6
      cmdline/apt-key
  6. 2
      configure.in
  7. 2
      debian/apt.postinst
  8. 25
      debian/changelog
  9. 2
      debian/control
  10. 2
      debian/rules
  11. 46
      doc/fr/makefile
  12. BIN
      share/debian-archive.gpg

4
apt-pkg/deb/debindexfile.cc

@ -24,7 +24,7 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/debmetaindex.h>
#include <sys/stat.h>
/*}}}*/
@ -290,7 +290,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const
FileFd Rel(ReleaseFile,FileFd::ReadOnly);
if (_error->PendingError() == true)
return false;
Parser.LoadReleaseInfo(File,Rel);
Parser.LoadReleaseInfo(File,Rel,Section);
}
return true;

11
apt-pkg/deb/deblistparser.cc

@ -564,13 +564,20 @@ bool debListParser::Step()
// ---------------------------------------------------------------------
/* */
bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,
FileFd &File)
FileFd &File, string component)
{
pkgTagFile Tags(&File, File.Size() + 256); // XXX
pkgTagSection Section;
if (Tags.Step(Section) == false)
return false;
//mvo: I don't think we need to fill that in (it's unused since apt-0.6)
//FileI->Architecture = WriteUniqString(Arch);
// apt-secure does no longer download individual (per-section) Release
// file. to provide Component pinning we use the section name now
FileI->Component = WriteUniqString(component);
const char *Start;
const char *Stop;
if (Section.Find("Suite",Start,Stop) == true)
@ -589,7 +596,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,
if (Section.FindFlag("NotAutomatic",FileI->Flags,
pkgCache::Flag::NotAutomatic) == false)
_error->Warning("Bad NotAutomatic flag");
return !_error->PendingError();
}
/*}}}*/

3
apt-pkg/deb/deblistparser.h

@ -55,7 +55,8 @@ class debListParser : public pkgCacheGenerator::ListParser
virtual bool Step();
bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File);
bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File,
string section);
static const char *ParseDepends(const char *Start,const char *Stop,
string &Package,string &Ver,unsigned int &Op,

3
apt-pkg/depcache.cc

@ -91,6 +91,9 @@ bool pkgDepCache::Init(OpProgress *Prog)
}
Update(Prog);
if(Prog != 0)
Prog->Done();
return true;
}

6
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

2
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)

2
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
;;

25
debian/changelog

@ -1,3 +1,28 @@
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
* Merge mvo's changes from 0.6.36ubuntu1:
michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32
* Merge aggregated translation updates:
bubulle@debian.org--2005/apt--main--0
--
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.37) breezy; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-81

2
debian/control

@ -2,7 +2,7 @@ Source: apt
Section: admin
Priority: important
Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>
Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
Standards-Version: 3.6.1
Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12)
Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)

2
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

46
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 $< $@

BIN
share/debian-archive.gpg

Binary file not shown.
Loading…
Cancel
Save