Request 1942 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

You're not reviewing the full diff of request 1942 , but the diff to the superseded request 1941 (Show full diff)

Overview

Request 1942 (accepted)

Enhance packaging to split plugins

Created by vanmeeuwen over 7 years ago
In state accepted
Supersedes 1941
Open review for Admin
Open review for kolab-developers

Submit roundcubemail

Submit package home:vanmeeuwen:plesk-17 / roundcubemail to package Kolab:Winterfell / roundcubemail

roundcubemail.spec Changed

@@ -26,16 +26,10 @@
 %global httpd_name apache2
 %global httpd_user wwwrun
 %else
-%if 0%{?plesk}
-%global httpd_group roundcube_sysgroup
-%global httpd_name httpd
-%global httpd_user roundcube_sysuser
-%else
 %global httpd_group apache
 %global httpd_name httpd
 %global httpd_user apache
 %endif
-%endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
@@ -63,17 +57,12 @@
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
 
-Source100:      plesk.config.inc.php
-Source101:      plesk.password.inc.php
-
 Patch201:       default-configuration.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildRequires:  composer
-
-%if 0%{?plesk} < 1
 BuildRequires:  php-gd
 BuildRequires:  php-mbstring
 BuildRequires:  php-mcrypt
@@ -95,7 +84,6 @@
 BuildRequires:  php-pear(Net_Sieve)
 BuildRequires:  php-pear(Net_SMTP)
 BuildRequires:  php-pear(Net_Socket)
-%endif
 
 %if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
 BuildRequires:  python-cssmin
@@ -107,19 +95,15 @@
 #BuildRequires:  firefox
 BuildRequires:  python
 BuildRequires:  python-nose
-#BuildRequires:  python-selenium
+BuildRequires:  python-selenium
 
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?plesk}
-Requires:       %{name}-skin-plesk
-%else
 %if 0%{?kolab_enterprise}
 Requires:       %{name}-skin-enterprise
 %else
 Requires:       %{name}-skin-chameleon
 %endif
-%endif
 
 # Archive and Zipdownload plugins required through
 # being listed in config.inc.php.sample.
@@ -154,7 +138,6 @@
 Requires:       php-pear >= 1.9.0
 Requires:       php-xml
 
-%if 0%{?plesk} < 1
 Requires:       php-pear(Auth_SASL)
 Requires:       php-pear(DB)
 Requires:       php-pear(Mail_Mime)
@@ -167,7 +150,6 @@
 Requires:       php-pear(Net_Sieve)
 Requires:       php-pear(Net_SMTP)
 Requires:       php-pear(Net_Socket)
-%endif
 
 Requires:       %{name}(core-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(skin) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -353,7 +335,12 @@
 Group:          Applications/Internet
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       %{name}(plugin-jqueryui-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora} >= 25
+# avoid that skin-classic is installed, which is not what we want. that would not look right
+Requires:       %{name}(plugin-jqueryui-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
 Requires:       %{name}(plugin-jqueryui-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 Provides:       %{name}(plugin-jqueryui) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description plugin-jqueryui
@@ -1305,23 +1292,13 @@
 
 pushd %{name}-%{version}
 
-%if 0%{?plesk}
-cp -vf %{SOURCE100} config/config.inc.php.sample
-cp -vf %{SOURCE101} plugins/password/config.inc.php.dist
-%endif
-
-cp -a program/resources/blank.tif program/resources/blank.tiff
-
 %patch201 -p1
 
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" -delete
 
-# Remove hidden files and directories
+# Remove hidden files
 find . -type f -name ".*" -delete
-find . -type d -name ".*" ! -name "." ! -name ".." | while read dir; do
-    rm -rvf ${dir}
-done
 
 # Remove file URI modifier
 sed -r -i -e 's/^(\s+)protected function file_mod(.*)$/\1protected function file_mod\2 { return $file; }\n\1protected function dummy\2/g' program/include/rcmail_output_html.php
@@ -1593,9 +1570,7 @@
 %{__rm} -rf %{buildroot}
 
 %{__install} -d \
-%if 0%{?plesk} < 1
     %{buildroot}%{_ap_sysconfdir}/conf.d \
-%endif
     %{buildroot}%{_sysconfdir}/logrotate.d \
     %{buildroot}%{confdir} \
     %{buildroot}%{datadir}/public_html \
@@ -1606,9 +1581,7 @@
 # Move robots.txt to the correct place
 %{__install} -pm 644 robots.txt %{buildroot}%{datadir}/public_html/robots.txt
 
-%if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
-%endif
 
 %{__install} -pm 644 %SOURCE21 %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail
 
@@ -1736,7 +1709,6 @@
         -name "*.svg" -o \
         -name "*.swf" -o \
         -name "*.tif" -o \
-        -name "*.tiff" -o \
         -name "*.ttf" -o \
         -name "*.wav" -o \
         -name "*.woff" | \
@@ -1749,9 +1721,9 @@
 
 new_files > core.files
 
-#echo "== Files for core: =="
-#cat core.files
-#echo "==========================="
+echo "== Files for core: =="
+cat core.files
+echo "==========================="
 
 for file in `find %{name}-assets-%{version}/ -type f`; do
     asset_loc=$(dirname $(echo ${file} | %{__sed} -e "s|%{name}-assets-%{version}|%{buildroot}%{datadir}|g"))
@@ -1761,9 +1733,9 @@
 
 new_files > core-assets.files
 
-#echo "== Files for core assets: =="
-#cat core-assets.files
-#echo "==========================="
+echo "== Files for core assets: =="
+cat core-assets.files
+echo "==========================="
 
 echo "================================================================="
 echo "Dividing Skin Assets and Non-Assets"
@@ -1817,7 +1789,6 @@
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
-            -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
             -name "*.woff"
@@ -1839,18 +1810,18 @@
 
     new_files > skin-${skin}.files
 
-    #echo "== Files for skin ${skin}: =="
-    #cat skin-${skin}.files
-    #echo "==========================="
+    echo "== Files for skin ${skin}: =="
+    cat skin-${skin}.files
+    echo "==========================="
 
     %{__mkdir_p} %{buildroot}%{datadir}/public_html/assets/skins/
     cp -a %{name}-skin-${skin}-assets-%{version}/public_html/assets/skins/* %{buildroot}%{datadir}/public_html/assets/skins/.
 
     new_files > skin-${skin}-assets.files
 
-    #echo "== Files for skin assets ${skin}: =="
-    #cat skin-${skin}-assets.files
-    #echo "==========================="
+    echo "== Files for skin assets ${skin}: =="
+    cat skin-${skin}-assets.files
+    echo "==========================="
 done
 
 echo "================================================================="
@@ -1905,7 +1876,6 @@
                 -name "*.svg" -o \
                 -name "*.swf" -o \
                 -name "*.tif" -o \
-                -name "*.tiff" -o \
                 -name "*.ttf" -o \
                 -name "*.wav" -o \
                 -name "*.woff"
@@ -1931,9 +1901,9 @@
 
     new_files > plugin-${plugin}.files
 
-    #echo "== Files for plugin ${plugin}: =="
-    #cat plugin-${plugin}.files
-    #echo "==========================="
+    echo "== Files for plugin ${plugin}: =="
+    cat plugin-${plugin}.files
+    echo "==========================="
 
     # Skin-independent assets
     orig_dir="%{name}-plugin-${plugin}-%{version}"
@@ -1976,7 +1946,6 @@
             -name "*.svg" -o \
             -name "*.swf" -o \
             -name "*.tif" -o \
-            -name "*.tiff" -o \
             -name "*.ttf" -o \
             -name "*.wav" -o \
             -name "*.woff"
@@ -2003,9 +1972,9 @@
 
     new_files > plugin-${plugin}-assets.files
 
-    #echo "== Files for plugin ${plugin}: =="
-    #cat plugin-${plugin}-assets.files
-    #echo "==========================="
+    echo "== Files for plugin ${plugin}: =="
+    cat plugin-${plugin}-assets.files
+    echo "==========================="
 done
 
 for plugin in $(find %{name}-%{version}/plugins/ -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | sort); do
@@ -2027,9 +1996,9 @@
             echo "%doc README.md" > plugin-${plugin}-skin-${skin}.files
         fi
 
-        #echo "== Files for skin ${plugin}-${skin}: =="
-        #cat plugin-${plugin}-skin-${skin}.files
-        #echo "==========================="
+        echo "== Files for skin ${plugin}-${skin}: =="
+        cat plugin-${plugin}-skin-${skin}.files
+        echo "==========================="
 
         # Install the assets
         for file in `find %{name}-plugin-${plugin}-skin-${skin}-assets-%{version} -type f`; do
@@ -2043,9 +2012,9 @@
             echo "%doc README.md" > plugin-${plugin}-skin-${skin}-assets.files
         fi
 
-        #echo "== Files for skin ${plugin}-${skin}: =="
-        #cat plugin-${plugin}-skin-${skin}-assets.files
-        #echo "==========================="
+        echo "== Files for skin ${plugin}-${skin}: =="
+        cat plugin-${plugin}-skin-${skin}-assets.files
+        echo "==========================="
 
     done
 done
@@ -2278,7 +2247,7 @@
 fi
 
 /usr/share/roundcubemail/bin/updatedb.sh \
-    --dir /usr/share/doc/roundcubemail-core-%{version}/SQL/ \
+    --dir /usr/share/doc/roundcubemail-%{version}/SQL/ \
     --package roundcube || : \
     >/dev/null 2>&1
 
@@ -2787,16 +2756,13 @@
 
 %files core -f core.files
 %defattr(-,root,root,-)
-%doc %{name}-%{version}/SQL
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %if 0%{?suse_version}
 %dir %{_ap_sysconfdir}/
 %dir %{_ap_sysconfdir}/conf.d/
 %attr(0755,root,%{httpd_group}) %dir %{confdir}
 %endif
-%if 0%{?plesk} < 1
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
-%endif
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/config.inc.php
 %attr(0640,root,%{httpd_group}) %{confdir}/defaults.inc.php
 %attr(0640,root,%{httpd_group}) %{confdir}/mimetypes.php

debian.changelog Changed

debian.control Changed

@@ -1,9 +1,9 @@
 Source: roundcubemail
 Section: web
 Priority: extra
-Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Uploaders: Paul Klos <kolab@klos2day.nl>
-Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), psa | bash
+Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
+Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Build-Depends: composer, debhelper (>= 8)
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/
@@ -11,27 +11,12 @@
 
 Package: roundcubemail
 Architecture: all
-Depends:    php-net-ldap3,
-            roundcubemail-core,
-            ${misc:Depends}
-Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
-Description: skinnable AJAX based webmail solution for IMAP servers
- RoundCube Webmail is a browser-based multilingual IMAP client with an
- application-like user interface. It provides full functionality
- expected from an e-mail client, including MIME support, address book,
- folder manipulation and message filters.
- .
- The user interface is fully skinnable using XHTML and CSS 2.
-
-Package: roundcubemail-core
-Architecture: all
 Depends:    apache2 | httpd,
             libmagic1,
             php-auth-sasl,
             php-mail-mime (>= 1.8.0),
             php-mdb2 (>= 2.5.0),
+            php-net-ldap3,
             php-net-smtp,
             php-net-socket,
             php-net-sieve,
@@ -43,12 +28,12 @@
             php5-ldap | php-ldap,
             php5-mcrypt | php-mcrypt,
             php5-pspell | php-pspell,
-            roundcubemail-plugin-filesystem-attachments,
-            roundcubemail-plugin-jqueryui,
-            roundcubemail-plugin-zipdownload,
             ucf,
             ${misc:Depends}
-Description: Core framework package for Roundcube
+Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins
+Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
  expected from an e-mail client, including MIME support, address book,
@@ -58,4 +43,3 @@
  .
  This package provides the core code for roundcube. You should install
  it along with one of the roundcube database metapackages.
-

debian.rules Changed

@@ -6,55 +6,56 @@
 override_dh_auto_build:
 	mkdir -p $HOME/.composer
 	echo '{}' > $HOME/.composer/composer.json
-	patch -p1 < debian/patches/add-composer-autoloader.diff || :
+	patch -p1 < debian/patches/add-composer-autoloader.diff
 	composer.sh -vvv dumpautoload --optimize
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_psr4.php
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_namespaces.php
 	sed -i -e "s|.baseDir . '/../../../share|'/usr/share|" $(CURDIR)/vendor/composer/autoload_classmap.php
+	dh_auto_build
+
+override_dh_install:
+	mkdir -p $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
+	cp -a \
+		bin \
+		composer.json-dist \
+		plugins \
+		program \
+		public_html \
+		skins \
+		vendor \
+		$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
 
-	rm -rvf tests/
+	rm -rf $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/.htaccess
 
-	cp -av program/resources/blank.tif program/resources/blank.tiff
+	install -pm 644 index.php $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
+	install -pm 644 README.md $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
+	install -pm 644 robots.txt $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/
 
 	# Compress the CSS
-	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)/program/|$(CURDIR)/public_html/assets/program/|g" \
-				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
-			) ; \
-		mkdir -p $${asset_loc} ; \
-		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
-		cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) || \
-			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.css"`; do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		cat $$file > $$asset_loc/$$(basename $$file) && rm -rf $$file || \
+		mv -v $$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)/program/|$(CURDIR)/public_html/assets/program/|g" \
-				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
-			) ; \
-		mkdir -p $${asset_loc} ; \
-		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
-		uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) || \
-			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.js" ! -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		cat $$file > $$asset_loc/$$(basename $$file) && rm -rf $$file || \
+		mv -v $$file $$asset_loc/$$(basename $$file); \
 	done
 
-	# 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)/program/|$(CURDIR)/public_html/assets/program/|g" \
-				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
-			) ; \
-		mkdir -p $${asset_loc} ; \
-		cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+	# The already minified JS can just be copied over to the assets location
+	for file in `find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "*.min.js"`; do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		mv -v $$file $$asset_loc/$$(basename $$file); \
 	done
 
 	# Other assets
-	for file in $$(find $(CURDIR)/plugins/ $(CURDIR)/program/ $(CURDIR)/skins/ -type f \
+	for file in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f \
 			-name "*.eot" -o \
 			-name "*.gif" -o \
 			-name "*.ico" -o \
@@ -65,50 +66,50 @@
 			-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|$(CURDIR)/plugins/|$(CURDIR)/public_html/assets/plugins/|g" \
-				-e "s|$(CURDIR)/program/|$(CURDIR)/public_html/assets/program/|g" \
-				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
-			) ; \
-		mkdir -p $${asset_loc} ; \
-		mv -vf $${file} $${asset_loc}/$$(basename $${file}); \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		mv -f $$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 "$(CURDIR)/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 ; \
+	# The watermark.html is an asset, too
+	for file in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -name "watermark.html" ); do \
+		asset_loc=$$(dirname $$(echo $$file | sed -e "s|/usr/share/roundcubemail/|/usr/share/roundcubemail/assets/|g")) ; \
+		install -pm 755 -d $$asset_loc ; \
+		mv -f $$file $$asset_loc/$$(basename $$file); \
 	done
 
-	if [ -f "/etc/plesk-release" ]; then \
-		cp -v ../SOURCES/plesk.config.inc.php config/config.inc.php ; \
-		cp -v ../SOURCES/plesk.password.inc.php config/password.inc.php ; \
-	else \
-		mv config/config.inc.php.sample config/config.inc.php ; \
-	fi
+	mv $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/assets/ \
+		$(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/public_html/assets/ 
 
-	dh_auto_build
+	mkdir -p $(CURDIR)/debian/roundcubemail/etc/roundcubemail/
+	cp -a config/config.inc.php.sample $(CURDIR)/debian/roundcubemail/etc/roundcubemail/config.inc.php
+	cp -a config/defaults.inc.php $(CURDIR)/debian/roundcubemail/etc/roundcubemail/defaults.inc.php
+	cp -a config/mimetypes.php $(CURDIR)/debian/roundcubemail/etc/roundcubemail/mimetypes.php
+
+	ln -s ../../../etc/roundcubemail $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/config
+
+	# Fix file permission
+	find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/ -type f -exec chmod ugo-x {} \;
+	find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/bin/ -type f -exec chmod ugo+x {} \;
+
+	# Copy plugin configuration files to the correct location
+	for conffile in $$(find $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/plugins -type f -name "config.inc.php.dist"); do \
+		plugin=$$(basename $$(dirname $$conffile)); \
+		mv $$conffile $(CURDIR)/debian/roundcubemail/etc/roundcubemail/$$plugin.inc.php; \
+		ln -s ../../../../../etc/roundcubemail/$$plugin.inc.php $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/plugins/$$plugin/config.inc.php; \
+	done
+
+	# Create the symbolic links for logs/ and temp/
+	ln -s ../../../var/lib/roundcubemail/ $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/temp
+	ln -s ../../../var/log/roundcubemail/ $(CURDIR)/debian/roundcubemail/usr/share/roundcubemail/logs
+
+	# Install apache2 configuration
+	mkdir -p $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available
+	install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available/roundcubemail.conf
 
 override_dh_compress:
-	dh_compress -Xsql
+	dh_compress -Xsql

debian.tar.gz/dirs Added

debian.tar.gz/docs Added

debian.tar.gz/install Added

debian.tar.gz/postinst Added

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+#EXTRA#
+#DEBHELPER#
+
+set -e
+
+fixperms() {
+    chown -R www-data:adm \
+        /var/lib/roundcubemail \
+        /var/log/roundcubemail
+    chmod 750 \
+        /var/lib/roundcubemail \
+        /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 {} \;
+}
+
+reload_apache()
+{
+    if apache2ctl configtest 2>/dev/null; then
+        invoke-rc.d apache2 $1 || true
+    else
+        echo "Your apache2 configuration is broken, so we're not restarting it for you."
+    fi
+}
+
+update_database() {
+    /usr/share/roundcubemail/bin/updatedb.sh \
+        --dir /usr/share/doc/roundcubemail/SQL/ \
+        --package roundcube \
+        >/dev/null 2>&1 || :
+}
+
+
+
+case "$1" in
+    configure)
+        fixperms
+        update_database
+        a2enmod rewrite
+        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then
+            a2ensite roundcubemail.conf
+            reload_apache reload
+        fi
+    ;;
+esac
+
+exit 0
+

debian.tar.gz/postrm Changed

debian.tar.gz/preinst Changed

debian.tar.gz/prerm Added

debian.tar.gz/roundcubemail-core.dirs Deleted

debian.tar.gz/roundcubemail-core.docs Deleted

debian.tar.gz/roundcubemail-core.install Deleted

debian.tar.gz/roundcubemail-core.links Deleted

debian.tar.gz/roundcubemail-core.postinst Deleted

@@ -1,62 +0,0 @@
-#!/bin/sh
-
-#EXTRA#
-#DEBHELPER#
-
-set -e
-
-fixperms() {
-    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "adm")
-    user=$(getent passwd roundcube_sysuser >/dev/null 2>&1 && echo "roundcube_sysuser" || echo "www-data")
-    chown -R ${user}:${group} \
-        /var/lib/roundcubemail \
-        /var/log/roundcubemail
-
-    chmod 750 \
-        /var/lib/roundcubemail \
-        /var/log/roundcubemail
-
-	chown -R root:${group} /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 {} \;
-}
-
-reload_apache()
-{
-    if apache2ctl configtest 2>/dev/null; then
-        invoke-rc.d apache2 $1 || true
-    else
-        echo "Your apache2 configuration is broken, so we're not restarting it for you."
-    fi
-}
-
-update_database() {
-    /usr/share/roundcubemail/bin/updatedb.sh \
-        --dir /usr/share/doc/roundcubemail/SQL/ \
-        --package roundcube \
-        >/dev/null 2>&1 || :
-}
-
-case "$1" in
-    configure)
-        fixperms
-        update_database
-        a2enmod rewrite
-
-        sed -i "s/rcmail-\!24ByteDESkey\*Str/`head -c 200 /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c24`/" \
-            /etc/roundcubemail/defaults.inc.php || : &> /dev/null
-
-        if [ -f "/etc/plesk-release" ]; then
-            exit 0
-        fi
-
-        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then
-            a2ensite roundcubemail.conf
-        fi
-        reload_apache reload
-    ;;
-esac
-
-exit 0
-

debian.tar.gz/roundcubemail-core.prerm Deleted

debian.tar.gz/roundcubemail.dirs Deleted

debian.tar.gz/roundcubemail.docs Deleted

debian.tar.gz/roundcubemail.install Deleted

plesk.config.inc.php Deleted

@@ -1,168 +0,0 @@
-<?php
-    include_once("/usr/share/psa-roundcube/config/config.inc.php");
-
-/*  Incompatible with the stock installation
-
-    $components = explode('.', $_SERVER["HTTP_HOST"]);
-
-    if (count($components) > 2) {
-        array_shift($components);
-    }
-
-    $domain = implode('.', $components);
-    $config['session_domain'] = $domain;
-*/
-    $config['support_url'] = "https://kolabenterprise.com/support";
-
-    $config['product_name'] = "Kolab 16";
-
-    $config['use_secure_urls'] = true;
-
-    $config['assets_path'] = "/assets/";
-
-    $config['assets_dir'] = "/usr/share/roundcubemail/public_html/assets/";
-
-    $config['imap_cache'] = "db";
-    $config['imap_cache_ttl'] = "10d";
-
-    $config['message_cache'] = null;
-
-    $config['session_storage'] = "db";
-
-    $config['skin'] = "plesk";
-
-    $config['auto_create_user'] = true;
-
-    $config['enable_installer'] = false;
-
-    $config['plugins'] = Array(
-            'acl',
-            'archive',
-            'calendar',
-            'jqueryui',
-            'kolab_activesync',
-            'kolab_addressbook',
-            'kolab_config',
-            //'kolab_delegation',
-            'kolab_files',
-            'kolab_folders',
-            'kolab_notes',
-            'kolab_tags',
-            'libkolab',
-            'libcalendaring',
-            'managesieve',
-            'markasjunk',
-            'newmail_notifier',
-            'odfviewer',
-            'password',
-            'pdfviewer',
-            'tasklist',
-            'contextmenu',
-        );
-
-    $config['activesync_plugins'] = Array(
-            'libcalendaring',
-            'libkolab'
-        );
-
-    $config['kolabdav_plugins'] = Array(
-            'libcalendaring',
-            'libkolab'
-        );
-
-    $config['skip_deleted'] = true;
-
-    $config['read_when_deleted'] = true;
-    $config['flag_for_deletion'] = true;
-    $config['delete_always'] = true;
-
-    $config['session_lifetime'] = 180;
-    $config['password_charset'] = 'UTF-8';
-    $config['useragent'] = 'Kolab 16/Roundcube ' . RCUBE_VERSION;
-    $config['refresh_interval'] = 300;
-    $config['check_all_folders'] = false;
-    $config['dont_override'] = Array(
-            'check_all_folders',
-            'refresh_interval',
-            'skin'
-        );
-
-    $config['message_sort_col'] = 'date';
-    $config['default_list_mode'] = 'threads';
-    $config['autoexpand_threads'] = 2;
-
-    $config['message_sort_col'] = 'date';
-    $config['default_list_mode'] = 'threads';
-    $config['autoexpand_threads'] = 2;
-
-    $config['spellcheck_engine'] = 'pspell';
-    $config['spellcheck_dictionary'] = true;
-    $config['spellcheck_ignore_caps'] = true;
-    $config['spellcheck_ignore_nums'] = true;
-    $config['spellcheck_ignore_syms'] = true;
-    $config['spellcheck_languages'] = array(
-            'da' => 'Dansk',
-            'de' => 'Deutsch',
-            'en' => 'English',
-            'es' => 'Español',
-            'fr' => 'Français',
-            'it' => 'Italiano',
-            'nl' => 'Nederlands',
-            'pl' => 'Polski',
-            'pt' => 'Português',
-            'ru' => 'Русский',
-            'fi' => 'Suomi',
-            'sv' => 'Svenska'
-        );
-
-    $config['undo_timeout'] = 10;
-    $config['upload_progress'] = 2;
-    $config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';
-    $config['preview_pane'] = true;
-    $config['preview_pane_mark_read'] = 0;
-
-    // Bottom posting for reply mode
-    $config['reply_mode'] = 0;
-    $config['sig_above'] = false;
-    $config['mdn_requests'] = 0;
-    $config['mdn_default'] = false;
-    $config['dsn_default'] = false;
-    $config['reply_same_folder'] = false;
-
-    $config['performance_stats'] = true;
-
-    $config['drafts_mbox'] = 'Drafts';
-    $config['junk_mbox'] = 'Spam';
-    $config['sent_mbox'] = 'Sent';
-    $config['trash_mbox'] = 'Trash';
-
-    $config['skin_include_php'] = false;
-    $config['mime_magic'] = null;
-    $config['im_identify_path'] = '/usr/bin/identify';
-    $config['im_convert_path'] = '/usr/bin/convert';
-    $config['log_dir'] = 'logs/';
-    $config['temp_dir'] = '/var/lib/roundcubemail/';
-
-    $config['archive_mbox'] = 'Archive';
-    $config['junk_mbox'] = 'Spam';
-    $config['default_folders'] = array('INBOX', 'Archive', 'Drafts', 'Sent', 'Spam', 'Trash');
-
-    $config['log_driver'] = 'file';
-    $config['log_date_format'] = 'Y-M-d H:i:s O';
-    $config['syslog_id'] = 'roundcube';
-    $config['syslog_facility'] = LOG_USER;
-    $config['smtp_log'] = true;
-    $config['log_logins'] = true;
-    $config['log_session'] = true;
-    $config['debug_level'] = 1;
-    $config['devel_mode'] = false;
-    $config['sql_debug'] = false;
-    $config['memcache_debug'] = false;
-    $config['imap_debug'] = false;
-    $config['ldap_debug'] = false;
-    $config['smtp_debug'] = false;
-
-    $config['fileapi_backend'] = "kolab";
-    $config['fileapi_plugins'] = Array('kolab_folders');
-    $config['fileapi_manticore'] = false;
-    $config['fileapi_wopi_office'] = false;

plesk.password.inc.php Deleted

roundcubemail-1.2.3.tar.gz Changed

roundcubemail.dsc Changed

@@ -2,17 +2,16 @@
 Source: roundcubemail
 Binary: roundcubemail
 Architecture: all
-Version: 1:1.2.3-0~kolab4.16
-Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Uploaders: Paul Klos <kolab@klos2day.nl>
+Version: 1:1.2.3-0~kolab3
+Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
+Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3
 Vcs-Browser: http://git.kolabsys.com/apt/roundcubemail/
 Vcs-Git: git://git.kolabsys.com/git/apt/roundcubemail/
-Build-Depends: composer, cssmin, node-uglify, debhelper (>= 8), psa | bash
-Package-List:
+Build-Depends: composer, debhelper (>= 8)
+Package-List: 
  roundcubemail deb web extra
- roundcubemail-core deb web extra
-Files:
+Files: 
  00000000000000000000000000000000 0 roundcubemail-1.2.3.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 1942 0

Request History

vanmeeuwen created request over 7 years ago

Enhance packaging to split plugins

timotheus accepted request over 7 years ago

looks good