Merge branch 'master' into next

[people/mfischer/ipfire-2.x.git] / config / rootfiles / common / glib

diff --git a/config/rootfiles/common/glib b/config/rootfiles/common/glib
index 7eab315549db4fb58b8b9e2158d2ad70aaf73cb0..0b2e4b2685273147b60c8044c9f9da34a26e92e9 100644 (file)
--- a/config/rootfiles/common/glib
+++ b/config/rootfiles/common/glib
@@ -17,14 +17,11 @@
 #usr/include/gio-unix-2.0/gio
 #usr/include/gio-unix-2.0/gio/gdesktopappinfo.h
 #usr/include/gio-unix-2.0/gio/gfiledescriptorbased.h
-#usr/include/gio-unix-2.0/gio/gunixconnection.h
-#usr/include/gio-unix-2.0/gio/gunixcredentialsmessage.h
 #usr/include/gio-unix-2.0/gio/gunixfdlist.h
 #usr/include/gio-unix-2.0/gio/gunixfdmessage.h
 #usr/include/gio-unix-2.0/gio/gunixinputstream.h
 #usr/include/gio-unix-2.0/gio/gunixmounts.h
 #usr/include/gio-unix-2.0/gio/gunixoutputstream.h
-#usr/include/gio-unix-2.0/gio/gunixsocketaddress.h
 #usr/include/glib-2.0
 #usr/include/glib-2.0/gio
 #usr/include/glib-2.0/gio/gaction.h
@@ -71,6 +68,8 @@
 #usr/include/glib-2.0/gio/gdbusproxy.h
 #usr/include/glib-2.0/gio/gdbusserver.h
 #usr/include/glib-2.0/gio/gdbusutils.h
+usr/include/glib-2.0/gio/gdebugcontroller.h
+#usr/include/glib-2.0/gio/gdebugcontrollerdbus.h
 #usr/include/glib-2.0/gio/gdrive.h
 #usr/include/glib-2.0/gio/gdtlsclientconnection.h
 #usr/include/glib-2.0/gio/gdtlsconnection.h
@@ -173,6 +172,9 @@
 #usr/include/glib-2.0/gio/gtlsinteraction.h
 #usr/include/glib-2.0/gio/gtlspassword.h
 #usr/include/glib-2.0/gio/gtlsserverconnection.h
+#usr/include/glib-2.0/gio/gunixconnection.h
+#usr/include/glib-2.0/gio/gunixcredentialsmessage.h
+#usr/include/glib-2.0/gio/gunixsocketaddress.h
 #usr/include/glib-2.0/gio/gvfs.h
 #usr/include/glib-2.0/gio/gvolume.h
 #usr/include/glib-2.0/gio/gvolumemonitor.h
@@ -296,19 +298,19 @@
 #usr/lib/glib-2.0/include/glibconfig.h
 #usr/lib/libgio-2.0.so
 usr/lib/libgio-2.0.so.0
-usr/lib/libgio-2.0.so.0.7000.1
+usr/lib/libgio-2.0.so.0.7101.0
 #usr/lib/libglib-2.0.so
 usr/lib/libglib-2.0.so.0
-usr/lib/libglib-2.0.so.0.7000.1
+usr/lib/libglib-2.0.so.0.7101.0
 #usr/lib/libgmodule-2.0.so
 usr/lib/libgmodule-2.0.so.0
-usr/lib/libgmodule-2.0.so.0.7000.1
+usr/lib/libgmodule-2.0.so.0.7101.0
 #usr/lib/libgobject-2.0.so
 usr/lib/libgobject-2.0.so.0
-usr/lib/libgobject-2.0.so.0.7000.1
+usr/lib/libgobject-2.0.so.0.7101.0
 #usr/lib/libgthread-2.0.so
 usr/lib/libgthread-2.0.so.0
-usr/lib/libgthread-2.0.so.0.7000.1
+usr/lib/libgthread-2.0.so.0.7101.0
 #usr/lib/pkgconfig/gio-2.0.pc
 #usr/lib/pkgconfig/gio-unix-2.0.pc
 #usr/lib/pkgconfig/glib-2.0.pc
@@ -328,8 +330,8 @@ usr/lib/libgthread-2.0.so.0.7000.1
 #usr/share/gdb/auto-load
 #usr/share/gdb/auto-load/usr
 #usr/share/gdb/auto-load/usr/lib
-#usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7000.1-gdb.py
-#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7000.1-gdb.py
+#usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7101.0-gdb.py
+#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7101.0-gdb.py
 #usr/share/gettext/its
 #usr/share/gettext/its/gschema.its
 #usr/share/gettext/its/gschema.loc
@@ -339,6 +341,7 @@ usr/lib/libgthread-2.0.so.0.7000.1
 #usr/share/glib-2.0/codegen/codegen.py
 #usr/share/glib-2.0/codegen/codegen_docbook.py
 #usr/share/glib-2.0/codegen/codegen_main.py
+#usr/share/glib-2.0/codegen/codegen_rst.py
 #usr/share/glib-2.0/codegen/config.py
 #usr/share/glib-2.0/codegen/dbustypes.py
 #usr/share/glib-2.0/codegen/parser.py