diff --git a/setup.py b/setup.py index fe4581d..0eee4a7 100644 --- a/setup.py +++ b/setup.py @@ -8,11 +8,11 @@ XIncludes = '/usr/include/x11' # Changed 'wmdocklib.pywmgeneral' -> 'pywmdockapps.pywmgeneral' # Changed source path 'wmdocklib/pywmgeneral.c' -> 'pywmdockapps/pywmgeneral.c' -pywmgeneral = Extension('pywmdockapps.pywmgeneral', +pywmgeneral = Extension('wmdocklib.pywmgeneral', libraries = ['Xpm', 'Xext', 'X11'], library_dirs = [XLibDir], include_dirs = [XIncludes], - sources = ['pywmdockapps/pywmgeneral.c']) + sources = ['wmdocklib/pywmgeneral.c']) setup( name="pywmdockapps", @@ -22,7 +22,7 @@ setup( author_email="mfrasca@zonnet.nl", url="http://pywmdockapps.sourceforge.net", license="(L)GPL", - packages=['pywmdockapps'], # Changed here - package_data={'pywmdockapps': ['*.xpm']}, # Changed here + packages=['wmdocklib'], + package_data={'wmdocklib': ['*.xpm']}, ext_modules=[pywmgeneral], ) diff --git a/pywmdockapps/3x5.xpm b/wmdocklib/3x5.xpm similarity index 100% rename from pywmdockapps/3x5.xpm rename to wmdocklib/3x5.xpm diff --git a/pywmdockapps/4x6.xpm b/wmdocklib/4x6.xpm similarity index 100% rename from pywmdockapps/4x6.xpm rename to wmdocklib/4x6.xpm diff --git a/pywmdockapps/4x7.xpm b/wmdocklib/4x7.xpm similarity index 100% rename from pywmdockapps/4x7.xpm rename to wmdocklib/4x7.xpm diff --git a/pywmdockapps/5x7-aa.xpm b/wmdocklib/5x7-aa.xpm similarity index 100% rename from pywmdockapps/5x7-aa.xpm rename to wmdocklib/5x7-aa.xpm diff --git a/pywmdockapps/5x7.xpm b/wmdocklib/5x7.xpm similarity index 100% rename from pywmdockapps/5x7.xpm rename to wmdocklib/5x7.xpm diff --git a/pywmdockapps/5x8-utf-8.xpm b/wmdocklib/5x8-utf-8.xpm similarity index 100% rename from pywmdockapps/5x8-utf-8.xpm rename to wmdocklib/5x8-utf-8.xpm diff --git a/pywmdockapps/5x8.xpm b/wmdocklib/5x8.xpm similarity index 100% rename from pywmdockapps/5x8.xpm rename to wmdocklib/5x8.xpm diff --git a/pywmdockapps/5x9.xpm b/wmdocklib/5x9.xpm similarity index 100% rename from pywmdockapps/5x9.xpm rename to wmdocklib/5x9.xpm diff --git a/pywmdockapps/6(3)x8-7seg.xpm b/wmdocklib/6(3)x8-7seg.xpm similarity index 100% rename from pywmdockapps/6(3)x8-7seg.xpm rename to wmdocklib/6(3)x8-7seg.xpm diff --git a/pywmdockapps/6x11-utf-8.xpm b/wmdocklib/6x11-utf-8.xpm similarity index 100% rename from pywmdockapps/6x11-utf-8.xpm rename to wmdocklib/6x11-utf-8.xpm diff --git a/pywmdockapps/6x12.xpm b/wmdocklib/6x12.xpm similarity index 100% rename from pywmdockapps/6x12.xpm rename to wmdocklib/6x12.xpm diff --git a/pywmdockapps/6x8-7seg.xpm b/wmdocklib/6x8-7seg.xpm similarity index 100% rename from pywmdockapps/6x8-7seg.xpm rename to wmdocklib/6x8-7seg.xpm diff --git a/pywmdockapps/6x8.xpm b/wmdocklib/6x8.xpm similarity index 100% rename from pywmdockapps/6x8.xpm rename to wmdocklib/6x8.xpm diff --git a/pywmdockapps/6x8orig.xpm b/wmdocklib/6x8orig.xpm similarity index 100% rename from pywmdockapps/6x8orig.xpm rename to wmdocklib/6x8orig.xpm diff --git a/pywmdockapps/6x8slant.xpm b/wmdocklib/6x8slant.xpm similarity index 100% rename from pywmdockapps/6x8slant.xpm rename to wmdocklib/6x8slant.xpm diff --git a/pywmdockapps/7x12-41c.xpm b/wmdocklib/7x12-41c.xpm similarity index 100% rename from pywmdockapps/7x12-41c.xpm rename to wmdocklib/7x12-41c.xpm diff --git a/pywmdockapps/7x14-utf-8.xpm b/wmdocklib/7x14-utf-8.xpm similarity index 100% rename from pywmdockapps/7x14-utf-8.xpm rename to wmdocklib/7x14-utf-8.xpm diff --git a/pywmdockapps/7x8zx.xpm b/wmdocklib/7x8zx.xpm similarity index 100% rename from pywmdockapps/7x8zx.xpm rename to wmdocklib/7x8zx.xpm diff --git a/pywmdockapps/8x12-41c.xpm b/wmdocklib/8x12-41c.xpm similarity index 100% rename from pywmdockapps/8x12-41c.xpm rename to wmdocklib/8x12-41c.xpm diff --git a/pywmdockapps/8x13-utf-8.xpm b/wmdocklib/8x13-utf-8.xpm similarity index 100% rename from pywmdockapps/8x13-utf-8.xpm rename to wmdocklib/8x13-utf-8.xpm diff --git a/pywmdockapps/8x8-cholo.xpm b/wmdocklib/8x8-cholo.xpm similarity index 100% rename from pywmdockapps/8x8-cholo.xpm rename to wmdocklib/8x8-cholo.xpm diff --git a/pywmdockapps/8x8.xpm b/wmdocklib/8x8.xpm similarity index 100% rename from pywmdockapps/8x8.xpm rename to wmdocklib/8x8.xpm diff --git a/pywmdockapps/8x8zx.xpm b/wmdocklib/8x8zx.xpm similarity index 100% rename from pywmdockapps/8x8zx.xpm rename to wmdocklib/8x8zx.xpm diff --git a/pywmdockapps/9x18-utf-8.xpm b/wmdocklib/9x18-utf-8.xpm similarity index 100% rename from pywmdockapps/9x18-utf-8.xpm rename to wmdocklib/9x18-utf-8.xpm diff --git a/pywmdockapps/README b/wmdocklib/README similarity index 100% rename from pywmdockapps/README rename to wmdocklib/README diff --git a/pywmdockapps/__init__.py b/wmdocklib/__init__.py similarity index 100% rename from pywmdockapps/__init__.py rename to wmdocklib/__init__.py diff --git a/pywmdockapps/pywmgeneral.c b/wmdocklib/pywmgeneral.c similarity index 100% rename from pywmdockapps/pywmgeneral.c rename to wmdocklib/pywmgeneral.c diff --git a/pywmdockapps/pywmgeneral.h b/wmdocklib/pywmgeneral.h similarity index 100% rename from pywmdockapps/pywmgeneral.h rename to wmdocklib/pywmgeneral.h diff --git a/pywmdockapps/pywmhelpers.py b/wmdocklib/pywmhelpers.py similarity index 100% rename from pywmdockapps/pywmhelpers.py rename to wmdocklib/pywmhelpers.py diff --git a/pywmdockapps/wmoo.py b/wmdocklib/wmoo.py similarity index 100% rename from pywmdockapps/wmoo.py rename to wmdocklib/wmoo.py