summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien ROZO2009-12-12 22:56:07 +0100
committerArwed von Merkatz2010-01-02 15:15:47 +0100
commitac2e1bb52a8f84fb0d5dbb2dd1d691d6da89f16b (patch)
treec5940bfe5de46ab9572a06bb260081b27865dade
parentb7e17a2c680db7f25bfb2209d8340a0be52bc258 (diff)
lzma-utils: fixed CONFLICTS, spell name is xz-utils, not xz
(cherry picked from commit 37d929f1a1c4dafdbaa8a02902063579666bfbd1)
-rwxr-xr-xarchive/lzma-utils/CONFLICTS2
-rw-r--r--archive/lzma-utils/HISTORY3
2 files changed, 4 insertions, 1 deletions
diff --git a/archive/lzma-utils/CONFLICTS b/archive/lzma-utils/CONFLICTS
index 89aa5396bd..12987ce0c5 100755
--- a/archive/lzma-utils/CONFLICTS
+++ b/archive/lzma-utils/CONFLICTS
@@ -1 +1 @@
-conflicts xz
+conflicts xz-utils
diff --git a/archive/lzma-utils/HISTORY b/archive/lzma-utils/HISTORY
index a850ae0f02..69b0c96dbd 100644
--- a/archive/lzma-utils/HISTORY
+++ b/archive/lzma-utils/HISTORY
@@ -1,3 +1,6 @@
+2009-12-12 Julien "_kaze_" ROZO <julien@rozo.org>
+ * CONFLICTS: fixed, spell name is xz-utils
+
2009-01-22 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.32.7
* CONFLICTS: added, for new spell xz