Request 1943 (accepted)

roundcubemail-plugins-kolab.spec Changed

@@ -41,6 +41,10 @@
 Source0:        roundcubemail-plugins-kolab-3.3.tar.gz
 Source1:        comm.py
 
+Source100:      plesk.calendar.inc.php
+Source101:      plesk.kolab_folders.inc.php
+Source102:      plesk.libkolab.inc.php
+
 Patch0001:      roundcubemail-plugins-kolab-3.3-kolab-files-manticore-api.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -60,7 +64,9 @@
 Requires:       php-kolabformat >= 1.0
 Requires:       php-kolab >= 0.5
 Requires:       php-pear(HTTP_Request2)
+%if 0%{?plesk} < 1
 Requires:       php-pear(Net_LDAP3)
+%endif
 Requires:       php-pear(Mail_Mime) >= 1.8.5
 Requires:       roundcubemail >= %{roundcube_version}
 Requires:       roundcubemail(plugin-calendar) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -257,6 +263,7 @@
 %package -n roundcubemail-plugin-libcalendaring
 Summary:        Plugin libcalendaring
 Group:          Applications/Internet
+Requires:       php-sabre-vobject
 Requires:       roundcubemail(core) >= %{roundcube_version}
 Requires:       roundcubemail(plugin-libcalendaring-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libcalendaring-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -836,6 +843,13 @@
 
 pushd %{name}-%{version}
 
+%if 0%{?plesk}
+# Provide defaults for Plesk
+cp -af %{SOURCE100} plugins/calendar/config.inc.php.dist
+cp -af %{SOURCE101} plugins/kolab_folders/config.inc.php.dist
+cp -af %{SOURCE102} plugins/libkolab/config.inc.php.dist
+%endif
+
 %patch0001 -p1
 
 find -type d -name "helpdocs" -exec rm -rvf {} \; 2>/dev/null || :

debian.changelog Changed

debian.control Changed

@@ -1,26 +1,39 @@
 Source: roundcubemail-plugins-kolab
 Section: web
 Priority: extra
-Maintainer: Christoph Wickert <wickert@kolabsys.com>
-Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
-Build-Depends: debhelper (>= 8)
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
+Build-Depends: cssmin, debhelper (>= 8), node-uglify, psa | bash
 Standards-Version: 3.9.3
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcube-plugins-kolab
 Vcs-Browser: http://git.kolabsys.com/apt/roundcube-plugins-kolab.git
 
 Package: roundcubemail-plugins-kolab
 Architecture: all
-Depends:	roundcubemail (>> 0.9),
-	php-http-request2,
-	php-net-url2,
-	php5-cli,
-	php5-curl,
-	php-endroid-qrcode,
-	php-kolab (>= 0.5),
-	php-kolabformat (>= 1.1),
-	php-spomky-labs-otphp,
-	php-enygma-yubikey,
-	${misc:Depends}
+Depends:    roundcubemail-core (>> 0.9),
+            php-http-request2,
+            php-net-url2,
+            php5-cli,
+            php5-curl,
+            php-endroid-qrcode,
+            php-kolab (>= 0.5),
+            php-kolabformat (>= 1.1),
+            php-spomky-labs-otphp,
+            php-enygma-yubikey,
+            roundcubemail-plugin-calendar,
+            roundcubemail-plugin-kolab-activesync,
+            roundcubemail-plugin-kolab-addressbook,
+            roundcubemail-plugin-kolab-auth,
+            roundcubemail-plugin-kolab-config,
+            roundcubemail-plugin-kolab-delegation,
+            roundcubemail-plugin-kolab-files,
+            roundcubemail-plugin-kolab-folders,
+            roundcubemail-plugin-kolab-notes,
+            roundcubemail-plugin-kolab-tags,
+            roundcubemail-plugin-odfviewer,
+            roundcubemail-plugin-pdfviewer,
+            roundcubemail-plugin-tasklist,
+            ${misc:Depends}
 Replaces: roundcube-plugins-kolab
 Conflicts: roundcube-plugins-kolab
 Provides: roundcube-plugins-kolab

debian.rules Changed

@@ -5,51 +5,102 @@
 %:
 	dh $@
 
-override_dh_install:
-	dh_install -XLICENSE -X.gitignore
-	
-	# Some png files are executable
-	find  $(CURDIR)/debian/roundcubemail-plugins-kolab/usr/share/roundcubemail/plugins/ -type f -name *.png -perm -1 -exec chmod -x {} \;
-	
-	# Some js files are executable
-	find  $(CURDIR)/debian/roundcubemail-plugins-kolab/usr/share/roundcubemail/plugins/ -type f -name *.js -perm -1 -exec chmod -x {} \;
-	
-	# Copy plugin configuration files to the correct location
-	for conffile in $$(find $(CURDIR)/debian/roundcubemail-plugins-kolab/usr/share/roundcubemail/plugins -type f -name "config.inc.php.dist"); do \
-		plugin=$$(basename $$(dirname $$conffile)); \
-		mv $$conffile $(CURDIR)/debian/roundcubemail-plugins-kolab/etc/roundcubemail/$$plugin.inc.php; \
-		ln -s ../../../../../etc/roundcubemail/$$plugin.inc.php $(CURDIR)/debian/roundcubemail-plugins-kolab/usr/share/roundcubemail/plugins/$$plugin/config.inc.php; \
-	done
-	
+override_dh_auto_build:
+	mkdir -p $(CURDIR)/config/
+
+	find plugins -type d -name helpdocs -exec rm -rvf {} \; 2>/dev/null || :
+	find plugins -type d -name tests -exec rm -rvf {} \; 2>/dev/null || :
+
 	# Compress the CSS
-	for file in `find $(CURDIR)/debian/roundcubemail-plugins-kolab/usr/share/roundcubemail/ -type f -name "*.css"`; do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/public_html/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		mv -f $$file $$asset_loc/$$(basename $$file) ; \
+	for file in `find $(CURDIR) -type f -name "*.css"`; do \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/plugins/$${plugin}/skins/|$(CURDIR)/public_html/assets/plugins/$${plugin}/skins/|g") ; \
+			) ; \
+		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
+		mkdir -p $${asset_loc} ; \
+		cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) && \
+			rm -rvf $${file} || \
+			mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+	done
+
+	# Compress the JS, but not the already minified
+	for file in `find $(CURDIR) -type f -name "*.js" ! -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/plugins/$${plugin}/skins/|$(CURDIR)/public_html/assets/plugins/$${plugin}/skins/|g") ; \
+			) ; \
+		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
+		mkdir -p $${asset_loc} ; \
+		uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) && \
+			rm -rvf $${file} || \
+			mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
-	
-	# Compress the JS
-	for file in `find $(CURDIR)/debian/roundcubemail-plugins-kolab/usr/share/roundcubemail/ -type f -name "*.js"`; do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/public_html/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		mv -f $$file $$asset_loc/$$(basename $$file) ; \
+
+	# The already minied JS can just be copied over to the assets location
+	for file in `find $(CURDIR) -type f -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/plugins/$${plugin}/skins/|$(CURDIR)/public_html/assets/plugins/$${plugin}/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# Other assets
-	for file in $$(find $(CURDIR)/debian/roundcubemail-plugins-kolab/usr/share/roundcubemail/ -type f \
+	for file in $$(find $(CURDIR) -type f \
 			-name "*.eot" -o \
 			-name "*.gif" -o \
 			-name "*.ico" -o \
 			-name "*.jpg" -o \
+			-name "*.mp3" -o \
+			-name "dummy.pdf" -o \
 			-name "*.png" -o \
 			-name "*.svg" -o \
 			-name "*.swf" -o \
 			-name "*.tif" -o \
+			-name "*.tiff" -o \
 			-name "*.ttf" -o \
+			-name "*.wav" -o \
 			-name "*.woff" \
 		); do \
-		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/public_html/assets/|g")) ; \
-		install -pm 755 -d $$asset_loc ; \
-		mv -f $$file $$asset_loc/$$(basename $$file); \
+		asset_loc=$$(dirname $$(echo $${file} | sed \
+				-e "s|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
+				-e "s|$(CURDIR)/plugins/$${plugin}/skins/|$(CURDIR)/public_html/assets/plugins/$${plugin}/skins/|g") ; \
+			) ; \
+		mkdir -p $${asset_loc} ; \
+		mv -vf $${file} $${asset_loc}/$$(basename $${file}); \
+	done
+
+	for plugin in `find $(CURDIR)/plugins/ -type d -mindepth 1 -maxdepth 1 -exec basename {} \;)`; do \
+		pkgname=$$(echo $${plugin} | sed -e 's/_/-/g') ; \
+		if [ -f "$(CURDIR)/plugins/$${plugin}/config.inc.php.dist" ]; then \
+			mv $(CURDIR)/plugins/$${plugin}/config.inc.php.dist $(CURDIR)/config/$${plugin}.inc.php ; \
+			echo "etc/roundcubemail/$${plugin}.inc.php usr/share/roundcubemail/plugins/$${plugin}/config.inc.php" >> debian/roundcubemail-plugin-$${pkgname}.links ; \
+			echo "config/$${plugin}.inc.php etc/roundcubemail/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		fi ; \
+		if [ -d "public_html/assets/plugins/$${plugin}" ]; then \
+			echo "public_html/assets/plugins/$${plugin} usr/share/roundcubemail/public_html/assets/plugins" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		fi ; \
+		echo "usr/share/roundcubemail/plugins/$${plugin}" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
+		echo "plugins/$${plugin} usr/share/roundcubemail/plugins/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
+		echo "" >> debian/control ; \
+		echo "Package: roundcubemail-plugin-$${pkgname}" >> debian/control ; \
+		echo "Architecture: all" >> debian/control ; \
+		echo "Depends: roundcubemail-core" >> debian/control ; \
+		echo "Description: $${plugin}} plugin for Roundcube" >> debian/control ; \
+		echo "" >> debian/control ; \
+		sed -i -e "/Files:/ i\
+ roundcubemail-plugin-$${plugin} deb web extra" debian/control ; \
 	done
 
+	if [ -f "/etc/plesk-release" ]; then \
+		cp -v ../SOURCES/plesk.calendar.inc.php config/calendar.inc.php ; \
+		cp -v ../SOURCES/plesk.kolab_folders.inc.php config/kolab_folders.inc.php ; \
+		cp -v ../SOURCES/plesk.libkolab.inc.php config/libkolab.inc.php ; \
+	fi
+
+	dh_auto_build
+
+override_dh_compress:
+	dh_compress -Xsql

debian.tar.gz/dirs Deleted

debian.tar.gz/install Deleted

debian.tar.gz/postinst Deleted

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-fix_permissions() {
-	chown -R www-data:adm /var/lib/roundcubemail
-	chown -R www-data:adm /var/log/roundcubemail
-	chown -R root:www-data /etc/roundcubemail
-	find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;
-	find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;
-}
-
-update_database() {
-	for plugin in calendar kolab_activesync kolab_addressbook \
-		kolab_auth kolab_config kolab_delegation kolab_files \
-		kolab_folders libkolab libcalendaring odfviewer \
-		owncloud piwik_analytics tasklist; do
-
-	    for dir in `find /usr/share/roundcubemail/plugins/ -type d -name "SQL"`; do
-		/usr/share/roundcubemail/bin/updatedb.sh \
-		    --dir $dir \
-		    --package ${plugin} \
-		    >/dev/null 2>&1 || :
-	    done
-	done
-}
-
-case $1 in
-	*)
-		fix_permissions
-		update_database
-        if [ -f "/etc/roundcubemail/kolab.inc.php" -a -f "/etc/roundcubemail/libkolab.inc.php" ]; then
-            rm -rf /etc/roundcubemail/libkolab.inc.php
-            mv /etc/roundcubemail/kolab.inc.php /etc/roundcubemail/libkolab.inc.php
-        fi
-	;;
-esac
-
-#DEBHELPER#

debian.tar.gz/roundcubemail-plugin-calendar.substvars Added

debian.tar.gz/roundcubemail-plugin-html-converter.substvars Added

debian.tar.gz/roundcubemail-plugin-kolab-2fa.substvars Added

debian.tar.gz/roundcubemail-plugin-libkolab.substvars Added

debian.tar.gz/roundcubemail-plugins-kolab.dirs Added

plesk.calendar.inc.php Added

plesk.kolab_folders.inc.php Added

@@ -0,0 +1,36 @@
+<?php
+
+// Default kolab-specific folders. Set values to non-empty
+// strings to create default folders of apropriate type.
+// If there is no default folder with specified type in user mailbox,
+// it will be created.
+// Note: Mail folders will be also subscribed.
+
+// Default Configuration folder
+$config['kolab_folders_configuration_default'] = 'Configuration';
+// Default Calendar folder
+$config['kolab_folders_event_default'] = 'Calendar';
+// Default Contacts (Addressbook) folder
+$config['kolab_folders_contact_default'] = 'Contacts';
+// Default Tasks folder
+$config['kolab_folders_task_default'] = 'Tasks';
+// Default Notes folder
+$config['kolab_folders_note_default'] = 'Notes';
+// Default Journal folder
+$config['kolab_folders_journal_default'] = 'Journal';
+// Default Files folder
+$config['kolab_folders_file_default'] = 'Files';
+// Default FreeBusy folder
+$config['kolab_folders_freebusy_default'] = 'Freebusy';
+
+// INBOX folder
+$config['kolab_folders_mail_inbox'] = 'INBOX';
+// Drafts folder
+$config['kolab_folders_mail_drafts'] = 'Drafts';
+// Sent folder
+$config['kolab_folders_mail_sentitems'] = 'Sent';
+// Trash folder
+$config['kolab_folders_mail_wastebasket'] = 'Trash';
+// Others folders
+$config['kolab_folders_mail_outbox'] = '';
+$config['kolab_folders_mail_junkemail'] = 'Spam';

plesk.libkolab.inc.php Added

roundcubemail-plugins-kolab.dsc Changed

Overview

Request 1943 (accepted)

Request History