misc: change module name and installation directory (#17959)

MANIFEST.in

@@ -7,7 +7,7 @@ include po/*.po
 include po/*.pot
 recursive-include apache-errors/ *.html
 recursive-include data/themes/ *.css *.png *.jpeg '*.jpg *.xml *.html *.js *.ezt *.gif *.otf
-recursive-include extra/ *.py
+recursive-include auquotidien/ *.py
 recursive-include static/ *.png *.jpeg '*.jpg *.js *.gif
 recursive-include texts/ *.html
 recursive-include theme/ *.css *.png *.jpeg '*.jpg *.xml *.html *.js *.ezt *.gif

debian/rules

@@ -31,9 +31,6 @@ install: build
 	dh_installdirs
 
 	$(PYTHON) setup.py install --prefix=$(DESTDIR)/usr --no-compile
-	for i in $(CURDIR)/debian/wcs-au-quotidien/usr/lib/python2.*; do \
-		mv $$i/site-packages/extra \
-			$$i/site-packages/extra-wcs-au-quotidien; done
 	cd po && make install prefix=$(CURDIR)/debian/wcs-au-quotidien/
 	install -d -m 755 $(DESTDIR)/var/lib/wcs-au-quotidien $(DESTDIR)/etc/wcs
 	install -m 644 wcs-au-quotidien.cfg-sample $(DESTDIR)/etc/wcs/wcs-au-quotidien.cfg

debian/wcs-au-quotidien.init

@@ -19,7 +19,7 @@ PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 PYTHON_VERSION=`/usr/bin/env python -c \
     "import sys; print '%d.%d' % (sys.version_info[0], sys.version_info[1])"`
-OPTIONS="--extra /usr/lib/pymodules/python$PYTHON_VERSION/extra-wcs-au-quotidien/"
+OPTIONS="--extra /usr/lib/pymodules/python$PYTHON_VERSION/auquotidien/"
 WCS_USER=wcs-au-quotidien
 WCS_GROUP=wcs-au-quotidien
 CONFIG_FILE=/etc/wcs/wcs-au-quotidien.cfg

setup.py

@@ -55,8 +55,8 @@ distutils.core.setup(
         version = get_version(),
         maintainer = 'Frederic Peters',
         maintainer_email = 'fpeters@entrouvert.com',
-        package_dir = { 'extra': 'extra' },
-        packages = ['extra', 'extra.modules', 'extra.modules.pyatom'],
+        package_dir = {'auquotidien': 'auquotidien'},
+        packages = ['auquotidien', 'auquotidien.modules', 'auquotidien.modules.pyatom'],
         cmdclass = {'build_py': qx_build_py,
                     'sdist': eo_sdist},
         data_files = data_tree('share/wcs/texts', 'texts') +\

tests/utilities.py

@@ -20,7 +20,7 @@ def create_temporary_pub():
     publisher.WcsPublisher.DATA_DIR = os.path.abspath(
             os.path.join(os.path.dirname(wcs.__file__), '..', 'data'))
     config.add_section('extra')
-    config.set('extra', 'auquotidien', os.path.join(os.path.dirname(__file__), '..', 'extra'))
+    config.set('extra', 'auquotidien', os.path.join(os.path.dirname(__file__), '..', 'auquotidien'))
     publisher.WcsPublisher.configure(config)
     pub = publisher.WcsPublisher.create_publisher()
     # allow saving the user