New commits:
commit 746390ebd7079a56fcb3d157105b64d96c019401
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "hal-0.5.9.1"
This reverts commit de25ecfc506f9016c8d739886d36e43344bdaba2.
Fix Bug #14040 Part 2/2
commit 5f37c3aa031673d3bc463cc7926115b679a8a41c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "hal - add back selinux stuff"
This reverts commit 00c41ae4ef70debf7b09faab5d59f65dca9c6129.
Fix Bug #14040 Part 1/2
commit 4e10ee43a64d4f48ff31526f93b510e204546222
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>
locale - fixed character maps [Bug 14044]
diff --git a/libs/locale/DETAILS b/libs/locale/DETAILS
index 3c335c8..a1a913c 100755
--- a/libs/locale/DETAILS
+++ b/libs/locale/DETAILS
@@ -1,5 +1,6 @@
SPELL=locale
VERSION=0.0.2
+ PATCHLEVEL=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.gnu.org/software/libc
LICENSE[0]=LGPL
diff --git a/libs/locale/HISTORY b/libs/locale/HISTORY
index a2a7208..9ef6c29 100644
--- a/libs/locale/HISTORY
+++ b/libs/locale/HISTORY
@@ -1,3 +1,7 @@
+2007-10-20 Ladislav Hagara <hgr AT vabo.cz>
+ * locales: fixed character maps [Bug 14044]
+ * DETAILS: PATCHLEVEL=1
+
2007-04-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: clarified the explanation a bit more
diff --git a/libs/locale/locales b/libs/locale/locales
index aaa4c8a..4e2f757 100755
--- a/libs/locale/locales
+++ b/libs/locale/locales
@@ -31,7 +31,7 @@ bs_BA/ISO-8859-2
Bosnian_locale_for_Bosnia_and_Herzegowina off
byn_ER/UTF-8 Blin_locale_for_Eritrea
off
ca_ES/ISO-8859-1 Catalan_locale_for_Catalonia
off
ca_ES@euro/ISO-8859-15 Catalan_locale_for_Catalonia_with_Euro
off
-cs_CZ/ISO_8859-2 Czech_locale_for_the_Czech_Republic
off
+cs_CZ/ISO-8859-2 Czech_locale_for_the_Czech_Republic
off
cy_GB/ISO-8859-14 Welsh_locale_for_Great_Britain
off
da_DK/ISO-8859-1 Danish_locale_for_Denmark
off
de_AT/ISO-8859-1 German_locale_for_Austria
off
@@ -48,7 +48,7 @@ el_GR@euro/UTF-8
Greek_locale_for_Greece_with_Euro off
en_AU/ISO-8859-1 English_locale_for_Australia
off
en_BW/ISO-8859-1 English_locale_for_Botswana
off
en_CA/ISO-8859-1 English_locale_for_Canada
off
-en_DK/ISO_8859-1 English_locale_for_Denmark
off
+en_DK/ISO-8859-1 English_locale_for_Denmark
off
en_GB/ISO-8859-1 English_locale_for_Britain
off
en_HK/ISO-8859-1 English_locale_for_Hong_Kong
off
en_IE/ISO-8859-1 English_locale_for_Ireland
off
@@ -98,7 +98,7 @@ fr_LU/ISO-8859-1 French_locale_for_Luxemburg
off
fr_LU@euro/ISO-8859-15 French_locale_for_Luxemburg_with_Euro
off
ga_IE/ISO-8859-1 Irish_locale_for_Ireland
off
ga_IE@euro/ISO-8859-15 Irish_locale_for_Ireland_with_Euro
off
-gd_GB/ISO_8859-15 Scots_Gaelic_locale_for_Great_Britain
off
+gd_GB/ISO-8859-15 Scots_Gaelic_locale_for_Great_Britain
off
gez_ER/UTF-8 Ge'ez_locale_for_Eritrea
off
gez_ER@abegede/UTF-8 Ge'ez_locale_for_Eritrea_With_Abegede_Collation
off
gez_ET/UTF-8 Ge'ez_locale_for_Ethiopia
off
@@ -141,7 +141,7 @@ nl_BE@euro/ISO-8859-15
Dutch_locale_for_Belgium_with_Euro off
nl_NL/ISO-8859-1 Dutch_locale_for_the_Netherlands
off
nl_NL@euro/ISO-8859-15 Dutch_locale_for_the_Netherlands_with_Euro
off
nn_NO/ISO-8859-1 Nynorsk_locale_for_Norway
off
-oc_FR/ISO_8859-1 Occitan_Locale_for_France
off
+oc_FR/ISO-8859-1 Occitan_Locale_for_France
off
om_ET/UTF-8 Oromo_locale_for_Ethiopia
off
om_KE/ISO-8859-1 Oromo_locale_for_Kenya
off
pa_IN/UTF-8 Punjabi_locale_for_India
off
@@ -182,7 +182,7 @@ ur_PK/CP1256 Urdu_Locale_for_Pakistan
off
uz_UZ/UTF-8 Uzbek_(latin)_locale_for_Uzbekistan
off
uz_UZ@cyrillic/UTF-8 Uzbek_(cyrillic)_locale_for_Uzbekistan
off
vi_VN/UTF-8 Vietnamese_locale_for_Vietnam
off
-wa_BE/ISO_8859-1 Walloon_Locale_for_Belgium
off
+wa_BE/ISO-8859-1 Walloon_Locale_for_Belgium
off
wa_BE@euro/ISO-8859-15 Walloon_locale_for_Belgium_with_Euro
off
xh_ZA/UTF-8 Xhosa_locale_for_South_Africa
off
yi_US/CP1255 Yiddish_locale
off
diff --git a/utils/hal/BUILD b/utils/hal/BUILD
index 26dcdb3..cc073b0 100755
--- a/utils/hal/BUILD
+++ b/utils/hal/BUILD
@@ -3,9 +3,5 @@ if [ "$SELINUX" == "y" ]; then
OPTS="$OPTS --enable-selinux"
fi &&
OPTS="$OPTS --with-pid-file=/var/run/hald.pid \
- --with-backend=linux \
- $HALACPI $HALAPM $HALSONY $HALPMU" &&
-default_build
-# --enable-sysfs-carrier --enable-hotplug-map \
-# --disable-policy-kit" &&
-#PKG_CONFIG="/usr/bin/pkg-config" default_build
+ --enable-sysfs-carrier --enable-hotplug-map --disable-policy-kit"
&&
+PKG_CONFIG="/usr/bin/pkg-config" default_build
diff --git a/utils/hal/CONFIGURE b/utils/hal/CONFIGURE
index fd304ba..b9fa0b0 100755
--- a/utils/hal/CONFIGURE
+++ b/utils/hal/CONFIGURE
@@ -1,13 +1 @@
config_query SELINUX "Enable SELinux support?" n
-config_query_option HALSONY "Sony PIC support?" n \
- "--enable-sonypic" \
- "--disable-sonypic"
-config_query_option HALACPI "ACPI support?" n \
- "--enable-acpi" \
- "--disable-acpi"
-config_query_option HALAPM "APM support?" n \
- "--enable-apm" \
- "--disable-apm"
-config_query_option HALPMU "PMU support?" n \
- "--enable-pmu" \
- "--disable-pmu"
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 7b55f5d..59cb7c0 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -8,17 +8,11 @@ depends python &&
depends udev &&
depends xml-parser-expat &&
depends pkgconfig &&
-depends hal-info &&
depends dbus-python &&