Commit ef0a6b6c authored by bmortier's avatar bmortier

Merge branch '1.0.13-fixes'

parents eed7ed03 acd998a2
fusiondirectory (1.0.14-1) stable; urgency=medium
[Benoit Mortier]
* New upstream Release
-- Benoit Mortier <benoit.mortier@opensides.be> Sat, 09 Jul 2016 18:44:56 +0200
fusiondirectory (1.0.13-1) stable; urgency=medium
[Benoit Mortier]
......
fusiondirectory (1.0.14-1) oldstable; urgency=medium
[Benoit Mortier]
* New upstream Release
-- Benoit Mortier <benoit.mortier@opensides.be> Sat, 09 Jul 2016 18:45:56 +0200
fusiondirectory (1.0.13-1) oldstable; urgency=medium
[Benoit Mortier]
......
......@@ -17,7 +17,7 @@ Package: fusiondirectory
Architecture: all
Depends:
apache2 | lighttpd | httpd | nginx,
fusiondirectory-smarty3-acl-render,
fusiondirectory-smarty3-acl-render (= ${binary:Version}),
gettext,
javascript-common,
libarchive-extract-perl,
......@@ -620,20 +620,6 @@ Description: LDAP schema for FusionDirectory fusioninventory plugin
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based setups.
Package: fusiondirectory-plugin-game
Architecture: all
Depends:
fusiondirectory(= ${binary:Version}),
fusiondirectory-plugin-mail (= ${binary:Version}),
${misc:Depends},
Conflicts:
gosa,
Description: Tutorial for FusionDirectory
Tutorial Game for Fusiondirectory.
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-gpg
Architecture: all
Depends:
......@@ -1427,7 +1413,10 @@ Depends:
${misc:Depends},
Conflicts:
gosa-plugin-systems,
Breaks:
fusiondirectory (<< 1.0.13-2~),
Replaces:
fusiondirectory (<< 1.0.13-2~),
fusiondirectory-plugin-goto,
Description: systems plugin for FusionDirectory
Systems management base plugin.
......
......@@ -17,7 +17,7 @@ Package: fusiondirectory
Architecture: all
Depends:
apache2 | lighttpd | httpd | nginx,
fusiondirectory-smarty3-acl-render,
fusiondirectory-smarty3-acl-render (= ${binary:Version}),
gettext,
javascript-common,
libcrypt-cbc-perl,
......@@ -621,20 +621,6 @@ Description: LDAP schema for FusionDirectory fusioninventory plugin
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based setups.
Package: fusiondirectory-plugin-game
Architecture: all
Depends:
fusiondirectory(= ${binary:Version}),
fusiondirectory-plugin-mail (= ${binary:Version}),
${misc:Depends},
Conflicts:
gosa,
Description: Tutorial for FusionDirectory
Tutorial Game for Fusiondirectory.
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-gpg
Architecture: all
Depends:
......@@ -1432,8 +1418,11 @@ Depends:
${misc:Depends},
Conflicts:
gosa-plugin-systems,
Breaks:
fusiondirectory (<< 1.0.13-2~),
Replaces:
fusiondirectory-plugin-goto,
fusiondirectory (<< 1.0.13-2~),
fusiondirectory-plugin-goto,
Description: systems plugin for FusionDirectory
Systems management base plugin.
.
......
plugins/autofs/admin /usr/share/fusiondirectory/plugins
plugins/autofs/config /usr/share/fusiondirectory/plugins
plugins/autofs/html/images /usr/share/fusiondirectory/html/plugins/autofs
plugins/autofs/html/themes /usr/share/fusiondirectory/html
plugins/autofs/locale /usr/share/fusiondirectory/locale/plugins/autofs
plugins/game/addons /usr/share/fusiondirectory/plugins
plugins/game/locale /usr/share/fusiondirectory/locale/plugins/game
plugins/game/html/themes /usr/share/fusiondirectory/html
plugins/game/html/images /usr/share/fusiondirectory/html/plugins/game
......@@ -19,7 +19,6 @@ plugins/supann/admin /usr/share/fusiond
plugins/supann/config /usr/share/fusiondirectory/plugins
plugins/supann/personal /usr/share/fusiondirectory/plugins
plugins/supann/locale /usr/share/fusiondirectory/locale/plugins/supann
plugins/supann/html/images /usr/share/fusiondirectory/html/plugins/supann
plugins/supann/html/themes /usr/share/fusiondirectory/html
plugins/systems/admin /usr/share/fusiondirectory/plugins
plugins/systems/config /usr/share/fusiondirectory/plugins
plugins/systems/addons/dashboard /usr/share/fusiondirectory/plugins/addons/dashboard
plugins/systems/addons/dashboard /usr/share/fusiondirectory/plugins/addons/dashboard
plugins/systems/locale /usr/share/fusiondirectory/locale/plugins/systems
plugins/systems/html/images /usr/share/fusiondirectory/html/plugins/systems
plugins/systems/html/themes /usr/share/fusiondirectory/html
......@@ -3,5 +3,4 @@ plugins/user-reminder/locale /usr/share/fusiond
plugins/user-reminder/html/class_expiredUserPostpone.inc /usr/share/fusiondirectory/html
plugins/user-reminder/html/expired_postpone.php /usr/share/fusiondirectory/html
plugins/user-reminder/html/expired_postpone.php /usr/share/fusiondirectory/html
plugins/user-reminder/ihtml/themes/default/user-reminder.tpl /usr/share/fusiondirectory/ihtml/themes/default/
plugins/user-reminder/ihtml/themes/default/user-reminder.tpl /usr/share/fusiondirectory/ihtml/themes/breezy/
plugins/user-reminder/ihtml/themes/breezy/user-reminder.tpl /usr/share/fusiondirectory/ihtml/themes/breezy/
core/contrib/apache/fusiondirectory-apache.conf /etc/fusiondirectory
core/contrib/bin/fusiondirectory-setup /usr/sbin
core/contrib/fusiondirectory.conf /usr/share/doc/fusiondirectory
core/contrib/images /usr/share/doc/fusiondirectory
core/html/*.ico /usr/share/fusiondirectory/html
core/html/*.inc /usr/share/fusiondirectory/html
core/html/*.php /usr/share/fusiondirectory/html
......
Author: Benoit Mortier
Description: put the Debian directory for scriptaculous into the script tag
--- a/core/ihtml/themes/default/headers.tpl 2013-11-16 18:44:27.000000000 +0100
+++ b/core/ihtml/themes/default/headers.tpl 2013-11-16 18:47:18.145142151 +0100
--- a/core/ihtml/themes/breezy/headers.tpl 2013-11-16 18:44:27.000000000 +0100
+++ b/core/ihtml/themes/breezy/headers.tpl 2013-11-16 18:47:18.145142151 +0100
@@ -15,14 +15,14 @@
<link rel="shortcut icon" href="favicon.ico"/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment