4 files changed, 305 insertions, 215 deletions

diff --git a/sysutils/luma/Makefile b/sysutils/luma/Makefile
index e9d745e57851..15e473624a32 100644
--- a/sysutils/luma/Makefile
+++ b/sysutils/luma/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	luma
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	sysutils net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,21 +15,15 @@ MAINTAINER=	alecn2002@yandex.ru
 COMMENT=	A graphical tool for accessing and managing LDAP servers
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_ldap.so:${PORTSDIR}/net/py-ldap2 \
+		${PYTHON_SITELIBDIR}/smbpasswd.so:${PORTSDIR}/net/py-smbpasswd \
 		pyuic:${PORTSDIR}/x11-toolkits/py-qt
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
+PYSETUP=	install.py
+PYDISTUTILS_BUILDARGS=	--compile-only
+PYDISTUTILS_INSTALLARGS=	--prefix=${PREFIX}
 USE_OPENLDAP=	yes
-WANTS_OPENLDAP_VER=	2.1
-NO_BUILD=	yes
-
-INSTALLCMD=	install.py
-INSTALLARGS=	--prefix=${PREFIX}
-
-post-extract:
-	${FIND} ${WRKSRC} \( -name '.#*' -o -name '*~*' \) -delete
-
-do-install:
-	@(cd ${INSTALL_WRKSRC}; ${PYTHON_CMD} ${INSTALLCMD} ${INSTALLARGS})
 
 .include <bsd.port.mk>
diff --git a/sysutils/luma/distinfo b/sysutils/luma/distinfo
index 254560a2fd39..989c742c8e1e 100644
--- a/sysutils/luma/distinfo
+++ b/sysutils/luma/distinfo
@@ -1,2 +1,2 @@
-MD5 (luma-1.2.tar.bz2) = 8e716bc8569ac8bad686118442dd7a24
-SIZE (luma-1.2.tar.bz2) = 298321
+MD5 (luma-1.3.tar.bz2) = cb339d9313dc36ed4704ea79402c5928
+SIZE (luma-1.3.tar.bz2) = 322583
diff --git a/sysutils/luma/files/patch-install.py b/sysutils/luma/files/patch-install.py
new file mode 100644
index 000000000000..9c56f975aa04
--- /dev/null
+++ b/sysutils/luma/files/patch-install.py
@@ -0,0 +1,28 @@
+--- install.py.orig	Tue May 18 22:01:47 2004
++++ install.py	Wed Jun  2 22:09:53 2004
+@@ -137,6 +137,7 @@
+     helpString = """Install options:
+  --prefix=PATH \t\t Install path (e.g. /usr/local)
+  --compile-only \t Just compile source files. No installation.
++ build \t The same as --compile-only
+  \n"""
+     print helpString
+     sys.exit(1)
+@@ -166,7 +167,7 @@
+         return
+         
+     for x in sys.argv[1:]:
+-        if x == "--compile-only":
++        if (x == "--compile-only") or (x == "build"):
+             global compileOnly
+             compileOnly = True
+         elif x[:9] == "--prefix=":
+@@ -174,7 +175,7 @@
+             prefixDir = x[9:]
+             if (prefixDir[-1] == "/") and (len(prefixDir) > 1):
+                 prefixDir = prefixDir[:-1]
+-        else:
++        elif x != "install":
+             print "Unknown options. Exiting..."
+             sys.exit(1)
+ 
diff --git a/sysutils/luma/pkg-plist b/sysutils/luma/pkg-plist
index 440651613107..9c9782660d4a 100644
--- a/sysutils/luma/pkg-plist
+++ b/sysutils/luma/pkg-plist
@@ -1,284 +1,352 @@
 bin/luma
-bin/test.ldif
-lib/luma/__init__.py
-lib/luma/__init__.pyc
-lib/luma/base/__init__.py
-lib/luma/base/__init__.pyc
-lib/luma/base/backend/DirUtils.py
-lib/luma/base/backend/DirUtils.pyc
-lib/luma/base/backend/LumaConnection.py
-lib/luma/base/backend/LumaConnection.pyc
+lib/luma/base/backend/__init__.pyc
 lib/luma/base/backend/PluginLoader.py
-lib/luma/base/backend/PluginLoader.pyc
 lib/luma/base/backend/ServerList.py
-lib/luma/base/backend/ServerList.pyc
 lib/luma/base/backend/ServerObject.py
-lib/luma/base/backend/ServerObject.pyc
 lib/luma/base/backend/__init__.py
-lib/luma/base/backend/__init__.pyc
+lib/luma/base/backend/LumaConnection.pyc
+lib/luma/base/backend/PluginLoader.pyc
+lib/luma/base/backend/ServerList.pyc
+lib/luma/base/backend/ServerObject.pyc
+lib/luma/base/backend/LumaConnection.py
 @dirrm lib/luma/base/backend
-lib/luma/base/gui/AboutDialog.py
-lib/luma/base/gui/AboutDialog.pyc
+lib/luma/base/gui/__init__.pyc
 lib/luma/base/gui/AboutDialog.ui
 lib/luma/base/gui/BaseSelector.py
-lib/luma/base/gui/BaseSelector.pyc
 lib/luma/base/gui/BaseSelectorDesign.py
-lib/luma/base/gui/BaseSelectorDesign.pyc
 lib/luma/base/gui/BaseSelectorDesign.ui
 lib/luma/base/gui/LanguageDialog.py
-lib/luma/base/gui/LanguageDialog.pyc
 lib/luma/base/gui/LanguageDialogDesign.py
-lib/luma/base/gui/LanguageDialogDesign.pyc
 lib/luma/base/gui/LanguageDialogDesign.ui
 lib/luma/base/gui/MainWin.py
-lib/luma/base/gui/MainWin.pyc
 lib/luma/base/gui/MainWinDesign.py
-lib/luma/base/gui/MainWinDesign.pyc
 lib/luma/base/gui/MainWinDesign.ui
 lib/luma/base/gui/PluginLoaderGui.py
-lib/luma/base/gui/PluginLoaderGui.pyc
 lib/luma/base/gui/PluginLoaderGuiDesign.py
-lib/luma/base/gui/PluginLoaderGuiDesign.pyc
 lib/luma/base/gui/PluginLoaderGuiDesign.ui
 lib/luma/base/gui/ServerDialog.py
-lib/luma/base/gui/ServerDialog.pyc
 lib/luma/base/gui/ServerDialogDesign.py
-lib/luma/base/gui/ServerDialogDesign.pyc
-lib/luma/base/gui/ServerDialogDesign.ui
 lib/luma/base/gui/__init__.py
-lib/luma/base/gui/__init__.pyc
-lib/luma/base/gui/icons/bookmark.png
-lib/luma/base/gui/icons/configure.png
-lib/luma/base/gui/icons/domtreeviewer.png
-lib/luma/base/gui/icons/exit.png
-lib/luma/base/gui/icons/fileclose.png
-lib/luma/base/gui/icons/gear.png
-lib/luma/base/gui/icons/reload.png
-@dirrm lib/luma/base/gui/icons
+lib/luma/base/gui/ServerDialogDesign.ui
+lib/luma/base/gui/AboutDialog.pyc
+lib/luma/base/gui/BaseSelector.pyc
+lib/luma/base/gui/BaseSelectorDesign.pyc
+lib/luma/base/gui/LanguageDialog.pyc
+lib/luma/base/gui/LanguageDialogDesign.pyc
+lib/luma/base/gui/MainWin.pyc
+lib/luma/base/gui/MainWinDesign.pyc
+lib/luma/base/gui/PluginLoaderGui.pyc
+lib/luma/base/gui/PluginLoaderGuiDesign.pyc
+lib/luma/base/gui/ServerDialog.pyc
+lib/luma/base/gui/ServerDialogDesign.pyc
+lib/luma/base/gui/AboutDialog.py
 @dirrm lib/luma/base/gui
-lib/luma/base/utils/__init__.py
-lib/luma/base/utils/__init__.pyc
+lib/luma/base/utils/backend/LdifHelper.pyc
 lib/luma/base/utils/backend/CryptPwGenerator.py
-lib/luma/base/utils/backend/CryptPwGenerator.pyc
 lib/luma/base/utils/backend/DateHelper.py
-lib/luma/base/utils/backend/DateHelper.pyc
 lib/luma/base/utils/backend/ObjectClassAttributeInfo.py
-lib/luma/base/utils/backend/ObjectClassAttributeInfo.pyc
 lib/luma/base/utils/backend/__init__.py
-lib/luma/base/utils/backend/__init__.pyc
 lib/luma/base/utils/backend/mkpasswd.py
-lib/luma/base/utils/backend/mkpasswd.pyc
 lib/luma/base/utils/backend/templateutils.py
+lib/luma/base/utils/backend/LdifHelper.py
+lib/luma/base/utils/backend/mkpasswd2.pyc
+lib/luma/base/utils/backend/CryptPwGenerator.pyc
+lib/luma/base/utils/backend/DateHelper.pyc
+lib/luma/base/utils/backend/ObjectClassAttributeInfo.pyc
+lib/luma/base/utils/backend/__init__.pyc
+lib/luma/base/utils/backend/mkpasswd.pyc
 lib/luma/base/utils/backend/templateutils.pyc
+lib/luma/base/utils/backend/mkpasswd2.py
 @dirrm lib/luma/base/utils/backend
+lib/luma/base/utils/gui/LumaEntryBrowserDesign.pyc
+lib/luma/base/utils/gui/AddAttributeWizardDesign.py
+lib/luma/base/utils/gui/AddAttributeWizardDesign.ui
 lib/luma/base/utils/gui/BrowserDialog.py
-lib/luma/base/utils/gui/BrowserDialog.pyc
 lib/luma/base/utils/gui/BrowserWidget.py
-lib/luma/base/utils/gui/BrowserWidget.pyc
 lib/luma/base/utils/gui/FilterWizard.py
-lib/luma/base/utils/gui/FilterWizard.pyc
 lib/luma/base/utils/gui/FilterWizardDesign.py
-lib/luma/base/utils/gui/FilterWizardDesign.pyc
 lib/luma/base/utils/gui/FilterWizardDesign.ui
 lib/luma/base/utils/gui/LumaIconView.py
-lib/luma/base/utils/gui/LumaIconView.pyc
 lib/luma/base/utils/gui/LumaIconViewDesign.py
-lib/luma/base/utils/gui/LumaIconViewDesign.pyc
 lib/luma/base/utils/gui/LumaIconViewDesign.ui
 lib/luma/base/utils/gui/ObjectWidget.py
-lib/luma/base/utils/gui/ObjectWidget.pyc
 lib/luma/base/utils/gui/PluginInformation.py
-lib/luma/base/utils/gui/PluginInformation.pyc
 lib/luma/base/utils/gui/PluginInformation.ui
 lib/luma/base/utils/gui/SearchForm.py
-lib/luma/base/utils/gui/SearchForm.pyc
 lib/luma/base/utils/gui/SearchFormDesign.py
-lib/luma/base/utils/gui/SearchFormDesign.pyc
 lib/luma/base/utils/gui/SearchFormDesign.ui
 lib/luma/base/utils/gui/SearchResultView.py
-lib/luma/base/utils/gui/SearchResultView.pyc
 lib/luma/base/utils/gui/SearchResultViewDesign.py
-lib/luma/base/utils/gui/SearchResultViewDesign.pyc
 lib/luma/base/utils/gui/SearchResultViewDesign.ui
 lib/luma/base/utils/gui/TemplateObjectWidget.py
-lib/luma/base/utils/gui/TemplateObjectWidget.pyc
 lib/luma/base/utils/gui/__init__.py
+lib/luma/base/utils/gui/MailDialog.py
+lib/luma/base/utils/gui/MailDialogDesign.ui
+lib/luma/base/utils/gui/MailDialogDesign.py
+lib/luma/base/utils/gui/PasswordDialogDesign.ui
+lib/luma/base/utils/gui/PasswordDialogDesign.py
+lib/luma/base/utils/gui/PasswordDialog.py
+lib/luma/base/utils/gui/LumaEntryBrowserDesign.ui
+lib/luma/base/utils/gui/LumaEntryBrowser.py
+lib/luma/base/utils/gui/LumaEntryBrowserDesign.py
+lib/luma/base/utils/gui/AddAttributeWizard.pyc
+lib/luma/base/utils/gui/BrowserDialog.pyc
+lib/luma/base/utils/gui/AddAttributeWizardDesign.pyc
+lib/luma/base/utils/gui/BrowserWidget.pyc
+lib/luma/base/utils/gui/FilterWizard.pyc
+lib/luma/base/utils/gui/FilterWizardDesign.pyc
+lib/luma/base/utils/gui/LumaIconView.pyc
+lib/luma/base/utils/gui/LumaIconViewDesign.pyc
+lib/luma/base/utils/gui/ObjectWidget.pyc
+lib/luma/base/utils/gui/PluginInformation.pyc
+lib/luma/base/utils/gui/SearchForm.pyc
+lib/luma/base/utils/gui/SearchFormDesign.pyc
+lib/luma/base/utils/gui/SearchResultView.pyc
+lib/luma/base/utils/gui/SearchResultViewDesign.pyc
+lib/luma/base/utils/gui/TemplateObjectWidget.pyc
 lib/luma/base/utils/gui/__init__.pyc
+lib/luma/base/utils/gui/MailDialog.pyc
+lib/luma/base/utils/gui/MailDialogDesign.pyc
+lib/luma/base/utils/gui/PasswordDialogDesign.pyc
+lib/luma/base/utils/gui/PasswordDialog.pyc
+lib/luma/base/utils/gui/LumaEntryBrowser.pyc
+lib/luma/base/utils/gui/AddAttributeWizard.py
 @dirrm lib/luma/base/utils/gui
-lib/luma/base/utils/icons/editclear.png
-lib/luma/base/utils/icons/newitem.png
-lib/luma/base/utils/icons/secure.png
-@dirrm lib/luma/base/utils/icons
+lib/luma/base/utils/__init__.py
+lib/luma/base/utils/__init__.pyc
 @dirrm lib/luma/base/utils
+lib/luma/base/__init__.py
+lib/luma/base/__init__.pyc
 @dirrm lib/luma/base
-lib/luma/environment/__init__.py
-lib/luma/environment/__init__.pyc
-@dirrm lib/luma/environment
-lib/luma/luma.py
-lib/luma/luma.pyc
-lib/luma/luma_br.qm
-lib/luma/luma_br.ts
-lib/luma/luma_de.qm
-lib/luma/luma_de.ts
-lib/luma/luma_es.qm
-lib/luma/luma_es.ts
-lib/luma/luma_fr.qm
-lib/luma/luma_fr.ts
-lib/luma/luma_no.qm
-lib/luma/luma_no.ts
-lib/luma/plugins/__init__.py
-lib/luma/plugins/__init__.pyc
-lib/luma/plugins/addressbook/Addressbook.py
-lib/luma/plugins/addressbook/Addressbook.pyc
+lib/luma/plugins/template_plugin/template_plugin.pyc
+lib/luma/plugins/template_plugin/OClassDialogDesign.py
+lib/luma/plugins/template_plugin/OClassDialogDesign.ui
+lib/luma/plugins/template_plugin/TemplateForm.py
+lib/luma/plugins/template_plugin/TemplateFormDesign.py
+lib/luma/plugins/template_plugin/TemplateFormDesign.ui
+lib/luma/plugins/template_plugin/TemplateFormDesign.ui.backup
+lib/luma/plugins/template_plugin/__init__.py
+lib/luma/plugins/template_plugin/plugin.meta
+lib/luma/plugins/template_plugin/template_plugin.py
+lib/luma/plugins/template_plugin/OClassDialog.pyc
+lib/luma/plugins/template_plugin/OClassDialogDesign.pyc
+lib/luma/plugins/template_plugin/TemplateForm.pyc
+lib/luma/plugins/template_plugin/TemplateFormDesign.pyc
+lib/luma/plugins/template_plugin/__init__.pyc
+lib/luma/plugins/template_plugin/OClassDialog.py
+@dirrm lib/luma/plugins/template_plugin
+lib/luma/plugins/usermanagement/AccountWizard.pyc
+lib/luma/plugins/usermanagement/Usermanagement.py
+lib/luma/plugins/usermanagement/UsermanagementWidgetDesign.ui
+lib/luma/plugins/usermanagement/plugin.meta
+lib/luma/plugins/usermanagement/UsermanagementWidgetDesign.py
+lib/luma/plugins/usermanagement/usermanagement_plugin.py
+lib/luma/plugins/usermanagement/GroupDialogDesign.ui
+lib/luma/plugins/usermanagement/NameDialog.ui
+lib/luma/plugins/usermanagement/NameDialog.py
+lib/luma/plugins/usermanagement/GroupDialogDesign.py
+lib/luma/plugins/usermanagement/__init__.py
+lib/luma/plugins/usermanagement/GroupDialog.py
+lib/luma/plugins/usermanagement/AccountWizardDesign.ui
+lib/luma/plugins/usermanagement/AccountWizardDesign.py
+lib/luma/plugins/usermanagement/AccountWizard.py
+lib/luma/plugins/usermanagement/UsermanagementWidget.pyc
+lib/luma/plugins/usermanagement/Usermanagement.pyc
+lib/luma/plugins/usermanagement/UsermanagementWidgetDesign.pyc
+lib/luma/plugins/usermanagement/usermanagement_plugin.pyc
+lib/luma/plugins/usermanagement/NameDialog.pyc
+lib/luma/plugins/usermanagement/GroupDialogDesign.pyc
+lib/luma/plugins/usermanagement/__init__.pyc
+lib/luma/plugins/usermanagement/GroupDialog.pyc
+lib/luma/plugins/usermanagement/AccountWizardDesign.pyc
+lib/luma/plugins/usermanagement/UsermanagementWidget.py
+@dirrm lib/luma/plugins/usermanagement
+lib/luma/plugins/admin_utils/admin_utilities_plugin.pyc
+lib/luma/plugins/admin_utils/AdminPanelDesign.py
+lib/luma/plugins/admin_utils/AdminPanelDesign.ui
+lib/luma/plugins/admin_utils/__init__.py
+lib/luma/plugins/admin_utils/admin_utilities_plugin.py
+lib/luma/plugins/admin_utils/plugin.meta
+lib/luma/plugins/admin_utils/AdminPanel.pyc
+lib/luma/plugins/admin_utils/AdminPanelDesign.pyc
+lib/luma/plugins/admin_utils/__init__.pyc
+lib/luma/plugins/admin_utils/AdminPanel.py
+@dirrm lib/luma/plugins/admin_utils
+lib/luma/plugins/browser_plugin/plugin.meta
+lib/luma/plugins/browser_plugin/__init__.py
+lib/luma/plugins/browser_plugin/browser_plugin.py
+lib/luma/plugins/browser_plugin/BrowserView.py
+lib/luma/plugins/browser_plugin/BrowserView.pyc
+lib/luma/plugins/browser_plugin/__init__.pyc
+lib/luma/plugins/browser_plugin/browser_plugin.pyc
+@dirrm lib/luma/plugins/browser_plugin
+lib/luma/plugins/addressbook/addressbook_plugin.pyc
 lib/luma/plugins/addressbook/AddressbookSettings.py
-lib/luma/plugins/addressbook/AddressbookSettings.pyc
 lib/luma/plugins/addressbook/AddressbookSettingsDesign.py
-lib/luma/plugins/addressbook/AddressbookSettingsDesign.pyc
 lib/luma/plugins/addressbook/AddressbookSettingsDesign.ui
 lib/luma/plugins/addressbook/AddressbookView.py
-lib/luma/plugins/addressbook/AddressbookView.pyc
 lib/luma/plugins/addressbook/AddressbookWidget.py
-lib/luma/plugins/addressbook/AddressbookWidget.pyc
 lib/luma/plugins/addressbook/AddressbookWidgetDesign.py
-lib/luma/plugins/addressbook/AddressbookWidgetDesign.pyc
 lib/luma/plugins/addressbook/AddressbookWidgetDesign.ui
 lib/luma/plugins/addressbook/CategoryEditDialog.py
-lib/luma/plugins/addressbook/CategoryEditDialog.pyc
 lib/luma/plugins/addressbook/CategoryEditDialogDesign.py
-lib/luma/plugins/addressbook/CategoryEditDialogDesign.pyc
 lib/luma/plugins/addressbook/CategoryEditDialogDesign.ui
 lib/luma/plugins/addressbook/ContactWizard.py
-lib/luma/plugins/addressbook/ContactWizard.pyc
 lib/luma/plugins/addressbook/ContactWizardDesign.py
-lib/luma/plugins/addressbook/ContactWizardDesign.pyc
 lib/luma/plugins/addressbook/ContactWizardDesign.ui
-lib/luma/plugins/addressbook/MailDialog.py
-lib/luma/plugins/addressbook/MailDialog.pyc
-lib/luma/plugins/addressbook/MailDialog.ui
 lib/luma/plugins/addressbook/NameDialog.py
-lib/luma/plugins/addressbook/NameDialog.pyc
 lib/luma/plugins/addressbook/NameDialog.ui
 lib/luma/plugins/addressbook/NewCategoryDialog.py
-lib/luma/plugins/addressbook/NewCategoryDialog.pyc
 lib/luma/plugins/addressbook/NewCategoryDialog.ui
 lib/luma/plugins/addressbook/__init__.py
-lib/luma/plugins/addressbook/__init__.pyc
 lib/luma/plugins/addressbook/addressbook_plugin.py
-lib/luma/plugins/addressbook/addressbook_plugin.pyc
-lib/luma/plugins/addressbook/icons/addressbook.png
-lib/luma/plugins/addressbook/icons/category.png
-lib/luma/plugins/addressbook/icons/email.png
-lib/luma/plugins/addressbook/icons/home.png
-lib/luma/plugins/addressbook/icons/location.png
-lib/luma/plugins/addressbook/icons/person.png
-lib/luma/plugins/addressbook/icons/personal.png
-lib/luma/plugins/addressbook/icons/phone.png
-lib/luma/plugins/addressbook/icons/url.png
-lib/luma/plugins/addressbook/icons/work.png
-@dirrm lib/luma/plugins/addressbook/icons
 lib/luma/plugins/addressbook/plugin.meta
+lib/luma/plugins/addressbook/Addressbook.pyc
+lib/luma/plugins/addressbook/AddressbookSettings.pyc
+lib/luma/plugins/addressbook/AddressbookSettingsDesign.pyc
+lib/luma/plugins/addressbook/AddressbookView.pyc
+lib/luma/plugins/addressbook/AddressbookWidget.pyc
+lib/luma/plugins/addressbook/AddressbookWidgetDesign.pyc
+lib/luma/plugins/addressbook/CategoryEditDialog.pyc
+lib/luma/plugins/addressbook/CategoryEditDialogDesign.pyc
+lib/luma/plugins/addressbook/ContactWizard.pyc
+lib/luma/plugins/addressbook/ContactWizardDesign.pyc
+lib/luma/plugins/addressbook/NameDialog.pyc
+lib/luma/plugins/addressbook/NewCategoryDialog.pyc
+lib/luma/plugins/addressbook/__init__.pyc
+lib/luma/plugins/addressbook/Addressbook.py
 @dirrm lib/luma/plugins/addressbook
-lib/luma/plugins/admin_utils/AdminPanel.py
-lib/luma/plugins/admin_utils/AdminPanel.pyc
-lib/luma/plugins/admin_utils/AdminPanelDesign.py
-lib/luma/plugins/admin_utils/AdminPanelDesign.pyc
-lib/luma/plugins/admin_utils/AdminPanelDesign.ui
-lib/luma/plugins/admin_utils/__init__.py
-lib/luma/plugins/admin_utils/__init__.pyc
-lib/luma/plugins/admin_utils/admin_utilities_plugin.py
-lib/luma/plugins/admin_utils/admin_utilities_plugin.pyc
-lib/luma/plugins/admin_utils/icons/admin_utils.png
-lib/luma/plugins/admin_utils/icons/date.png
-lib/luma/plugins/admin_utils/icons/secure.png
-@dirrm lib/luma/plugins/admin_utils/icons
-lib/luma/plugins/admin_utils/plugin.meta
-@dirrm lib/luma/plugins/admin_utils
-lib/luma/plugins/browser_plugin/BrowserView.py
-lib/luma/plugins/browser_plugin/BrowserView.pyc
-lib/luma/plugins/browser_plugin/__init__.py
-lib/luma/plugins/browser_plugin/__init__.pyc
-lib/luma/plugins/browser_plugin/browser_plugin.py
-lib/luma/plugins/browser_plugin/browser_plugin.pyc
-lib/luma/plugins/browser_plugin/icons/plugin.png
-@dirrm lib/luma/plugins/browser_plugin/icons
-lib/luma/plugins/browser_plugin/plugin.meta
-@dirrm lib/luma/plugins/browser_plugin
-lib/luma/plugins/mass_creation_plugin/MassCreation.py
-lib/luma/plugins/mass_creation_plugin/MassCreation.pyc
+lib/luma/plugins/search_plugin/search_plugin.py
+lib/luma/plugins/search_plugin/__init__.py
+lib/luma/plugins/search_plugin/plugin.meta
+lib/luma/plugins/search_plugin/SearchView.py
+lib/luma/plugins/search_plugin/SearchView.pyc
+lib/luma/plugins/search_plugin/__init__.pyc
+lib/luma/plugins/search_plugin/search_plugin.pyc
+@dirrm lib/luma/plugins/search_plugin
+lib/luma/plugins/mass_creation_plugin/massive_users_plugin.pyc
 lib/luma/plugins/mass_creation_plugin/MassCreationDesign.py
-lib/luma/plugins/mass_creation_plugin/MassCreationDesign.pyc
 lib/luma/plugins/mass_creation_plugin/MassCreationDesign.ui
 lib/luma/plugins/mass_creation_plugin/__init__.py
-lib/luma/plugins/mass_creation_plugin/__init__.pyc
-lib/luma/plugins/mass_creation_plugin/icons/massive_users.png
-@dirrm lib/luma/plugins/mass_creation_plugin/icons
 lib/luma/plugins/mass_creation_plugin/massive_users_plugin.py
-lib/luma/plugins/mass_creation_plugin/massive_users_plugin.pyc
 lib/luma/plugins/mass_creation_plugin/plugin.meta
+lib/luma/plugins/mass_creation_plugin/MassCreation.pyc
+lib/luma/plugins/mass_creation_plugin/MassCreationDesign.pyc
+lib/luma/plugins/mass_creation_plugin/__init__.pyc
+lib/luma/plugins/mass_creation_plugin/MassCreation.py
 @dirrm lib/luma/plugins/mass_creation_plugin
-lib/luma/plugins/search_plugin/SearchView.py
-lib/luma/plugins/search_plugin/SearchView.pyc
-lib/luma/plugins/search_plugin/__init__.py
-lib/luma/plugins/search_plugin/__init__.pyc
-lib/luma/plugins/search_plugin/icons/plugin.png
-@dirrm lib/luma/plugins/search_plugin/icons
-lib/luma/plugins/search_plugin/plugin.meta
-lib/luma/plugins/search_plugin/search_plugin.py
-lib/luma/plugins/search_plugin/search_plugin.pyc
-@dirrm lib/luma/plugins/search_plugin
-lib/luma/plugins/template_plugin/OClassDialog.py
-lib/luma/plugins/template_plugin/OClassDialog.pyc
-lib/luma/plugins/template_plugin/OClassDialogDesign.py
-lib/luma/plugins/template_plugin/OClassDialogDesign.pyc
-lib/luma/plugins/template_plugin/OClassDialogDesign.ui
-lib/luma/plugins/template_plugin/TemplateForm.py
-lib/luma/plugins/template_plugin/TemplateForm.pyc
-lib/luma/plugins/template_plugin/TemplateFormDesign.py
-lib/luma/plugins/template_plugin/TemplateFormDesign.pyc
-lib/luma/plugins/template_plugin/TemplateFormDesign.ui
-lib/luma/plugins/template_plugin/TemplateFormDesign.ui.backup
-lib/luma/plugins/template_plugin/__init__.py
-lib/luma/plugins/template_plugin/__init__.pyc
-lib/luma/plugins/template_plugin/icons/add.png
-lib/luma/plugins/template_plugin/icons/down.png
-lib/luma/plugins/template_plugin/icons/plugin.png
-lib/luma/plugins/template_plugin/icons/remove.png
-lib/luma/plugins/template_plugin/icons/up.png
-@dirrm lib/luma/plugins/template_plugin/icons
-lib/luma/plugins/template_plugin/plugin.meta
-lib/luma/plugins/template_plugin/template_plugin.py
-lib/luma/plugins/template_plugin/template_plugin.pyc
-@dirrm lib/luma/plugins/template_plugin
+lib/luma/plugins/__init__.py
+lib/luma/plugins/__init__.pyc
 @dirrm lib/luma/plugins
+lib/luma/environment/__init__.py
+lib/luma/environment/__init__.pyc
+@dirrm lib/luma/environment
+lib/luma/luma.py
+lib/luma/__init__.py
+lib/luma/__init__.pyc
+lib/luma/luma.pyc
 @dirrm lib/luma
-%%DATADIR%%/doc/massive.help
-@dirrm %%DATADIR%%/doc
-%%DATADIR%%/i18n/br.png
-%%DATADIR%%/i18n/de.png
-%%DATADIR%%/i18n/es.png
-%%DATADIR%%/i18n/gb.png
-%%DATADIR%%/i18n/luma_br.qm
-%%DATADIR%%/i18n/luma_de.qm
-%%DATADIR%%/i18n/luma_es.qm
-%%DATADIR%%/i18n/luma_fr.qm
-%%DATADIR%%/i18n/luma_no.qm
-%%DATADIR%%/i18n/no.png
-@dirrm %%DATADIR%%/i18n
-%%DATADIR%%/icons/clear.png
-%%DATADIR%%/icons/config.png
-%%DATADIR%%/icons/deleteEntry.png
-%%DATADIR%%/icons/error.png
-%%DATADIR%%/icons/exportLdif.png
-%%DATADIR%%/icons/final.png
-%%DATADIR%%/icons/help.png
-%%DATADIR%%/icons/language.png
-%%DATADIR%%/icons/manage.png
-%%DATADIR%%/icons/new.png
-%%DATADIR%%/icons/newEntry.png
-%%DATADIR%%/icons/no.png
-%%DATADIR%%/icons/ok.png
-%%DATADIR%%/icons/secure.png
-%%DATADIR%%/icons/server.png
-%%DATADIR%%/icons/world.png
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
+share/luma/doc/massive.help
+@dirrm share/luma/doc
+share/luma/i18n/luma_sv.qm
+share/luma/i18n/br.png
+share/luma/i18n/de.png
+share/luma/i18n/es.png
+share/luma/i18n/gb.png
+share/luma/i18n/luma_ru.qm
+share/luma/i18n/luma_de.qm
+share/luma/i18n/luma_es.qm
+share/luma/i18n/luma_fr.qm
+share/luma/i18n/luma_no.qm
+share/luma/i18n/no.png
+share/luma/i18n/ru.png
+share/luma/i18n/sv.png
+share/luma/i18n/luma_br.qm
+@dirrm share/luma/i18n
+share/luma/icons/plugins/mass_creation_plugin/massive_users.png
+@dirrm share/luma/icons/plugins/mass_creation_plugin
+share/luma/icons/plugins/admin_utils/admin_utils.png
+share/luma/icons/plugins/admin_utils/date.png
+share/luma/icons/plugins/admin_utils/secure.png
+@dirrm share/luma/icons/plugins/admin_utils
+share/luma/icons/plugins/browser_plugin/plugin.png
+@dirrm share/luma/icons/plugins/browser_plugin
+share/luma/icons/plugins/addressbook/work.png
+share/luma/icons/plugins/addressbook/category.png
+share/luma/icons/plugins/addressbook/email.png
+share/luma/icons/plugins/addressbook/home.png
+share/luma/icons/plugins/addressbook/location.png
+share/luma/icons/plugins/addressbook/person.png
+share/luma/icons/plugins/addressbook/personal.png
+share/luma/icons/plugins/addressbook/phone.png
+share/luma/icons/plugins/addressbook/url.png
+share/luma/icons/plugins/addressbook/addressbook.png
+@dirrm share/luma/icons/plugins/addressbook
+share/luma/icons/plugins/search_plugin/plugin.png
+@dirrm share/luma/icons/plugins/search_plugin
+share/luma/icons/plugins/template_plugin/down.png
+share/luma/icons/plugins/template_plugin/add.png
+share/luma/icons/plugins/template_plugin/plugin.png
+share/luma/icons/plugins/template_plugin/remove.png
+share/luma/icons/plugins/template_plugin/up.png
+@dirrm share/luma/icons/plugins/template_plugin
+share/luma/icons/plugins/usermanagement/usermanagement.png
+share/luma/icons/plugins/usermanagement/entry.png
+share/luma/icons/plugins/usermanagement/password.png
+share/luma/icons/plugins/usermanagement/shell.png
+share/luma/icons/plugins/usermanagement/email.png
+share/luma/icons/plugins/usermanagement/home.png
+share/luma/icons/plugins/usermanagement/groupbig.png
+share/luma/icons/plugins/usermanagement/group.png
+@dirrm share/luma/icons/plugins/usermanagement
+@dirrm share/luma/icons/plugins
+share/luma/icons/AdvancedObjectWidget/binary.png
+share/luma/icons/AdvancedObjectWidget/delete.png
+share/luma/icons/AdvancedObjectWidget/displayall.png
+share/luma/icons/AdvancedObjectWidget/save.png
+share/luma/icons/AdvancedObjectWidget/single.png
+@dirrm share/luma/icons/AdvancedObjectWidget
+share/luma/icons/mainwin/exit.png
+share/luma/icons/mainwin/configure.png
+share/luma/icons/mainwin/domtreeviewer.png
+share/luma/icons/mainwin/bookmark.png
+share/luma/icons/mainwin/fileclose.png
+share/luma/icons/mainwin/gear.png
+share/luma/icons/mainwin/reload.png
+@dirrm share/luma/icons/mainwin
+share/luma/icons/clear.png
+share/luma/icons/config.png
+share/luma/icons/delete.png
+share/luma/icons/deleteEntry.png
+share/luma/icons/delete_small.png
+share/luma/icons/displayall.png
+share/luma/icons/edit.png
+share/luma/icons/error.png
+share/luma/icons/exportBinary.png
+share/luma/icons/exportLdif.png
+share/luma/icons/final.png
+share/luma/icons/help.png
+share/luma/icons/language.png
+share/luma/icons/manage.png
+share/luma/icons/new.png
+share/luma/icons/newEntry.png
+share/luma/icons/no.png
+share/luma/icons/objectclass.png
+share/luma/icons/ok.png
+share/luma/icons/reload.png
+share/luma/icons/save.png
+share/luma/icons/secure.png
+share/luma/icons/server.png
+share/luma/icons/single.png
+share/luma/icons/world.png
+share/luma/icons/email.png
+share/luma/icons/editdelete.png
+share/luma/icons/view_tree.png
+share/luma/icons/view_icon.png
+share/luma/icons/password_big.png
+share/luma/icons/worldmedium.png
+share/luma/icons/passwordmedium.png
+share/luma/icons/addattribute.png
+share/luma/icons/binary.png
+@dirrm share/luma/icons
+@dirrm share/luma