Commits · 1.2-fixes · Jonathan Swaelens / debian-fusiondirectory

14 Feb, 2018 2 commits

Merge branch 'cherry-pick-' into '1.2-fixes' · 09bf00f7

bmortier authored Feb 14, 2018

Merge branch '5664-correct-developers-plugin-packaging' into '1.3-dev'

Closes #5663

See merge request debian/fusiondirectory!7

09bf00f7

Merge branch '5664-correct-developers-plugin-packaging' into '1.3-dev' · 83105617

bmortier authored Sep 25, 2017

Resolve "Correct developers plugin packaging"

See merge request !1

(cherry picked from commit 4b5655b1)

5f40af82 Fixes: #5663 Plugins folder should be reorganized to ease packaging
8bd2528f Revert "Fixes: #5663 Plugins folder should be reorganized to ease packaging"
5ece4fef Fixes #5659 Adadpting debian packaging to new plugins folder organization
8854aad9 Fixes #5659 fixed ppolicy packaging
b146b456 🚑 fix(developers): remove all files that have been put in the dev-tools repository
58f0f62a Merge branch '1.3-dev' into '5664-correct-developers-plugin-packaging'

83105617

22 Oct, 2017 2 commits
- Merge branch '5669-add-code-of-conduct-licence-readme' into '1.2-fixes' · 87852b0c
  bmortier authored Oct 22, 2017
```
See merge request !6
```
  87852b0c
- Merge branch '5669-add-code-of-conduct-licence-readme' into '1.3-dev' · 2fa92980
  bmortier authored Oct 22, 2017
```
Resolve "Add code of conduct, licence, readme"

Closes #5669

See merge request !5
```
  2fa92980
24 Jul, 2017 4 commits
- Fixes #5659 fixed ppolicy packaging · 8854aad9
  Côme Chilliet authored Jul 10, 2017
  
  8854aad9
- Fixes #5659 Adadpting debian packaging to new plugins folder organization · 5ece4fef
  Côme Chilliet authored Jul 10, 2017
  
  5ece4fef
- Revert "Fixes: #5663 Plugins folder should be reorganized to ease packaging" · 8bd2528f
  Benoit Mortier authored Jul 24, 2017
```
This reverts commit 5f40af82.
```
  8bd2528f
- Fixes: #5663 Plugins folder should be reorganized to ease packaging · 5f40af82
  Benoit Mortier authored Jul 24, 2017
```
Fixing applications images
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  5f40af82
30 Jun, 2017 4 commits
- Merge branch '1.2-dev' · f4130579
  Benoit Mortier authored Jun 30, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Conflicts:
	debian/changelog
	debian/changelog.wheezy
```
  f4130579
- Removing wrong space · 4340d168
  Benoit Mortier authored Jun 30, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  4340d168
- Adding missing 1.1.1 changelog entries · 0be79891
  Benoit Mortier authored Jun 30, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  0be79891
- Updating Changelog for 1.2 · 54547791
  Benoit Mortier authored Jun 30, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  54547791
14 Jun, 2017 1 commit
- Fixes: #5594 Sympa plugin does not depend of alias anymore · 9316dcff
  Benoit Mortier authored Jun 14, 2017
```
Removed dependancy on alias plugin
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  9316dcff
13 Jun, 2017 1 commit
- Fixes: #5594 Sympa plugin does not depend of alias anymore · 88b7d5c1
  Benoit Mortier authored Jun 13, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  88b7d5c1
02 Jun, 2017 2 commits
- Merge branch '1.1-fixes' · 3f8ddb98
  Benoit Mortier authored Jun 02, 2017
  
  3f8ddb98
- Updating packages for 1.1.1 · 7699f98e
  Benoit Mortier authored Jun 02, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  7699f98e
16 May, 2017 1 commit
- Updating for 1.2-dev · 4ac174b6
  Benoit Mortier authored May 16, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  4ac174b6
11 May, 2017 5 commits

Merge branch 'develop-1.1' · cbe167ec

Benoit Mortier authored May 11, 2017


Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Conflicts:
	debian/changelog
	debian/changelog.wheezy
	debian/control
	debian/control.wheezy
	debian/copyright
	debian/copyright.in
	debian/fusiondirectory-plugin-addressbook.dirs
	debian/fusiondirectory-plugin-database-connector.dirs
	debian/fusiondirectory-plugin-developpers.dirs
	debian/fusiondirectory-plugin-ipmi-schema.install
	debian/fusiondirectory-plugin-ipmi.install
	debian/fusiondirectory-plugin-kolab2-schema.install
	debian/fusiondirectory-plugin-kolab2.install
	debian/fusiondirectory-plugin-renater-partage.dirs
	debian/fusiondirectory-plugin-spamassassin.dirs
	debian/fusiondirectory-plugin-weblink-schema.install
	debian/fusiondirectory.install
	debian/patches/2003_fusiondirectory-setup.patch
	debian/source.lintian-overrides

cbe167ec

Updating changelog for 1.1 · 55edd770
Benoit Mortier authored May 11, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
55edd770
merging changelog into changelog.wheezy · bfa7791a
Benoit Mortier authored May 11, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
bfa7791a
Merging changelog with debian official one · 6665fd82
Benoit Mortier authored May 11, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
6665fd82
Merging changelog and changelog.wheezy from master · cf3b8ed0
Benoit Mortier authored May 11, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
cf3b8ed0

08 May, 2017 9 commits
- Removing wrongly php dependancy, jessie is php5 only · 2ff7aa84
  Benoit Mortier authored May 08, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  2ff7aa84
- updated wheezy control file from jessie · 46cfea18
  Benoit Mortier authored May 08, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  46cfea18
- Merging official debian packages · caee192b
  Benoit Mortier authored May 08, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  caee192b
- Merging copyright.in with official debian · 359e1bbc
  Benoit Mortier authored May 08, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  359e1bbc
- Adding README.Debian · 2623cd25
  Benoit Mortier authored May 08, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  2623cd25
- Adding back the README.debian · 13166b22
  Benoit Mortier authored May 08, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  13166b22
- Updating copyright from debian offcial packages · f5a610c9
  Benoit Mortier authored May 08, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  f5a610c9
- Adding breaks / replace for posix and wheezy · fb3bea04
  Benoit Mortier authored May 08, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  fb3bea04
- Adding break/replaces for 1.1 · 0c1d50e5
  Benoit Mortier authored May 08, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  0c1d50e5
06 May, 2017 1 commit
- Added missing subcontracting plugin and schema · 7bbe8e63
  Benoit Mortier authored May 06, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  7bbe8e63
05 May, 2017 1 commit
- Revert "Fixes: #5508 second attempt at putting breaks replaces" · aea26251
  Benoit Mortier authored May 05, 2017
```
This reverts commit 3c5daf91.
```
  aea26251
04 May, 2017 7 commits
- Fixes: #5508 second attempt at putting breaks replaces · 3c5daf91
  Benoit Mortier authored May 04, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  3c5daf91
- synchronizing jessie and wheezy control files · b6dcc252
  Benoit Mortier authored May 04, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  b6dcc252
- synchronizing jessie and wheezy control files · 060db6b2
  Benoit Mortier authored May 04, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  060db6b2
- Fixes: #5508 Error when we upgrade from 1.0.20 to 1.1 du to moving of the... · 0083df22
  Benoit Mortier authored May 04, 2017
```
Fixes: #5508 Error when we upgrade from 1.0.20 to 1.1 du to moving of the posix part into the posix plugin
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  0083df22
- Fixes: #5510 put a strong dependanct between schema2ldif 1.3 and fusiondirectory · c7b25cef
  Benoit Mortier authored May 04, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  c7b25cef
- Fixes: #5403 Mixed groups should depend upon POSIX · 26cc41ee
  Benoit Mortier authored May 04, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  26cc41ee
- Fixes: #5403 Mixed groups should depend upon POSIX · bddc3770
  Benoit Mortier authored May 04, 2017
```
Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
```
  bddc3770