Projet

Général

Profil

0001-misc-change-module-name-and-installation-directory-1.patch

Frédéric Péters, 10 août 2017 13:36

Télécharger (13,8 ko)

Voir les différences: 

Subject: [PATCH] misc: change module name and installation directory (#17959)


 MANIFEST.in                                               | 2 +-
 {extra => auquotidien}/auquotidien.py                     | 0
 {extra => auquotidien}/modules/__init__.py                | 0
 {extra => auquotidien}/modules/abelium_domino_synchro.py  | 0
 {extra => auquotidien}/modules/abelium_domino_ui.py       | 0
 {extra => auquotidien}/modules/abelium_domino_vars.py     | 0
 {extra => auquotidien}/modules/abelium_domino_workflow.py | 0
 {extra => auquotidien}/modules/abelium_domino_ws.py       | 0
 {extra => auquotidien}/modules/admin.py                   | 0
 {extra => auquotidien}/modules/agenda.py                  | 0
 {extra => auquotidien}/modules/announces.py               | 0
 {extra => auquotidien}/modules/announces_ui.py            | 0
 {extra => auquotidien}/modules/backoffice.py              | 0
 {extra => auquotidien}/modules/categories_admin.py        | 0
 {extra => auquotidien}/modules/clicrdv.py                 | 0
 {extra => auquotidien}/modules/connectors.py              | 0
 {extra => auquotidien}/modules/events.py                  | 0
 {extra => auquotidien}/modules/events_ui.py               | 0
 {extra => auquotidien}/modules/formpage.py                | 0
 {extra => auquotidien}/modules/links.py                   | 0
 {extra => auquotidien}/modules/links_ui.py                | 0
 {extra => auquotidien}/modules/myspace.py                 | 0
 {extra => auquotidien}/modules/payments.py                | 0
 {extra => auquotidien}/modules/payments_ui.py             | 0
 {extra => auquotidien}/modules/pyatom/__init__.py         | 0
 {extra => auquotidien}/modules/pyatom/afl-2.1.txt         | 0
 {extra => auquotidien}/modules/pyatom/pyatom.py           | 0
 {extra => auquotidien}/modules/pyatom/readme.txt          | 0
 {extra => auquotidien}/modules/root.py                    | 0
 {extra => auquotidien}/modules/saml2.py                   | 0
 {extra => auquotidien}/modules/strongbox.py               | 0
 {extra => auquotidien}/modules/strongbox_ui.py            | 0
 {extra => auquotidien}/modules/template.py                | 0
 debian/rules                                              | 3 ---
 debian/wcs-au-quotidien.init                              | 2 +-
 po/Makefile                                               | 2 +-
 setup.py                                                  | 4 ++--
 tests/utilities.py                                        | 2 +-
 38 files changed, 6 insertions(+), 9 deletions(-)
 rename {extra => auquotidien}/auquotidien.py (100%)
 rename {extra => auquotidien}/modules/__init__.py (100%)
 rename {extra => auquotidien}/modules/abelium_domino_synchro.py (100%)
 rename {extra => auquotidien}/modules/abelium_domino_ui.py (100%)
 rename {extra => auquotidien}/modules/abelium_domino_vars.py (100%)
 rename {extra => auquotidien}/modules/abelium_domino_workflow.py (100%)
 rename {extra => auquotidien}/modules/abelium_domino_ws.py (100%)
 rename {extra => auquotidien}/modules/admin.py (100%)
 rename {extra => auquotidien}/modules/agenda.py (100%)
 rename {extra => auquotidien}/modules/announces.py (100%)
 rename {extra => auquotidien}/modules/announces_ui.py (100%)
 rename {extra => auquotidien}/modules/backoffice.py (100%)
 rename {extra => auquotidien}/modules/categories_admin.py (100%)
 rename {extra => auquotidien}/modules/clicrdv.py (100%)
 rename {extra => auquotidien}/modules/connectors.py (100%)
 rename {extra => auquotidien}/modules/events.py (100%)
 rename {extra => auquotidien}/modules/events_ui.py (100%)
 rename {extra => auquotidien}/modules/formpage.py (100%)
 rename {extra => auquotidien}/modules/links.py (100%)
 rename {extra => auquotidien}/modules/links_ui.py (100%)
 rename {extra => auquotidien}/modules/myspace.py (100%)
 rename {extra => auquotidien}/modules/payments.py (100%)
 rename {extra => auquotidien}/modules/payments_ui.py (100%)
 rename {extra => auquotidien}/modules/pyatom/__init__.py (100%)
 rename {extra => auquotidien}/modules/pyatom/afl-2.1.txt (100%)
 rename {extra => auquotidien}/modules/pyatom/pyatom.py (100%)
 rename {extra => auquotidien}/modules/pyatom/readme.txt (100%)
 rename {extra => auquotidien}/modules/root.py (100%)
 rename {extra => auquotidien}/modules/saml2.py (100%)
 rename {extra => auquotidien}/modules/strongbox.py (100%)
 rename {extra => auquotidien}/modules/strongbox_ui.py (100%)
 rename {extra => auquotidien}/modules/template.py (100%)
MANIFEST.in
7 7 
include po/*.pot
8 8 
recursive-include apache-errors/ *.html
9 9 
recursive-include data/themes/ *.css *.png *.jpeg '*.jpg *.xml *.html *.js *.ezt *.gif *.otf
10 
recursive-include extra/ *.py
10 
recursive-include auquotidien/ *.py
11 11 
recursive-include static/ *.png *.jpeg '*.jpg *.js *.gif
12 12 
recursive-include texts/ *.html
13 13 
recursive-include theme/ *.css *.png *.jpeg '*.jpg *.xml *.html *.js *.ezt *.gif
debian/rules
31 31 
	dh_installdirs
32 32 

  		




  33
  33
  
    
	$(PYTHON) setup.py install --prefix=$(DESTDIR)/usr --no-compile

  		




  34
  
  
    
	for i in $(CURDIR)/debian/wcs-au-quotidien/usr/lib/python2.*; do \

  		




  35
  
  
    
		mv $$i/site-packages/extra \

  		




  36
  
  
    
			$$i/site-packages/extra-wcs-au-quotidien; done

  		




  37
  34
  
    
	cd po && make install prefix=$(CURDIR)/debian/wcs-au-quotidien/

  		




  38
  35
  
    
	install -d -m 755 $(DESTDIR)/var/lib/wcs-au-quotidien $(DESTDIR)/etc/wcs

  		




  39
  36
  
    
	install -m 644 wcs-au-quotidien.cfg-sample $(DESTDIR)/etc/wcs/wcs-au-quotidien.cfg

  		












  

    
      debian/wcs-au-quotidien.init
    
  





  19
  19
  
    
SCRIPTNAME=/etc/init.d/$NAME

  		




  20
  20
  
    
PYTHON_VERSION=`/usr/bin/env python -c \

  		




  21
  21
  
    
    "import sys; print '%d.%d' % (sys.version_info[0], sys.version_info[1])"`

  		




  22
  
  
    
OPTIONS="--extra /usr/lib/pymodules/python$PYTHON_VERSION/extra-wcs-au-quotidien/"

  		




  
  22
  
    
OPTIONS="--extra /usr/lib/pymodules/python$PYTHON_VERSION/auquotidien/"

  		




  23
  23
  
    
WCS_USER=wcs-au-quotidien

  		




  24
  24
  
    
WCS_GROUP=wcs-au-quotidien

  		




  25
  25
  
    
CONFIG_FILE=/etc/wcs/wcs-au-quotidien.cfg

  		












  

    
      po/Makefile
    
  





  1
  1
  
    
POFILES=$(wildcard *.po)

  		




  2
  2
  
    
MOFILES=$(POFILES:.po=.mo)

  		




  3
  
  
    
PYFILES=$(shell find ../extra/ ../extra-authentic/ -name '*.py' -or -name '*.ptl')

  		




  
  3
  
    
PYFILES=$(shell find ../auquotidien/ ../auquotidien-authentic/ -name '*.py' -or -name '*.ptl')

  		




  4
  4
  
    

  		




  5
  5
  
    
all: $(MOFILES)

  		




  6
  6
  
    

  		












  

    
      setup.py
    
  





  55
  55
  
    
        version = get_version(),

  		




  56
  56
  
    
        maintainer = 'Frederic Peters',

  		




  57
  57
  
    
        maintainer_email = 'fpeters@entrouvert.com',

  		




  58
  
  
    
        package_dir = { 'extra': 'extra' },

  		




  59
  
  
    
        packages = ['extra', 'extra.modules', 'extra.modules.pyatom'],

  		




  
  58
  
    
        package_dir = {'auquotidien': 'auquotidien'},

  		




  
  59
  
    
        packages = ['auquotidien', 'auquotidien.modules', 'auquotidien.modules.pyatom'],

  		




  60
  60
  
    
        cmdclass = {'build_py': qx_build_py,

  		




  61
  61
  
    
                    'sdist': eo_sdist},

  		




  62
  62
  
    
        data_files = data_tree('share/wcs/texts', 'texts') +\

  		












  

    
      tests/utilities.py
    
  





  20
  20
  
    
    publisher.WcsPublisher.DATA_DIR = os.path.abspath(

  		




  21
  21
  
    
            os.path.join(os.path.dirname(wcs.__file__), '..', 'data'))

  		




  22
  22
  
    
    config.add_section('extra')

  		




  23
  
  
    
    config.set('extra', 'auquotidien', os.path.join(os.path.dirname(__file__), '..', 'extra'))

  		




  
  23
  
    
    config.set('extra', 'auquotidien', os.path.join(os.path.dirname(__file__), '..', 'auquotidien'))

  		




  24
  24
  
    
    publisher.WcsPublisher.configure(config)

  		




  25
  25
  
    
    pub = publisher.WcsPublisher.create_publisher()

  		




  26
  26
  
    
    # allow saving the user

  		




  27
  
  
    
-