* Move comment for ListParser::ParseDepends into the ri...

Author: mdz
Date: 2003-09-22 04:16:26 GMT
* Move comment for ListParser::ParseDepends into the right place

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 64a2bad919341d19925c6b05e421673f0f133104..cf81690e2c216c332a3b0a4a017d9e075033863b 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- 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.
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.


@@ -268,11 +268,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
    
    return true;
 }
    
    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
 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;
 }
 
    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)
 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 d44085aa0ab6e5e5de83ba09a24f67bb0229ee8f..daa0b2f89f0e44c8665499e5598edeb8f6ff03b9 100644 (file)
--- 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
   * 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

 
  -- 
 
 
  --