Attachment #4152 for bug #23197




 corporate environments. For more information about UCS,
 refer to: http://www.univention.de/

Package: univention-management-console-frontend-doc
Architecture: all
Depends: ${misc:Depends},
 univention-dojo-api-viewer
Description: Univention Management Console - Documentation
 This package contains the api.xml file which is needet by univention-dojo-api-viewer
 rsync
Description: UCS Management Console - development files
 UCS Management Console is a web based program to manage computers.  It has
 an extensible architecture, using modules to implement its
 features. This package is a meta package that contains dependencies
 to packages that are necessary for the framework development.
 .
 This package is part of Univention Corporate Server (UCS),
 an integrated, directory driven solution for managing

(-)univention-management-console-frontend/debian/univention-management-console-frontend-doc.install (+1 lines)

Line 0	Link Here

/usr/share/univention-dojo-api-viewer




#!/bin/sh
#
# Univention Management Console Frontend Documentation
#  postinst script for the debian package
#
# Copyright 2012 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public
# License with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

#DEBHELPER#

if [ -r '/var/www/univention-management-console-doc/umc.xml' ]; then
	chmod o+w /usr/share/univention-dojo-api-viewer/data || true
	ln -s /usr/share/univention-dojo-api-viewer/umc.xml /var/www/umc.xml || true

	# We dont use --post-file here because of max_filesize in php.ini
	wget -O - 'http://127.0.0.1/univention-management-console-doc/lib/upload.php' --post-data 'dir=UMC&api=http://127.0.0.1/umc.xml' > /dev/null 2>&1 || true

	unlink /usr/share/univention-dojo-api-viewer/umc.xml || true
	chmod o-w /usr/share/univention-dojo-api-viewer/data || true

	# allow caching
	chown www-data /usr/share/univention-dojo-api-viewer/data/UMC/cache/ || true
fi

exit 0

(-)univention-management-console-frontend/Makefile (-1 / +15 lines)

Lines 37-45	Link Here

buildDir:=$(CURDIR)/build

buildDir:=$(CURDIR)/build

tmpDir:=$(buildDir)/_tmp$(timestamp)

tmpDir:=$(buildDir)/_tmp$(timestamp)

# API viewer paths

TO_ROOT:=../../../../..

DOJODIR:=/usr/share/univention-dojo

.PHONY: build build-dev build-common install clean jslint

.PHONY: build build-dev build-common install clean jslint

build: build-common

build: build-common doc

	@# create a temp directory

	@# create a temp directory

	mkdir -p '$(tmpDir)'

	mkdir -p '$(tmpDir)'

	@# create the module umc.widgets containing a require for all umc widgets

	@# create the module umc.widgets containing a require for all umc widgets

Lines 105-110	Link Here

105

		cp $$i "$(CURDIR)/umc/i18n/$$lang/app.json"; \

109

		cp $$i "$(CURDIR)/umc/i18n/$$lang/app.json"; \

106

	done

110

	done

107

111

112

doc:

113

	@# generate api.xml for univention-dojo-api-viewer

114

	echo "location = $(TO_ROOT)$(CURDIR)/umc/" > "$(DOJODIR)/util/docscripts/modules/umc.module.properties";

115

	cd "$(DOJODIR)/util/docscripts/"; \

116

	php generate.php umc dojo dojox dijit --serialize=xml --outfile=../$(TO_ROOT)$(CURDIR)/umc --clean

117

	rm -f "$(DOJODIR)/util/docscripts/modules/umc.module.properties"

118

108

i18n:

119

i18n:

109

	/usr/bin/dh-umc-translate -p univention-management-console-frontend -o umc $(jsFiles)

120

	/usr/bin/dh-umc-translate -p univention-management-console-frontend -o umc $(jsFiles)

110

121

Lines 112-117	Link Here

112

	@# copy all files from the build directory .. exclude file of the tmp directory

123

	@# copy all files from the build directory .. exclude file of the tmp directory

113

	mkdir -p "$(DESTDIR)$(pkgDir)"

124

	mkdir -p "$(DESTDIR)$(pkgDir)"

114

	rsync -rpl --exclude ".svn" --exclude "_tmp"'$(timestamp)' "$(buildDir)/" "$(DESTDIR)$(pkgDir)"

125

	rsync -rpl --exclude ".svn" --exclude "_tmp"'$(timestamp)' "$(buildDir)/" "$(DESTDIR)$(pkgDir)"

126

	@# api files

127

	mkdir -p "$(DESTDIR)/usr/share/univention-dojo-api-viewer"

128

	mv -f umc.xml "$(DESTDIR)/usr/share/univention-dojo-api-viewer"

115

129

116

clean:

130

clean:

117

	rm -rf build

131

	rm -rf build




This patch fixes the htaccess and config of univention-dojo-api-viewer (Bug #23197).
Index: univention-dojo-api-viewer/config.php
===================================================================
--- univention-dojo-api-viewer/config.php	(Revision 804)

#!/bin/sh
#
# Univention Dojo API-Viewer
#  postinst script for the debian package
#
# Copyright 2012 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public
# License with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

#DEBHELPER#

/etc/init.d/apache2 restart || true
exit 0




 univention-dojo
Description: The Dojo Toolkit, utilility functions and tools
 This package contains utility functions and tools of the Dojo Toolkit

Package: univention-dojo-api-viewer
Architecture: all
Depends: ${misc:Depends},
 php5-curl,
 php5-xsl,
 univention-dojo,
 univention-management-console-frontend
Description: The Dojo Documentation API Viewer
 This package contains a patched version of the Dojo Documentation
 API Viewer from https://svn.dojotoolkit.org/website/trunk/api

(-)univention-dojo/debian/univention-dojo-api-viewer.install (+2 lines)

Line 0	Link Here

/usr/share/univention-dojo-api-viewer

icon/dojo-api.png /var/www/icon/




Type: file
File: etc/apache2/sites-available/univention-management-console-doc

Type: multifile
Multifile: var/www/ucs-overview/de.html

Type: multifile
Multifile: var/www/ucs-overview/en.html

Type: subfile
Multifile: var/www/ucs-overview/de.html
Subfile: var/www/ucs-overview/de.html.d/40dojo-api-viewer-de.html

Type: subfile
Multifile: var/www/ucs-overview/en.html
Subfile: var/www/ucs-overview/en.html.d/40dojo-api-viewer-en.html

(-)univention-dojo/debian/copyright (-1 / +1 lines)

Lines 197-203	Link Here

197

permission of its copyright owner.

197

permission of its copyright owner.

198

-----------------------<Dojo Copyright Notice/>--------------------------------

198

-----------------------<Dojo Copyright Notice/>--------------------------------

199

-----------------------<Univention Copyright Notice>---------------------------

199

-----------------------<Univention Copyright Notice>---------------------------

200

Copyright 2008-2011 Univention GmbH

200

Copyright 2008-2012 Univention GmbH

201

202

http://www.univention.de/

202

http://www.univention.de/

203

(-)univention-dojo/debian/rules (-1 / +5 lines)

Lines 3-9	Link Here

# Univention Dojo Package

# Univention Dojo Package

#  rules file for generating the deb package

#  rules file for generating the deb package

# Copyright 2008-2011 Univention GmbH

# Copyright 2008-2012 Univention GmbH

# http://www.univention.de/

# http://www.univention.de/

Lines 34-39	Link Here

	ucslint

	ucslint

	dh_auto_test

	dh_auto_test

override_dh_auto_install:

	univention-install-config-registry

	dh_auto_install

%:

%:

	dh $@

	dh $@

(-)univention-dojo/debian/univention-dojo-api-viewer.links (+2 lines)

Line 0	Link Here

usr/share/univention-dojo-api-viewer/ var/www/univention-management-console-doc

etc/apache2/sites-available/univention-management-console-doc etc/apache2/sites-enabled/univention-management-console-doc




#!/bin/sh
#
# 
#  script for checkout and tar latest dojo api viewer
#
# Copyright 2012 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public
# License with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

svn export https://svn.dojotoolkit.org/website/trunk/api univention-dojo-api-viewer
VERSION=$(svn info univention-dojo-api-viewer | grep -m1 'Revision:' | sed -n 's/^Revision: \(.*\)$/\1/')
tar czf "univention-dojo-api-viewer-r$VERSION.tar.gz" univention-dojo-api-viewer 


(-)univention-dojo/conffiles/var/www/ucs-overview/en.html.d/40dojo-api-viewer-en.html (+5 lines)

Line 0	Link Here

<tr>

<td class="overview"><a href="../univention-management-console-doc/"><img src="../icon/dojo-api.png" alt="" border="0" /></a></td>

<td class="overview"><a href="../univention-management-console-doc/">Univention Management Console API</a></td>

<td class="overview">UMC javascript documentation</td>

</tr>

(-)univention-dojo/conffiles/var/www/ucs-overview/de.html.d/40dojo-api-viewer-de.html (+5 lines)

Line 0	Link Here

<tr>

<td class="overview"><a href="../univention-management-console-doc/"><img src="../icon/dojo-api.png" alt="" border="0" /></a></td>

<td class="overview"><a href="../univention-management-console-doc/">Univention Management Console API</a></td>

<td class="overview">UMC Javascript Dokumentation</td>

</tr>

(-)univention-dojo/Makefile (-3 / +10 lines)

Lines 3-9	Link Here

# Univention Dojo Package

# Univention Dojo Package

#  Makefile for building/installing the package

#  Makefile for building/installing the package

# Copyright 2008-2011 Univention GmbH

# Copyright 2008-2012 Univention GmbH

# http://www.univention.de/

# http://www.univention.de/

Lines 40-48	Link Here

DOJO_VERSION=$(shell find . -maxdepth 1 -name "dojo-release*-src.tar.gz" | sort -r | sed -n '1 s/^.*dojo-release-\(.*\)-src.tar.gz$$/\1/ p')

DOJO_VERSION=$(shell find . -maxdepth 1 -name "dojo-release*-src.tar.gz" | sort -r | sed -n '1 s/^.*dojo-release-\(.*\)-src.tar.gz$$/\1/ p')

DOJO_DIR=dojo-release-$(DOJO_VERSION)-src

DOJO_DIR=dojo-release-$(DOJO_VERSION)-src

API_VERSION=$(shell find . -maxdepth 1 -name "univention-dojo-api-viewer-r*.tar.gz" | sort -r | sed -n '1 s/^.*univention-dojo-api-viewer-r\(.*\).tar.gz$$/\1/ p')

.PHONY: clean all install

.PHONY: clean all install

build: $(DOJO_DIR)

build: $(DOJO_DIR) apiviewer

$(DOJO_DIR):

$(DOJO_DIR):

	tar xzf $@.tar.gz

	tar xzf $@.tar.gz

Lines 57-66	Link Here

	patch -p0 < fix_dojoStoreMemory.patch

	patch -p0 < fix_dojoStoreMemory.patch

	patch -p0 < fix_dijit_Templated.patch

	patch -p0 < fix_dijit_Templated.patch

apiviewer:

	tar -xzf "univention-dojo-api-viewer-r$(API_VERSION).tar.gz" --exclude='tests' --exclude='install' --exclude='data/*'

	patch -p0 < dojo_api.patch

all: install

all: install

clean:

clean:

	rm -rf $(DOJO_DIR)

	rm -rf $(DOJO_DIR)

	rm -rf univention-dojo-api-viewer

install: build

install: build

	@# main directory

	@# main directory

Lines 75-78	Link Here

		[ "$${i%.sh}" != "$$i" ] && mod=0755; \

		[ "$${i%.sh}" != "$$i" ] && mod=0755; \

		install -m $$mod "$(DOJO_DIR)/$$i" "$(DESTDIR)$(INSTDIR)/$$i"; \

		install -m $$mod "$(DOJO_DIR)/$$i" "$(DESTDIR)$(INSTDIR)/$$i"; \

	done

	done

	@# install api-viewer

	cp -r univention-dojo-api-viewer "$(DESTDIR)/usr/share/univention-dojo-api-viewer"

Return to bug 23197