From 2bd804484e71ae41fbf163650a35541062a9d4db Mon Sep 17 00:00:00 2001 From: Roland Mas Date: Fri, 9 Nov 2012 19:18:26 +0100 Subject: [PATCH 1/1] Merged bits of generic packaging back --- src/packaging/install/web-apache2 | 4 +--- src/plugins/scmbzr/packaging/install/plugin-scmbzr | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/packaging/install/web-apache2 b/src/packaging/install/web-apache2 index ef129bda90..cfd8320134 100644 --- a/src/packaging/install/web-apache2 +++ b/src/packaging/install/web-apache2 @@ -4,6 +4,4 @@ utils/install-apache.sh usr/share/@OLDPACKAGE@/bin/ utils/manage-apache-config.sh usr/share/@OLDPACKAGE@/bin/ etc/httpd.conf.d-fhs usr/share/@OLDPACKAGE@/etc/ etc/httpd.conf-fhs usr/share/@OLDPACKAGE@/etc/ -lib/vendor/coolfieldset usr/share/@OLDPACKAGE@/lib/vendor/ -lib/vendor/jquery-simpletreemenu usr/share/@OLDPACKAGE@/lib/vendor/ -lib/vendor/jquery-storage usr/share/@OLDPACKAGE@/lib/vendor/ +lib/vendor usr/share/@OLDPACKAGE@/lib/ diff --git a/src/plugins/scmbzr/packaging/install/plugin-scmbzr b/src/plugins/scmbzr/packaging/install/plugin-scmbzr index 5b11c98a19..6c4356b14d 100644 --- a/src/plugins/scmbzr/packaging/install/plugin-scmbzr +++ b/src/plugins/scmbzr/packaging/install/plugin-scmbzr @@ -1,4 +1,4 @@ -plugins/scmbzr/bin/* usr/share/gforge/scmbzr/bin/ +plugins/scmbzr/bin/* usr/share/gforge/plugins/scmbzr/bin/ plugins/scmbzr/common/* usr/share/gforge/plugins/scmbzr/common/ plugins/scmbzr/etc/plugins/scmbzr/* etc/gforge/plugins/scmbzr/ plugins/scmbzr/etc/*.ini etc/@PACKAGE@/config.ini.d/ -- 2.30.2