Skip to content

Commit fe69498

Browse files
committed
Merge branch 'devel'
This is version 0.3
2 parents 8db813d + 78c830e commit fe69498

26 files changed

Lines changed: 35 additions & 211 deletions

.gitignore

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ var/
2222
*.egg-info/
2323
.installed.cfg
2424
*.egg
25+
AUTHORS
26+
ChangeLog
2527

2628
# PyInstaller
2729
# Usually these files are written by a python script from a template
@@ -57,9 +59,12 @@ docs/_build/
5759
# PyBuilder
5860
target/
5961

60-
# Project-Builder.org
61-
delivery/
62-
build/
62+
# Project-Builder.org 0.14.1
63+
pbdelivery/
64+
pbbuild/
65+
66+
# ctags
67+
tags
6368

6469
# Pydev
6570
.project

doc/source/faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FAQ
44

55
- Q1 : error in setup command: Invalid environment marker: (python_version < '3')
66

7-
This error is caused by old setuptools revisions that do not understant "python_version < '3'".
7+
This error is caused by an old setuptools version that does not understand "python_version < '3'".
88
Upgrade setuptools using::
99

1010
pip install --upgrade setuptools

install.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ export pkg=$5
1111

1212
# Documentation installation only
1313
if [ $python = "doc" ]; then
14-
install -d 755 $rootdir/$prefix/share/doc/$5/html/_static
15-
install -m 644 doc/build/singlehtml/*.html $rootdir/$prefix/share/doc/$5/html
16-
install -m 644 doc/build/singlehtml/_static/* $rootdir/$prefix/share/doc/$5/html/_static
17-
install -m 644 doc/build/latex/*.pdf $rootdir/$prefix/share/doc/$5/
14+
install -d 755 $rootdir/$prefix/share/doc/$5/manual/html/_static
15+
install -m 644 doc/build/singlehtml/*.html $rootdir/$prefix/share/doc/$5/manual/html
16+
install -m 644 doc/build/singlehtml/_static/* $rootdir/$prefix/share/doc/$5/manual/html/_static
17+
install -m 644 doc/build/latex/*.pdf $rootdir/$prefix/share/doc/$5/manual/
1818
exit 0
1919
fi
2020

2121
pyver=`$python --version 2>&1 | perl -p -e 's|.* ([2-3])\..*|$1|'`
2222
$python setup.py install --skip-build --root=$rootdir --prefix=$prefix
2323

24-
rm -rf $rootdir/$sitelib/redfish/old
24+
rm -rf $rootdir/$sitelib/redfish/old $rootdir/$prefix/share/doc/$5/html $rootdir/$prefix/share/doc/$5/*.pdf
2525

2626
# Hardcoded for now to solve the delivery of the conf file still not correct with setup.py
2727
mkdir -p $rootdir/etc

pbconf/pbfilter/debian-3.1.pbf

Lines changed: 0 additions & 11 deletions
This file was deleted.

pbconf/pbfilter/debian-4.0.pbf

Lines changed: 0 additions & 11 deletions
This file was deleted.

pbconf/pbfilter/debian-5.0.pbf

Lines changed: 0 additions & 11 deletions
This file was deleted.

pbconf/pbfilter/debian-6.0.pbf

Lines changed: 0 additions & 11 deletions
This file was deleted.

pbconf/pbfilter/debian-7.0.pbf

Lines changed: 0 additions & 11 deletions
This file was deleted.

pbconf/pbfilter/fedora-1.pbf

Lines changed: 0 additions & 9 deletions
This file was deleted.

pbconf/pbfilter/fedora-2.pbf

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)