CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe@sourceware.org 2011-03-25 19:52:58

Modified files:
luci/site : Makefile
Added files:
luci/site/luci/Products/PloneHotfix20100612: README.txt
__init__.py
safe_html.py
luci/site/luci/Products/PloneHotfix20110720: README.txt
__init__.py
publisher.py

Log message:
Sync up with dist-cvs:
- Apply Plone hotfixes (20110720 & 20100612)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5& r1=1.11.2.5&r2=1.11.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Products/PloneHotfix20100612/README.txt.diff?cvsroot=cluster&only_with_tag=RHEL 5&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Products/PloneHotfix20100612/__init__.py.diff?cvsroot=cluster&only_with_tag=RHE L5&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Products/PloneHotfix20100612/safe_html.py.diff?cvsroot=cluster&only_with_tag=RH EL5&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Products/PloneHotfix20110720/README.txt.diff?cvsroot=cluster&only_with_tag=RHEL 5&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Products/PloneHotfix20110720/__init__.py.diff?cvsroot=cluster&only_with_tag=RHE L5&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Products/PloneHotfix20110720/publisher.py.diff?cvsroot=cluster&only_with_tag=RH EL5&r1=NONE&r2=1.1.2.1

--- conga/luci/site/Makefile 2008/01/23 04:44:32 1.11.2.5
+++ conga/luci/site/Makefile 2011/03/25 19:52:56 1.11.2.6
@@ -69,6 +69,12 @@
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins
${INSTALL_FILE} -m 644 `find luci/Products/ManagedSystem/skins -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins

+ ${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/Products/PloneHotfix20100612
+ ${INSTALL_FILE} -m 644 `find luci/Products/PloneHotfix20100612 -maxdepth 1 -type f | grep .py | grep -v ~ | grep -v #` ${DESTDIR}/var/lib/luci/Products/PloneHotfix20100612
+
+ ${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/Products/PloneHotfix20110720
+ ${INSTALL_FILE} -m 644 `find luci/Products/PloneHotfix20110720 -maxdepth 1 -type f | grep .py | grep -v ~ | grep -v #` ${DESTDIR}/var/lib/luci/Products/PloneHotfix20110720
+
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/var
${INSTALL_FILE} -m 600 luci/var/Data.fs ${DESTDIR}/var/lib/luci/var/Data.fs
${INSTALL_DIR} -m 700 ${DESTDIR}/var/lib/luci/var/pts