Request 1986 (accepted)

Overview

Request 1986 (accepted)

Fix debian.rules

Created by vanmeeuwen over 7 years ago
In state accepted

Submit roundcubemail

Submit package Kolab:16 / roundcubemail to package Kolab:Winterfell / roundcubemail

debian.rules Changed

@@ -1,18 +1,19 @@
 #!/usr/bin/make -f
 
+DH_VERBOSE=1
+
 %:
 	dh $@
 
 override_dh_auto_build:
-	mkdir -p $HOME/.composer
-	echo '{}' > $HOME/.composer/composer.json
+	mkdir -p $$HOME/.composer
+	echo '{}' > $$HOME/.composer/composer.json
 	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
 
-	rm -rvf installer/
 	rm -rvf tests/
 
 	# Compress the CSS
@@ -25,7 +26,7 @@
 		mkdir -p $${asset_loc} ; \
 		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
 		cat $${file} | cssmin > $${asset_loc}/$$(basename $${file}) || \
-			mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# Compress the JS, but not the already minified
@@ -38,7 +39,7 @@
 		mkdir -p $${asset_loc} ; \
 		echo "$${file} -> $${asset_loc}/$$(basename $${file})" ; \
 		uglifyjs $${file} > $${asset_loc}/$$(basename $${file}) || \
-			mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+			cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# The already minied JS can just be copied over to the assets location
@@ -49,7 +50,7 @@
 				-e "s|$(CURDIR)/skins/|$(CURDIR)/public_html/assets/skins/|g") ; \
 			) ; \
 		mkdir -p $${asset_loc} ; \
-		mv -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
+		cp -vf $${file} $${asset_loc}/$$(basename $${file}) ; \
 	done
 
 	# Other assets
@@ -91,8 +92,7 @@
 		echo "usr/share/roundcubemail/plugins/$${plugin}" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
 		echo "plugins/$${plugin} usr/share/roundcubemail/plugins/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
 		if [ -d "$(CURDIR)/plugins/$${plugin}/lib/Roundcube" ]; then \
-			mv $(CURDIR)/plugins/$${plugin}/lib $(CURDIR) ; \
-			echo "usr/share/roundcubemail/plugins/$${plugin}/lib/Roundcube" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
+			echo "usr/share/roundcubemail/plugins/$${plugin}/lib" >> debian/roundcubemail-plugin-$${pkgname}.dirs ; \
 			echo "plugins/$${plugin}/lib/Roundcube usr/share/roundcubemail/plugins/$${plugin}/lib/" >> debian/roundcubemail-plugin-$${pkgname}.install ; \
 		fi ; \
 		echo "" >> debian/control ; \
@@ -115,9 +115,19 @@
 	dh_auto_build
 
 override_dh_install:
-	# 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
+	if [ ! -f "/etc/plesk-release" ]; then \
+		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 ; \
+	fi
+
+	for ifile in $$(ls -1 debian/*.install); do \
+		echo "$${ifile}:" ; \
+		cat $${ifile} ; \
+	done
+
+	pwd
+
+	dh_install
 
 override_dh_compress:
 	dh_compress -Xsql

Build Results
RPM Lint

Refresh

Comments for request 1986 0

Request History

vanmeeuwen created request over 7 years ago

Fix debian.rules

vanmeeuwen accepted review over 7 years ago

vanmeeuwen approved review over 7 years ago

vanmeeuwen accepted review over 7 years ago

vanmeeuwen accepted request over 7 years ago