summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2005-10-25 15:43:35 +0000
committerChristian Perrier <bubulle@debian.org>2005-10-25 15:43:35 +0000
commit5ef2f78cb2506517e18554585106be6ed9eeb9b1 (patch)
treed879ed314cd59b1fe6f5502f0caf0dde4ecd4951
parent39454cbb10cc707adba05f78c87d32cdaec6a934 (diff)
parent7049e4e9ca6db15326d8a76f4f5f9ab592a925e3 (diff)
Merge with Michael and add update-po as a pre-req for binary
* po/makefile: Add update-po as a prerequisite of binary. Closes: #329910 Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78 * fix a incorrect example * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79 * revert patch from patch-59, causes all sorts of trouble * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80 * fix changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81 * be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL
-rw-r--r--apt-pkg/pkgrecords.cc5
-rw-r--r--apt-pkg/pkgrecords.h1
-rw-r--r--cmdline/apt-get.cc6
-rw-r--r--configure.in2
-rw-r--r--debian/changelog12
-rw-r--r--doc/apt_preferences.5.xml2
-rw-r--r--po/makefile2
7 files changed, 21 insertions, 9 deletions
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index 1d71d3e2f..9c2655d6a 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -42,9 +42,6 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
if (Files[I->ID] == 0)
return;
}
- // We store that to make sure that the destructor won't segfault,
- // even if the Cache object was destructed before this instance.
- PackageFileCount = Cache.HeaderP->PackageFileCount;
}
/*}}}*/
// Records::~pkgRecords - Destructor /*{{{*/
@@ -52,7 +49,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
/* */
pkgRecords::~pkgRecords()
{
- for (unsigned I = 0; I != PackageFileCount; I++)
+ for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
delete Files[I];
delete [] Files;
}
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index f31e83afe..08f004414 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -33,7 +33,6 @@ class pkgRecords
pkgCache &Cache;
Parser **Files;
- int PackageFileCount;
public:
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 3475d79ae..040f670b1 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1200,7 +1200,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end());
TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash);
}
- else if(DefRel.empty() == false)
+ else if(DefRel.empty() == false)
{
// we have a default release, try to locate the pkg. we do it like
// this because GetCandidateVer() will not "downgrade", that means
@@ -1211,6 +1211,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false;
VF++)
{
+ // extra paranioa
+ if(VF.File() == NULL)
+ continue;
+
/* If this is the status file, and the current version is not the
version in the status file (ie it is not installed, or somesuch)
then it is not a candidate for installation, ever. This weeds
diff --git a/configure.in b/configure.in
index 87dac8e47..758727f2f 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.41.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.42.1")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 6b858cdcd..9716c3836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apt (0.6.42.1) unstable; urgency=low
+
+ * fix a incorrect example in the apt_prefrences man page
+ (thanks to Filipus Klutiero, closes: #282918)
+ * apt-pkg/pkgrecords.cc:
+ - revert patch from last version, it causes trouble on alpha
+ and ia64 (closes: #335102, #335103)
+ * cmdline/apt-get.cc:
+ - be extra carefull in FindSrc (closes: #335213)
+
+ -- Michael Vogt <mvo@debian.org> Sat, 22 Oct 2005 23:44:35 +0200
+
apt (0.6.42) unstable; urgency=low
* apt-pkg/cdrom.cc:
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 12b03196a..3e50bef8c 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -183,7 +183,7 @@ belonging to any distribution whose Archive name is "<literal>unstable</literal>
<programlisting>
Package: *
Pin: release a=unstable
-Pin-Priority: 500
+Pin-Priority: 50
</programlisting>
<simpara>The following record assigns a high priority to all package versions
diff --git a/po/makefile b/po/makefile
index bb8118c77..6ad6997c0 100644
--- a/po/makefile
+++ b/po/makefile
@@ -62,7 +62,7 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
stats:
for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
-binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES)
+binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES) update-po
.PHONY: update-po
update-po: $(PACKAGE)-all.pot