summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/hal/ChangeLog6
-rw-r--r--sys-apps/hal/Manifest16
-rw-r--r--sys-apps/hal/hal-0.5.7-r1.ebuild7
3 files changed, 19 insertions, 10 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index cad7c8aed515..0b65301935e3 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/hal
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.84 2006/04/27 05:48:26 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.85 2006/04/29 03:09:40 steev Exp $
+
+ 29 Apr 2006; Steev Klimaszewski <steev@gentoo.org> hal-0.5.7-r1.ebuild:
+ We now keepdir /media in hal as both gnome-mount and pmount can use it - Bug
+ 130795
27 Apr 2006; Steev Klimaszewski <steev@gentoo.org> hal-0.5.7.ebuild,
hal-0.5.7-r1.ebuild:
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 9bb74245e54f..11769db9fc27 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -98,18 +98,18 @@ EBUILD hal-0.5.5.1-r3.ebuild 3780 RMD160 376b757b599b4788d4dce9d0d2aa39dddc90d95
MD5 59bbdd78799e3dd45740cba91144c873 hal-0.5.5.1-r3.ebuild 3780
RMD160 376b757b599b4788d4dce9d0d2aa39dddc90d95e hal-0.5.5.1-r3.ebuild 3780
SHA256 7befb86e2b140e7a760afcb118fe090ee0913d389cf39037203d03fd9fba454d hal-0.5.5.1-r3.ebuild 3780
-EBUILD hal-0.5.7-r1.ebuild 5148 RMD160 aabb222884dd2b474a6e86e5afd1de44dc5bf3a9 SHA1 f875f0d4e24bc11bf4478d7d30eeb071773ac3e2 SHA256 bbb479ff77d3e12cdfe2a8dad95f1910d6d1cf7ab47938c790e929d2df3d56a4 size 5148
-MD5 f1f832eb1878b2dcc6f3c3375c3260c9 hal-0.5.7-r1.ebuild 5148
-RMD160 aabb222884dd2b474a6e86e5afd1de44dc5bf3a9 hal-0.5.7-r1.ebuild 5148
-SHA256 bbb479ff77d3e12cdfe2a8dad95f1910d6d1cf7ab47938c790e929d2df3d56a4 hal-0.5.7-r1.ebuild 5148
+EBUILD hal-0.5.7-r1.ebuild 5294 RMD160 eda1046da7ae4d0ae16595328c754126d021f3af SHA1 cdd2cb9d4443e122b3e0aeb2908bf7d4d86eff04 SHA256 19cd201585b7693db665dc882e9207a4b3b459999e19737dcccb5a885b044e53 size 5294
+MD5 63cd3c4134f20500531765fbd5f7acf8 hal-0.5.7-r1.ebuild 5294
+RMD160 eda1046da7ae4d0ae16595328c754126d021f3af hal-0.5.7-r1.ebuild 5294
+SHA256 19cd201585b7693db665dc882e9207a4b3b459999e19737dcccb5a885b044e53 hal-0.5.7-r1.ebuild 5294
EBUILD hal-0.5.7.ebuild 5059 RMD160 e33bdd06bad9d29fb8a8867a86c2b7d6d36e22c2 SHA1 c94785f2da021d9704d382f9a34921d207c167e6 SHA256 757e9f9dd9005a450ddb9052776e7ad20742ffbcfb12ac6c63b87fae5c7a7c80 size 5059
MD5 957571de4c7fad37d5b71193791e18ac hal-0.5.7.ebuild 5059
RMD160 e33bdd06bad9d29fb8a8867a86c2b7d6d36e22c2 hal-0.5.7.ebuild 5059
SHA256 757e9f9dd9005a450ddb9052776e7ad20742ffbcfb12ac6c63b87fae5c7a7c80 hal-0.5.7.ebuild 5059
-MISC ChangeLog 12053 RMD160 cb2f9c3261e3341f1b307057ea5fbde97085dac7 SHA1 2f0956a26aabe1fef209f5347ba3c33b072bacbe SHA256 668ec602f99a997b52a39baafa74e565bee8ce852d01b89a294c30f50b79a119 size 12053
-MD5 3ebb1c60324653006f7b0986cdf8b122 ChangeLog 12053
-RMD160 cb2f9c3261e3341f1b307057ea5fbde97085dac7 ChangeLog 12053
-SHA256 668ec602f99a997b52a39baafa74e565bee8ce852d01b89a294c30f50b79a119 ChangeLog 12053
+MISC ChangeLog 12216 RMD160 eb5738b0d742596df45f545444300d9ca2ba54f3 SHA1 4453a8e537c466787a0d40f79baa180caa77b0c4 SHA256 29378009613424a24d76699916593204ef5da2cb0ec46af94bc5b22be80507d3 size 12216
+MD5 548e1f31c507a9ef3a67dc131cb1ede5 ChangeLog 12216
+RMD160 eb5738b0d742596df45f545444300d9ca2ba54f3 ChangeLog 12216
+SHA256 29378009613424a24d76699916593204ef5da2cb0ec46af94bc5b22be80507d3 ChangeLog 12216
MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d size 223
MD5 885e3073744523eaf2450514a311758b metadata.xml 223
RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223
diff --git a/sys-apps/hal/hal-0.5.7-r1.ebuild b/sys-apps/hal/hal-0.5.7-r1.ebuild
index a99dafcd1e8e..7f366353bd18 100644
--- a/sys-apps/hal/hal-0.5.7-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7-r1.ebuild,v 1.2 2006/04/27 05:48:26 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7-r1.ebuild,v 1.3 2006/04/29 03:09:40 steev Exp $
inherit eutils linux-info debug
@@ -151,6 +151,11 @@ src_install() {
# Script to unmount devices if they are yanked out (from upstream)
exeinto /etc/dev.d/default
doexe "${FILESDIR}"/hal-unmount.dev
+
+ # We now create and keep /media here as both gnome-mount and pmount
+ # use these directories, to avoid collision.
+ dodir /media
+ keepdir /media
}
pkg_postinst() {