summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/deblistparser.cc13
-rw-r--r--debian/changelog1
2 files changed, 8 insertions, 6 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 64a2bad91..cf81690e2 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: deblistparser.cc,v 1.28 2001/10/02 03:03:47 tausq Exp $
+// $Id: deblistparser.cc,v 1.29 2003/09/22 04:16:26 mdz Exp $
/* ######################################################################
Package Cache Generator - Generator for the cache structure.
@@ -268,11 +268,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
return true;
}
- /*}}}*/
-// ListParser::ParseDepends - Parse a dependency element /*{{{*/
-// ---------------------------------------------------------------------
-/* This parses the dependency elements out of a standard string in place,
- bit by bit. */
+
const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
{
// Determine the operator
@@ -331,6 +327,11 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
return I;
}
+ /*}}}*/
+// ListParser::ParseDepends - Parse a dependency element /*{{{*/
+// ---------------------------------------------------------------------
+/* This parses the dependency elements out of a standard string in place,
+ bit by bit. */
const char *debListParser::ParseDepends(const char *Start,const char *Stop,
string &Package,string &Ver,
unsigned int &Op, bool ParseArchFlags)
diff --git a/debian/changelog b/debian/changelog
index d44085aa0..daa0b2f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ apt (0.5.13) unstable; urgency=low
* Document configuration file comment syntax in apt.conf(5)
(Closes: #211262)
* s/removed/installed/ in a comment in apt-get.cc
+ * Move comment for ListParser::ParseDepends into the right place
--