summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2015-09-06 11:58:44 (EDT)
committer P. J. McDermott <pj@pehjota.net>2015-09-06 11:58:44 (EDT)
commit89ddced317d10a923f02b3f59c0c55cd0f3fbc38 (patch)
tree78334e05db5fc83b290e24e09e95727166052363
parent103314c070784c074542538a32c6f147a6f88513 (diff)
pciids-*: Drop Conflicts
-rw-r--r--pciids-full.pkg/control1
-rw-r--r--pciids-reduced.pkg/control1
2 files changed, 0 insertions, 2 deletions
diff --git a/pciids-full.pkg/control b/pciids-full.pkg/control
index 714d0e8..6cef661 100644
--- a/pciids-full.pkg/control
+++ b/pciids-full.pkg/control
@@ -2,6 +2,5 @@ Architecture: all
Platform: all
Depends: pciids-common (= ${Binary-Version})
Provides: pciids
-Conflicts: pciids-reduced
Description: PCI IDs repository - full version
${Common-Description}
diff --git a/pciids-reduced.pkg/control b/pciids-reduced.pkg/control
index 912a3fc..478e78b 100644
--- a/pciids-reduced.pkg/control
+++ b/pciids-reduced.pkg/control
@@ -2,7 +2,6 @@ Architecture: all
Platform: all
Depends: pciids-common (= ${Binary-Version})
Provides: pciids
-Conflicts: pciids-full
Description: PCI IDs repository - reduced version
${Common-Description}
.