Merge lp:~mgorven/ibid/top-level-modules into lp:~ibid-core/ibid/old-trunk-1.6

[Michael Gorven]

[Michael Gorven (mgorven)]

Moves the data and lib modules into the ibid module, so that we can use pycentral for the debian packaging.

[lp:~mgorven/ibid/top-level-modules]

820. By Michael Gorven on 2010-01-02

/./ isn't necessary.

[Stefano Rivera (stefanor)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2009-12-02 11:33:42 +0000
+++ MANIFEST.in	2010-01-02 10:09:13 +0000
@@ -2,8 +2,8 @@
 recursive-include ibid/templates *
 recursive-include tracibid *.py
 recursive-include contrib *
-recursive-include lib *
-recursive-include data *
+recursive-include ibid/lib *.py
+recursive-include ibid/data *
 recursive-include docs *
 include factpacks/*.json
 include ibid/*.ini

=== modified file 'ibid/__init__.py'
--- ibid/__init__.py	2009-12-28 09:45:29 +0000
+++ ibid/__init__.py	2010-01-02 10:09:13 +0000
@@ -5,7 +5,7 @@
 from ConfigParser import SafeConfigParser
 
 import sys
-sys.path.insert(0, '%s/../lib' % dirname(__file__))
+sys.path.insert(0, '%s/lib' % dirname(__file__))
 
 import twisted.python.log
 

=== renamed directory 'data' => 'ibid/data'
=== renamed directory 'lib' => 'ibid/lib'
=== modified file 'ibid/plugins/url.py'
--- ibid/plugins/url.py	2009-12-29 15:56:52 +0000
+++ ibid/plugins/url.py	2010-01-02 10:09:13 +0000
@@ -126,9 +126,9 @@
     delicious = Delicious()
 
     def setup(self):
-        if resource_exists(__name__, '../../data/tlds-alpha-by-domain.txt'):
+        if resource_exists(__name__, '../data/tlds-alpha-by-domain.txt'):
             tlds = [tld.strip().lower() for tld
-                    in resource_stream(__name__, '../../data/tlds-alpha-by-domain.txt')
+                    in resource_stream(__name__, '../data/tlds-alpha-by-domain.txt')
                         .readlines()
                     if not tld.startswith('#')
             ]

=== modified file 'setup.py'
--- setup.py	2009-08-11 06:38:56 +0000
+++ setup.py	2010-01-02 10:09:13 +0000
@@ -42,7 +42,7 @@
         'http://ibid.omnia.za.net/eggs/',
         'http://wokkel.ik.nu/downloads',
     ],
-    packages=['ibid', 'tracibid', 'lib', 'twisted', 'data', 'contrib', 'factpacks'],
+    packages=['ibid', 'tracibid', 'twisted', 'contrib', 'factpacks'],
     entry_points={
         'trac.plugins': ['tracibid = tracibid.notifier'],
     },