Remove the C library placeholder for "pre-depends"

We stopped populating the element with real data some time ago, it's
time to drop it entirely.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>

britney.py

@@ -525,7 +525,6 @@ class Britney(object):
                     version,
                     get_field('Architecture'),
                     get_field('Multi-Arch'),
-                    None, # Pre-depends - leave as None for the C-code
                     deps,
                     ', '.join(final_conflicts_list) or None,
                     get_field('Provides'),

consts.py

@@ -30,11 +30,8 @@ SOURCE = 2
 SOURCEVER = 3
 ARCHITECTURE = 4
 MULTIARCH = 5
-# PREDEPENDS = 6 - No longer used by the python code
+DEPENDS = 6
-#  - The C-code needs it for alignment reasons and still check it
+CONFLICTS = 7
-#    but ignore it if it is None (so keep it None).
+PROVIDES = 8
-DEPENDS = 7
+RDEPENDS = 9
-CONFLICTS = 8
+RCONFLICTS = 10
-PROVIDES = 9
-RDEPENDS = 10
-RCONFLICTS = 11

lib/britney-py.c

@@ -85,6 +85,7 @@ static PyObject *dpkgpackages_add_binary(dpkgpackages *self, PyObject *args) {
     pkg->package = strdup(pkg_name);
     pkg->priority = 0;
     pkg->details    = NULL;
+    pkg->depends[1] = NULL;
     pkg->depends[2] = NULL;
     pkg->depends[3] = NULL;
 
@@ -118,17 +119,11 @@ static PyObject *dpkgpackages_add_binary(dpkgpackages *self, PyObject *args) {
 
     pyString = PyList_GetItem(value, 7);
     if (pyString == NULL) return NULL;
-    if (pyString != Py_None) {
-        pkg->depends[1] = read_dep_andor(PyString_AsString(pyString));
-    } else pkg->depends[1] = NULL;
-
-    pyString = PyList_GetItem(value, 8);
-    if (pyString == NULL) return NULL;
     if (pyString != Py_None) {
         pkg->conflicts = read_dep_and(PyString_AsString(pyString));
     } else pkg->conflicts = NULL;
 
-    pyString = PyList_GetItem(value, 9);
+    pyString = PyList_GetItem(value, 8);
     if (pyString == NULL) return NULL;
     if (pyString != Py_None) {
         pkg->provides = read_packagenames(PyString_AsString(pyString));
@@ -211,12 +206,11 @@ static PyObject *build_system(PyObject *self, PyObject *args) {
        # SOURCEVER = 3
        # ARCHITECTURE = 4
        # MULTIARCH = 5
-       # PREDEPENDS = 6
+       # DEPENDS = 6
-       # DEPENDS = 7
+       # CONFLICTS = 7
-       # CONFLICTS = 8
+       # PROVIDES = 8
-       # PROVIDES = 9
+       # RDEPENDS = 9
-       # RDEPENDS = 10
+       # RCONFLICTS = 10
-       # RCONFLICTS = 11
     */
 
     dpkg_packages *dpkg_pkgs = new_packages(arch);
@@ -230,6 +224,7 @@ static PyObject *build_system(PyObject *self, PyObject *args) {
         pkg->package = strdup(PyString_AsString(key));
         pkg->priority = 0;
         pkg->details    = NULL;
+        pkg->depends[1] = NULL;
         pkg->depends[2] = NULL;
         pkg->depends[3] = NULL;
 
@@ -263,17 +258,11 @@ static PyObject *build_system(PyObject *self, PyObject *args) {
 
         pyString = PyList_GetItem(value, 7);
         if (pyString == NULL) continue;
-        if (pyString != Py_None) {
-            pkg->depends[1] = read_dep_andor(PyString_AsString(pyString));
-        } else pkg->depends[1] = NULL;
-
-        pyString = PyList_GetItem(value, 8);
-        if (pyString == NULL) continue;
         if (pyString != Py_None) {
             pkg->conflicts = read_dep_and(PyString_AsString(pyString));
         } else pkg->conflicts = NULL;
 
-        pyString = PyList_GetItem(value, 9);
+        pyString = PyList_GetItem(value, 8);
         if (pyString == NULL) continue;
         if (pyString != Py_None) {
             pkg->provides = read_packagenames(PyString_AsString(pyString));