Renamed lfs/glib to lfs/glib2.

diff --git a/lfs/dbus-glib b/lfs/dbus-glib
index 240faa183728d78237b6d3f201e0c1ff6b8c3fc5..c7cc8930b0028c7e0c5c75a9ede48867737b8290 100644 (file)
--- a/lfs/dbus-glib
+++ b/lfs/dbus-glib
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = System/Libraries
 EXTRA      = no
 DEBUG      = no
-DEPS       = dbus glib expat
+DEPS       = dbus glib2 expat
 
 URL        = http://www.freedesktop.org/software/dbus/
 LICENSE    = GPLv2+ AFL

diff --git a/lfs/glib b/lfs/glib2
similarity index 100%
rename from lfs/glib
rename to lfs/glib2

diff --git a/lfs/mc b/lfs/mc
index d73c7c1b94e91735c2ae2f1acf67746c171474d7..25cbf0c5f59f526b7f15e30471fb7c26c0ed25c1 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -29,7 +29,7 @@ VER        = 4.6.1
 
 EXTRA      = yes
 DEBUG      = no
-DEPS       = glib slang
+DEPS       = glib2 slang
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

diff --git a/lfs/syslog-ng b/lfs/syslog-ng
index 13313084b139a2e42a1950353dc67d2fa73540b9..19098b4d35b2c88202fb33be0516d79e78b85503 100644 (file)
--- a/lfs/syslog-ng
+++ b/lfs/syslog-ng
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = System/Tools
 EXTRA      = no
 DEBUG      = no
-DEPS       = eventlog glib
+DEPS       = eventlog glib2
 
 URL        = http://www.balabit.com/network-security/syslog-ng/
 LICENSE    = GPLv2+

diff --git a/make.sh b/make.sh
index 798eaacf05c7d318425155b7b51c2a443f847fd4..b095789f78c38b341344b3a5cd941a63fa89fde0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -145,7 +145,7 @@ base_build() {
        ipfire_make gmp
        ipfire_make grub
        ipfire_make gawk
-       ipfire_make glib
+       ipfire_make glib2
        ipfire_make grep
        ipfire_make groff
        ipfire_make gzip

diff --git a/src/rootfiles/core/glib b/src/rootfiles/core/glib2
similarity index 100%
rename from src/rootfiles/core/glib
rename to src/rootfiles/core/glib2