Commit 94ad047f authored by bmortier's avatar bmortier

Merge branch '1.3-dev' into HEAD

Signed-off-by: bmortier's avatarBenoit Mortier <benoit.mortier@opensides.be>
parents 6a2f838a 35443f59
### Requirements
* Filling out the template is required. Any Enhancement request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* All new code requires tests to ensure against regressions
### Description
<!-- Required -->
<!-- Description of the issue -->
### Distribution Name and Version
<!-- Required -->
<!-- Debian, Centos -->
### FusionDirectory Version
<!-- Required -->
### PHP version used
<!-- Required -->
### Origin of php packages
<!-- Required -->
<!-- Distribution packages, Out of distribution -->
### Steps to Reproduce
<!-- Required -->
1. [First Step]
2. [Second Step]
3. [and so on...]
**Expected behavior:**
<!-- What you expect to happen-->
**Actual behavior:**
<!-- What actually happens -->
**Reproduces how often:**
<!-- What percentage of the time does it reproduce?-->
### Additional Information
<!-- optional -->
<!-- Any additional information, configuration or data that might be necessary to reproduce the issue. -->
### Requirements
* Filling out the template is required. Any Enhancement request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* All new code requires tests to ensure against regressions
## Descriptive title for this enhancement
<!-- required -->
### Actual behavior
<!-- What actually happens -->
### Expected behavior
<!-- What you expect to happen-->
### Step by step description of new behaviour
<!-- Required -->
1. [First Step]
2. [Second Step]
3. [and so on...]
### Benefits
<!-- optional -->
<!-- What benefits will be realized by the packaging change? -->
### Possible Drawbacks
<!-- optional -->
<!-- What are the possible side-effects or negative impacts of the packaging change? -->
### Applicable Issues
<!-- optional -->
<!-- Enter any applicable Issues here -->
### Requirements
* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* All new code requires tests to ensure against regressions
## Title of the Pull Requests
<!-- required -->
### Description of the Change
<!-- required -->
<!-- can be an aglomeration of commits bodies -->
### Benefits
<!-- optional -->
<!-- What benefits will be realized by the packaging change? -->
### Possible Drawbacks
<!-- optional -->
<!-- What are the possible side-effects or negative impacts of the packaging change? -->
### Applicable Issues
<!-- optional -->
<!-- Enter any applicable Issues here -->
## %"FusionDirectory 1.3" - 2019-03-13
### Added
#### fusiondirectory
- fusiondirectory#5666 New file in sudo plugin
- fusiondirectory#5679 New file include/class_Language.inc and include/class_Combinations.inc
- fusiondirectory#5697 Package supann-ext
- fusiondirectory#5714 Add a way to sort tables, add the tsort.js to the packaging
- fusiondirectory#5719 package the sinaps plugin for 1.3
- fusiondirectory#5720 SINAPS cli
- fusiondirectory#5721 to use the backport of LDAP size limit refactor from 1.4 we need to add the include/class_ldapSizeLimit.inc
### Changed
#### fusiondirectory
- fusiondirectory#5663 Plugins folder should be reorganized to ease packaging
- fusiondirectory#5698 corps was renamed to corps_NCORPS in supann
- fusiondirectory#5704 Adapt packages from debian upstream for 1.3-dev
### Removed
#### fusiondirectory
- fusiondirectory#5688 Remove the 2001_fusiondirectory-apache.patch
- fusiondirectory#5722 rewrote patch due to fusiondirectory-apache.conf rewrite
### Fixed
#### fusiondirectory
- fusiondirectory#5686 Change the place where the watch file search for fusiondirectory tar.gz
- fusiondirectory#5700 OPSI plugin should depend on Argonaut one
## %"FusionDirectory 1.2.3" - 2018-12-03
### Added
......
fusiondirectory (1.3-1) stable; urgency=medium
[Benoit Mortier]
* New upstream Release
-- Benoit Mortier <benoit.mortier@opensides.be> Thu, 14 Mar 2019 09:14:28 +0100
fusiondirectory (1.2.3-2) stable; urgency=medium
* debian/po:
+ Update German translation. Thanks to Helge Kreutzmann. (Closes: #912734).
* debian/control:
+ Bump Standards-Version: to.4.3.0. No changes needed.
-- Mike Gabriel <sunweaver@debian.org> Sun, 06 Jan 2019 19:55:29 +0100
fusiondirectory (1.2.3-1) stable; urgency=medium
[ Benoit Mortier ]
* add the contrib/docs dir to the packages to include the fusiondirectory oid pdf
* New upstream release.
* debian/compat:
+ Drop file. Use new debhelper-compat notation under B-D in control file
now.
+ In fusiondirectory-smarty3-acl-render: relax C (fusiondirectory << source
version) to B (fusiondirectory << source version).
* debian/copyright:
+ Update copyright attributions.
-- Benoit Mortier <benoit.mortier@opensides.be> Mon, 03 Dec 2018 15:32:00 +0100
-- Mike Gabriel <sunweaver@debian.org> Fri, 07 Dec 2018 10:59:40 +0100
fusiondirectory (1.2.2-4) stable; urgency=medium
......@@ -77,7 +99,7 @@ fusiondirectory (1.2.2-1) stable; urgency=medium
-- Mike Gabriel <sunweaver@debian.org> Fri, 31 Aug 2018 08:33:27 +0200
fusiondirectory (1.2.1-2) unstable; urgency=medium
fusiondirectory (1.2.1-2) stable; urgency=medium
[ Mike Gabriel ]
* debian/{fusiondirectory.config,templates}:
......
fusiondirectory (1.2.3-1) oldstable; urgency=medium
[ Benoit Mortier ]
* add the contrib/docs dir to the packages to include the fusiondirectory oid pdf
-- Benoit Mortier <benoit.mortier@opensides.be> Mon, 03 Dec 2018 15:33:06 +0100
fusiondirectory (1.2.2-1) oldstable; urgency=medium
fusiondirectory (1.3-1) oldstable; urgency=medium
[Benoit Mortier]
* New upstream Release
-- Benoit Mortier <benoit.mortier@opensides.be> Thu, 30 Aug 2018 14:05:02 +0200
-- Benoit Mortier <benoit.mortier@opensides.be> Thu, 14 Mar 2019 09:14:55 +0100
fusiondirectory (1.2.1-2) oldstable; urgency=medium
......
......@@ -9,9 +9,10 @@ Build-Depends:
debhelper (>= 9),
Build-Depends-Indep:
po-debconf,
Standards-Version: 3.9.8
Homepage: http://www.fusiondirectory.org/
Vcs-Browser: http://git.fusiondirectory.org/gitweb/
Standards-Version: 4.3.0
Homepage: https://www.fusiondirectory.org/
Vcs-Git: https://gitlab.fusiondirectory.org/fusiondirectory/fd.git
Vcs-Browser: https://gitlab.fusiondirectory.org/fusiondirectory/fd
Package: fusiondirectory
Architecture: all
......@@ -1149,6 +1150,37 @@ Description: LDAP schema for FusionDirectory samba plugin
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-sinaps
Architecture: all
Depends:
fusiondirectory (= ${binary:Version}),
fusiondirectory-plugin-personal (= ${binary:Version}),
fusiondirectory-plugin-supann (= ${binary:Version}),
fusiondirectory-plugin-supann-ext (= ${binary:Version}),
${misc:Depends},
Description: SINAPS plugin for FusionDirectory
The integrated solution for managing reference and orchestration data
business processes
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-sinaps-schema
Architecture: all
Depends:
fusiondirectory-plugin-personal-schema (= ${binary:Version}),
fusiondirectory-plugin-supann-schema (= ${binary:Version}),
fusiondirectory-plugin-supann-ext-schema (= ${binary:Version}),
${misc:Depends},
Suggests:
slapd,
Description: LDAP schema for FusionDirectory SINAPS plugin
This package includes the LDAP schemas needed by the FusionDirectory
SINAPS plugin.
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-sogo
Architecture: all
Depends:
......@@ -1363,6 +1395,36 @@ Description: LDAP schema for FusionDirectory supann plugin
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-supann-ext
Architecture: all
Depends:
fusiondirectory (= ${binary:Version}),
${misc:Depends},
Conflicts:
gosa,
Description: supann extension plugin for FusionDirectory
Supann extension plugin for structures to go with the sinaps service.
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-supann-ext-schema
Architecture: all
Depends:
fusiondirectory-schema (= ${binary:Version}),
${misc:Depends},
Suggests:
slapd,
Conflicts:
gosa,
Description: LDAP schema for FusionDirectory supann plugin
This package includes the LDAP schema needed by the FusionDirectory
supann plugin.
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-sympa
Architecture: all
Depends:
......@@ -1541,7 +1603,7 @@ Depends:
smarty3,
${misc:Depends},
Conflicts:
fusiondirectory (<< ${source:Version}),
fusiondirectory (<< ${binary:Version}),
Description: Provide FusionDirectory ACL based rendering for Smarty3
This package provides acl based rendering support for Smarty3,
the popular PHP templating engine (http://smarty.php.net/). This
......@@ -1577,3 +1639,4 @@ Description: webservice shell for FusionDirectory
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based setups.
......@@ -1146,6 +1146,37 @@ Description: LDAP schema for FusionDirectory samba plugin
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-sinaps
Architecture: all
Depends:
fusiondirectory (= ${binary:Version}),
fusiondirectory-plugin-personal (= ${binary:Version}),
fusiondirectory-plugin-supann (= ${binary:Version}),
fusiondirectory-plugin-supann-ext (= ${binary:Version}),
${misc:Depends},
Description: SINAPS plugin for FusionDirectory
The integrated solution for managing reference and orchestration data
business processes
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-sinaps-schema
Architecture: all
Depends:
fusiondirectory-plugin-personal-schema (= ${binary:Version}),
fusiondirectory-plugin-supann-schema (= ${binary:Version}),
fusiondirectory-plugin-supann-ext-schema (= ${binary:Version}),
${misc:Depends},
Suggests:
slapd,
Description: LDAP schema for FusionDirectory SINAPS plugin
This package includes the LDAP schemas needed by the FusionDirectory
SINAPS plugin.
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-sogo
Architecture: all
Depends:
......@@ -1360,6 +1391,37 @@ Description: LDAP schema for FusionDirectory supann plugin
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-supann-ext
Architecture: all
Depends:
fusiondirectory (= ${binary:Version}),
${misc:Depends},
Conflicts:
gosa,
Description: supann extension plugin for FusionDirectory
Supann extension plugin for structures to go with the sinaps service.
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-supann-ext-schema
Architecture: all
Depends:
fusiondirectory-schema (= ${binary:Version}),
${misc:Depends},
Suggests:
slapd,
Conflicts:
gosa,
Description: LDAP schema for FusionDirectory supann plugin
This package includes the LDAP schema needed by the FusionDirectory
supann plugin.
.
FusionDirectory is a combination of system-administrator and end-user web
interface, designed to handle LDAP based network infrastructures.
Package: fusiondirectory-plugin-sympa
Architecture: all
Depends:
......
......@@ -1079,7 +1079,7 @@ Comment:
2011-2016, FusionDirectory
Files:
core/AUTHORS
core/AUTHORS.md
core/Changelog
core/contrib/apache/fusiondirectory-apache.conf
core/contrib/bin/fusiondirectory-insert-schema
......
......@@ -1886,6 +1886,7 @@ Files: README.multi-orig-tarball-package
debian/compat
debian/control
debian/files
debian/fusiondirectory-lighttpd.conf
debian/fusiondirectory-plugin-alias-schema.dirs
debian/fusiondirectory-plugin-alias-schema.install
debian/fusiondirectory-plugin-alias.dirs
......@@ -1962,6 +1963,10 @@ Files: README.multi-orig-tarball-package
debian/fusiondirectory-plugin-ipmi-schema.install
debian/fusiondirectory-plugin-ipmi.dirs
debian/fusiondirectory-plugin-ipmi.install
debian/fusiondirectory-plugin-kolab2-schema.dirs
debian/fusiondirectory-plugin-kolab2-schema.install
debian/fusiondirectory-plugin-kolab2.dirs
debian/fusiondirectory-plugin-kolab2.install
debian/fusiondirectory-plugin-ldapdump.dirs
debian/fusiondirectory-plugin-ldapdump.install
debian/fusiondirectory-plugin-ldapmanager.dirs
......@@ -2076,6 +2081,7 @@ Files: README.multi-orig-tarball-package
debian/fusiondirectory-plugin-webservice.docs
debian/fusiondirectory-plugin-webservice.install
debian/fusiondirectory-schema.dirs
debian/fusiondirectory-schema.docs
debian/fusiondirectory-schema.install
debian/fusiondirectory-schema.manpages
debian/fusiondirectory-smarty-acl-render.dirs
......@@ -2090,6 +2096,7 @@ Files: README.multi-orig-tarball-package
debian/fusiondirectory.config
debian/fusiondirectory.dirs
debian/fusiondirectory.docs
debian/fusiondirectory.examples
debian/fusiondirectory.install
debian/fusiondirectory.links
debian/fusiondirectory.manpages
......@@ -2105,6 +2112,7 @@ Files: README.multi-orig-tarball-package
debian/patches/series
debian/po/POTFILES.in
debian/rules
debian/source.lintian-overrides
debian/source/format
debian/source/lintian-overrides
debian/templates
......@@ -3010,12 +3018,16 @@ License: UNKNOWN
FIXME
Files: plugins/supann/contrib/etc/affiliation
Copyright: dagogique
de recherche
munéré
méritat
tablissement
tudiant gardant des relations avec l'établissement
Copyright: d'enseignement (teacher)
dagogique (faculty)
dagogique (staff)
de recherche (researcher)
munéré (employee)
méritat (emeritus)
tablissement (affiliate)
tablissement (member)
tablissement (retired)
tudiant gardant des relations avec l'établissement (alum)
License: UNKNOWN
FIXME
......
plugins/developers/debug-help/addons /usr/share/fusiondirectory/plugins
plugins/developers/addons /usr/share/fusiondirectory/plugins
plugins/developers/locale /usr/share/fusiondirectory/locale/plugins/developers
plugins/sinaps/contrib/openldap/sinaps-fd-conf.schema /etc/ldap/schema/fusiondirectory
plugins/sinaps/config /usr/share/fusiondirectory/plugins
plugins/sinaps/contrib/test /usr/share/doc/fusiondirectory-plugin-sinaps
plugins/sinaps/html/sinaps.php /usr/share/fusiondirectory/html
plugins/sinaps/include /usr/share/fusiondirectory
plugins/sinaps/locale /usr/share/fusiondirectory/locale/plugins/sinaps/
plugins/sinaps/personal /usr/share/fusiondirectory/plugins
plugins/supann-ext/contrib/openldap/supann-ext-fd.schema /etc/ldap/schema/fusiondirectory
plugins/supann-ext/admin /usr/share/fusiondirectory/plugins
plugins/supann-ext/locale /usr/share/fusiondirectory/locale/plugins/supann-ext
......@@ -12,6 +12,7 @@ core/html/include/datepicker.js /usr/share/fusiondirectory/ht
core/html/include/fusiondirectory.js /usr/share/fusiondirectory/html/include
core/html/include/pulldown.js /usr/share/fusiondirectory/html/include
core/html/include/pwdStrength.js /usr/share/fusiondirectory/html/include
core/html/include/tsorter.js /usr/share/fusiondirectory/html/include
core/html/plugins /usr/share/fusiondirectory/html
core/html/themes /usr/share/fusiondirectory/html
core/ihtml /usr/share/fusiondirectory
......@@ -30,6 +31,7 @@ core/include/class_divSelectBox.inc /usr/share/fusiondirectory/in
core/include/class_exceptions.inc /usr/share/fusiondirectory/include
core/include/class_filter.inc /usr/share/fusiondirectory/include
core/include/class_filterLDAP.inc /usr/share/fusiondirectory/include
core/include/class_Language.inc /usr/share/fusiondirectory/include
core/include/class_ldap.inc /usr/share/fusiondirectory/include
core/include/class_ldapFilter.inc /usr/share/fusiondirectory/include
core/include/class_ldapGeneralizedTime.inc /usr/share/fusiondirectory/include
......@@ -42,6 +44,7 @@ core/include/class_msg_dialog.inc /usr/share/fusiondirectory/in
core/include/class_objects.inc /usr/share/fusiondirectory/include
core/include/class_pluglist.inc /usr/share/fusiondirectory/include
core/include/class_session.inc /usr/share/fusiondirectory/include
core/include/class_ldapSizeLimit.inc /usr/share/fusiondirectory/include
core/include/class_template.inc /usr/share/fusiondirectory/include
core/include/class_templateHandling.inc /usr/share/fusiondirectory/include
core/include/class_tests.inc /usr/share/fusiondirectory/include
......
......@@ -21,7 +21,7 @@ set -e
### ADAPT to new upstream release, whenever a new upstream release is packaged!!! ###
#####################################################################################
CURRENTMAJOR=1.2
CURRENTMAJOR=1.3
#####################################################################################
......
......@@ -6,25 +6,13 @@ Last-Update: 2018-05-11
--- a/core/contrib/apache/fusiondirectory-apache.conf
+++ b/core/contrib/apache/fusiondirectory-apache.conf
@@ -1,18 +1,13 @@
@@ -1,7 +1,7 @@
# Include FusionDirectory to your web service
-Alias /fusiondirectory /var/www/fusiondirectory/html
+Alias /fusiondirectory /usr/share/fusiondirectory/html
<IfModule mod_php5.c>
-<Location /fusiondirectory>
+<Directory /fusiondirectory>
php_admin_flag engine on
- php_admin_flag register_globals off
- php_admin_flag allow_call_time_pass_reference off
php_admin_flag expose_php off
- php_admin_flag zend.ze1_compatibility_mode off
- php_admin_flag register_long_arrays off
php_admin_value upload_tmp_dir /var/spool/fusiondirectory/
php_admin_value session.cookie_lifetime 0
-<Directory /var/www/fusiondirectory/html>
+<Directory /usr/share/fusiondirectory/html>
# Remove the comment from the line below if you use fusiondirectory-setup --encrypt-passwords
# include /etc/fusiondirectory/fusiondirectory.secrets
-</Location>
+</Directory>
</IfModule>
-
</Directory>
......@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: fusiondirectory 1.2.1-1\n"
"Project-Id-Version: fusiondirectory 1.2.2-4\n"
"Report-Msgid-Bugs-To: fusiondirectory@packages.debian.org\n"
"POT-Creation-Date: 2018-08-28 17:16+0200\n"
"PO-Revision-Date: 2018-08-28 23:30+0200\n"
"PO-Revision-Date: 2018-11-03 10:51+0100\n"
"Last-Translator: Mathias F. Popp <deb003@magnasec.com>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
......@@ -19,7 +19,7 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:1001
msgid "Really perform FusionDirectory major version upgrade? "
msgid "Really perform FusionDirectory major version upgrade?"
msgstr ""
"Möchten Sie wirklich ein Upgrade auf eine neue Hauptversion von "
"FusionDirectory durchführen?"
......@@ -43,24 +43,24 @@ msgid ""
"FusionDirectory comes with tools to migrate from one major version to "
"another. However, as with other LDAP directory setups, exceptional "
"circumstances or wrong data in the LDAP tree may sometimes prevent these "
"tools from migrating everything. "
"tools from migrating everything."
msgstr ""
"FusionDirectory bietet die nötigen Werkzeuge, um von einer Hauptversionsnummer "
"auf eine andere zu migrieren. Wie es auch mit anderen "
"LDAP-Verzeichnisdiensten der Fall ist, können außergewöhnliche Umstände "
"oder fehlerhafte Datenbestände im LDAP-Verzeichnisbaum manchmal verhindern, "
"dass diese Werkzeuge die Migration komplett und fehlerfrei durchführen. "
"FusionDirectory bietet die nötigen Werkzeuge, um von einer "
"Hauptversionsnummer auf eine andere zu migrieren. Wie es auch mit anderen "
"LDAP-Verzeichnisdiensten der Fall ist, können außergewöhnliche Umstände oder "
"fehlerhafte Datenbestände im LDAP-Verzeichnisbaum manchmal verhindern, dass "
"diese Werkzeuge die Migration komplett und fehlerfrei durchführen. "
#. Type: boolean
#. Description
#: ../templates:1001
msgid ""
"In this case, the directory information tree may even need to be manually "
"adapted outside of FusionDirectory with tools such as ldapmodify or ldapvi. "
"adapted outside of FusionDirectory with tools such as ldapmodify or ldapvi."
msgstr ""
"In diesem Fall kann es sogar nötig sein, den Verzeichnisbaum außerhalb von "
"FusionDirectory manuell anzupassen. Hilfreich hierbei sind z.B. die Werkzeuge "
"»ldapmodify« oder »ldapvi«."
"FusionDirectory manuell anzupassen. Hilfreich hierbei sind z.B. die "
"Werkzeuge »ldapmodify« oder »ldapvi«."
#. Type: boolean
#. Description
......@@ -86,4 +86,5 @@ msgid ""
"installation process will be aborted."
msgstr ""
"Der Upgrade-Vorgang von FusionDirectory wurde durch den Benutzer beendet. "
"Der Installationsvorgang wird abgebrochen."
"Der Installationsvorgang wird abgebrochen."
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