--- a/.gitignore	Sun Mar 27 20:24:35 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# ignore generated by libtool files (no more necessary)
-*.a
-*.o
-*.lo
-*.la
-*.so
-*.lai
-*.so.*
-# ignore backup files
-*~
-# ignore docs: they are not important and apiref is generated on the fly
-*.html
-# ignore generated makefile
-Makefile
-# ignore cmake files
-*.cmake
-CMake*
-CPack*
-# ignore generated header
-config.h
-# ignore resulting bundles
-*.deb
-*.tar.bz2
-# ignore build dir
-build

--- a/.hgignore	Sun Mar 27 20:24:35 2011 +0200
+++ b/.hgignore	Sun May 08 01:40:04 2011 +0300
@@ -1,27 +1,25 @@
-syntax: glob
-
 # ignore generated by libtool files (no more necessary)
-*.a
-*.o
-*.lo
-*.la
-*.so
-*.lai
-*.so.*
+.*\.a
+.*\.o
+.*\.lo
+.*\.la
+.*\.so
+.*\.lai
+.*\.so\..*
 # ignore backup files
-*~
+.*~
 # ignore docs: they are not important and apiref is generated on the fly
-*.html
+.*\.html
 # ignore generated makefile
 Makefile
 # ignore cmake files
-*.cmake
-CMake*
-CPack*
+.*\.cmake
+CMake.*
+CPack.*
 # ignore generated header
-config.h
+config\.h
 # ignore resulting bundles
-*.deb
-*.tar.bz2
+.*\.deb
+.*\.tar\.bz2
 # ignore build dir
 build

--- a/CMakeLists.txt	Sun Mar 27 20:24:35 2011 +0200
+++ b/CMakeLists.txt	Sun May 08 01:40:04 2011 +0300
@@ -69,10 +69,13 @@
 set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
 include(CPack)
 
+configure_file(disco.avv.in disco.avv)
+
 ## Installation
 install(TARGETS disco DESTINATION lib/mcabber) 
 install(FILES disco.rc COPYING TODO README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
 install(FILES disco.h DESTINATION include/mcabber)
 install(DIRECTORY help DESTINATION share/mcabber)
+install(FILES ${PROJECT_BINARY_DIR}/disco.avv DESTINATION share/mcabber/avv/modules RENAME disco)
 
 ## The End ## vim: se ts=4: ##

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/disco.avv.in	Sun May 08 01:40:04 2011 +0300
@@ -0,0 +1,17 @@
+
+Name:        ${PROJECT_NAME}
+Method:      glib
+Version:     ${PROJECT_VERSION}
+Description: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
+# Right now it does not require caps, but may require in future
+# commands depend on building envioronment: 4+3, 2+1
+Requires:    ( commands:4 | commands:3 ) + ( compl:3 | compl:2 ) +
+             ( roster:4 | roster:3 | roster:2 | roster:1 ) + utils:2 +
+	     ( hooks:5 | hooks:4 | hooks:3 | hooks:2 ) +
+	     ( xmpp:4 | xmpp:3 | xmpp:2 | xmpp:1 ) + logprint:3 +
+	     ( screen:10 | screen:9 | screen:8 | screen:7 | screen:6 | screen:5 | screen:4 ) +
+	     ( hbuf:3 | hbuf:2 | hbuf:1 )
+Provides:    disco:1
+Init:        disco_init
+Uninit:      disco_uninit
+

--- a/disco.c	Sun Mar 27 20:24:35 2011 +0200
+++ b/disco.c	Sun May 08 01:40:04 2011 +0300
@@ -42,22 +42,11 @@
 // module description
 //
 
-static void disco_init   (void);
-static void disco_uninit (void);
+void disco_init   (void);
+void disco_uninit (void);
 
 #define DESCRIPTION ( "Service discovery requests\nProvides command /disco" )
 
-static module_info_t info_disco_experimental = {
-	.branch      = "experimental",
-	.api         = 34,
-	.version     = PROJECT_VERSION,
-	.description = DESCRIPTION,
-	.requires    = NULL,
-	.init        = disco_init,
-	.uninit      = disco_uninit,
-	.next        = NULL,
-};
-
 static module_info_t info_disco_dev = {
 	.branch      = "dev",
 	.api         = 20,
@@ -66,7 +55,7 @@
 	.requires    = NULL,
 	.init        = disco_init,
 	.uninit      = disco_uninit,
-	.next        = &info_disco_experimental,
+	.next        = NULL,
 };
 
 module_info_t info_disco_0_10_0 = {
@@ -678,7 +667,7 @@
 	return HOOK_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 }
 
-static void disco_init (void)
+void disco_init (void)
 {
 	// completion
 	disco_cid = compl_new_category ();
@@ -700,7 +689,7 @@
 	return;
 }
 
-static void disco_uninit (void)
+void disco_uninit (void)
 {
 	// command
 #ifndef MCABBER_API_HAVE_CMD_ID