New commits:
commit 3396ebff9d9ad7bf0ea7b6f985edfcdb18f7f268
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
util-linux: No longer depends on e2fsprogs for blkid
commit b1f610100b37a80557cd3cbe91b929129fbce96f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "util-linux: No longer depends on e2fsprogs for blkid"
This reverts commit 1b70ea9a3082b3fde8f590c5a80f3a8b329aac5d.
Conflicting with e2fsprogs doesn't work as it's sustained...crap
diff --git a/utils/util-linux/CONFLICTS b/utils/util-linux/CONFLICTS
deleted file mode 100755
index 16919a0..0000000
--- a/utils/util-linux/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts e2fsprogs y
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 7834727..badb19b 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,7 +1,5 @@
2009-05-12 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: No longer depends on e2fsprogs for blkid
- * CONFLICTS: Autoconflicts with e2fsprogs so that blkid from e2fsprogs
- is removed before installing blkid from util-linux
2009-05-12 Ladislav Hagara <hgr AT vabo.cz>
* BUILD: added --with-fsprobe=builtin
[SM-Commit] GIT changes to master grimoire by Eric Sandall (3396ebff9d9ad7bf0ea7b6f985edfcdb18f7f268),
Eric Sandall, 05/13/2009