diff --git a/wmdocklib/3x5.xpm b/pywmdockapps/3x5.xpm similarity index 100% rename from wmdocklib/3x5.xpm rename to pywmdockapps/3x5.xpm diff --git a/wmdocklib/4x6.xpm b/pywmdockapps/4x6.xpm similarity index 100% rename from wmdocklib/4x6.xpm rename to pywmdockapps/4x6.xpm diff --git a/wmdocklib/4x7.xpm b/pywmdockapps/4x7.xpm similarity index 100% rename from wmdocklib/4x7.xpm rename to pywmdockapps/4x7.xpm diff --git a/wmdocklib/5x7-aa.xpm b/pywmdockapps/5x7-aa.xpm similarity index 100% rename from wmdocklib/5x7-aa.xpm rename to pywmdockapps/5x7-aa.xpm diff --git a/wmdocklib/5x7.xpm b/pywmdockapps/5x7.xpm similarity index 100% rename from wmdocklib/5x7.xpm rename to pywmdockapps/5x7.xpm diff --git a/wmdocklib/5x8-utf-8.xpm b/pywmdockapps/5x8-utf-8.xpm similarity index 100% rename from wmdocklib/5x8-utf-8.xpm rename to pywmdockapps/5x8-utf-8.xpm diff --git a/wmdocklib/5x8.xpm b/pywmdockapps/5x8.xpm similarity index 100% rename from wmdocklib/5x8.xpm rename to pywmdockapps/5x8.xpm diff --git a/wmdocklib/5x9.xpm b/pywmdockapps/5x9.xpm similarity index 100% rename from wmdocklib/5x9.xpm rename to pywmdockapps/5x9.xpm diff --git a/wmdocklib/6(3)x8-7seg.xpm b/pywmdockapps/6(3)x8-7seg.xpm similarity index 100% rename from wmdocklib/6(3)x8-7seg.xpm rename to pywmdockapps/6(3)x8-7seg.xpm diff --git a/wmdocklib/6x11-utf-8.xpm b/pywmdockapps/6x11-utf-8.xpm similarity index 100% rename from wmdocklib/6x11-utf-8.xpm rename to pywmdockapps/6x11-utf-8.xpm diff --git a/wmdocklib/6x12.xpm b/pywmdockapps/6x12.xpm similarity index 100% rename from wmdocklib/6x12.xpm rename to pywmdockapps/6x12.xpm diff --git a/wmdocklib/6x8-7seg.xpm b/pywmdockapps/6x8-7seg.xpm similarity index 100% rename from wmdocklib/6x8-7seg.xpm rename to pywmdockapps/6x8-7seg.xpm diff --git a/wmdocklib/6x8.xpm b/pywmdockapps/6x8.xpm similarity index 100% rename from wmdocklib/6x8.xpm rename to pywmdockapps/6x8.xpm diff --git a/wmdocklib/6x8orig.xpm b/pywmdockapps/6x8orig.xpm similarity index 100% rename from wmdocklib/6x8orig.xpm rename to pywmdockapps/6x8orig.xpm diff --git a/wmdocklib/6x8slant.xpm b/pywmdockapps/6x8slant.xpm similarity index 100% rename from wmdocklib/6x8slant.xpm rename to pywmdockapps/6x8slant.xpm diff --git a/wmdocklib/7x12-41c.xpm b/pywmdockapps/7x12-41c.xpm similarity index 100% rename from wmdocklib/7x12-41c.xpm rename to pywmdockapps/7x12-41c.xpm diff --git a/wmdocklib/7x14-utf-8.xpm b/pywmdockapps/7x14-utf-8.xpm similarity index 100% rename from wmdocklib/7x14-utf-8.xpm rename to pywmdockapps/7x14-utf-8.xpm diff --git a/wmdocklib/7x8zx.xpm b/pywmdockapps/7x8zx.xpm similarity index 100% rename from wmdocklib/7x8zx.xpm rename to pywmdockapps/7x8zx.xpm diff --git a/wmdocklib/8x12-41c.xpm b/pywmdockapps/8x12-41c.xpm similarity index 100% rename from wmdocklib/8x12-41c.xpm rename to pywmdockapps/8x12-41c.xpm diff --git a/wmdocklib/8x13-utf-8.xpm b/pywmdockapps/8x13-utf-8.xpm similarity index 100% rename from wmdocklib/8x13-utf-8.xpm rename to pywmdockapps/8x13-utf-8.xpm diff --git a/wmdocklib/8x8-cholo.xpm b/pywmdockapps/8x8-cholo.xpm similarity index 100% rename from wmdocklib/8x8-cholo.xpm rename to pywmdockapps/8x8-cholo.xpm diff --git a/wmdocklib/8x8.xpm b/pywmdockapps/8x8.xpm similarity index 100% rename from wmdocklib/8x8.xpm rename to pywmdockapps/8x8.xpm diff --git a/wmdocklib/8x8zx.xpm b/pywmdockapps/8x8zx.xpm similarity index 100% rename from wmdocklib/8x8zx.xpm rename to pywmdockapps/8x8zx.xpm diff --git a/wmdocklib/9x18-utf-8.xpm b/pywmdockapps/9x18-utf-8.xpm similarity index 100% rename from wmdocklib/9x18-utf-8.xpm rename to pywmdockapps/9x18-utf-8.xpm diff --git a/wmdocklib/README b/pywmdockapps/README similarity index 100% rename from wmdocklib/README rename to pywmdockapps/README diff --git a/wmdocklib/__init__.py b/pywmdockapps/__init__.py similarity index 100% rename from wmdocklib/__init__.py rename to pywmdockapps/__init__.py diff --git a/wmdocklib/pywmgeneral.c b/pywmdockapps/pywmgeneral.c similarity index 100% rename from wmdocklib/pywmgeneral.c rename to pywmdockapps/pywmgeneral.c diff --git a/wmdocklib/pywmgeneral.h b/pywmdockapps/pywmgeneral.h similarity index 100% rename from wmdocklib/pywmgeneral.h rename to pywmdockapps/pywmgeneral.h diff --git a/wmdocklib/pywmhelpers.py b/pywmdockapps/pywmhelpers.py similarity index 100% rename from wmdocklib/pywmhelpers.py rename to pywmdockapps/pywmhelpers.py diff --git a/wmdocklib/wmoo.py b/pywmdockapps/wmoo.py similarity index 100% rename from wmdocklib/wmoo.py rename to pywmdockapps/wmoo.py diff --git a/setup.py b/setup.py index 6cc228e..fe4581d 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,28 @@ #!/usr/bin/env python +from __future__ import absolute_import +from setuptools import setup, Extension # Set these so they match your system. -from __future__ import absolute_import XLibDir = '/usr/lib/x11' XIncludes = '/usr/include/x11' -from setuptools import setup, Extension - -pywmgeneral = Extension('wmdocklib.pywmgeneral', +# Changed 'wmdocklib.pywmgeneral' -> 'pywmdockapps.pywmgeneral' +# Changed source path 'wmdocklib/pywmgeneral.c' -> 'pywmdockapps/pywmgeneral.c' +pywmgeneral = Extension('pywmdockapps.pywmgeneral', libraries = ['Xpm', 'Xext', 'X11'], library_dirs = [XLibDir], include_dirs = [XIncludes], - sources = ['wmdocklib/pywmgeneral.c']) + sources = ['pywmdockapps/pywmgeneral.c']) setup( name="pywmdockapps", version = "$Revision: 1.99 $"[11:-2], - description="This helper functions for windowmaker dockapps\nRead the whole story at http://pywmdockapps.sourceforge.net/", + description="This helper functions for windowmaker dockapps", author="Kristoffer Erlandsson & al.", author_email="mfrasca@zonnet.nl", url="http://pywmdockapps.sourceforge.net", license="(L)GPL", - packages=['wmdocklib'], - package_data={'wmdocklib': ['*.xpm']}, + packages=['pywmdockapps'], # Changed here + package_data={'pywmdockapps': ['*.xpm']}, # Changed here ext_modules=[pywmgeneral], )