[commits] Horde branch master updated. c1dcda111db7d297d7a0f61452f844b51c614b53

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: cc106125c5fcfa1738071a101198b4ec6cca83b8

7246a81 Debian: Remove unneccesarry empty line
da1ce1d Debian: Add a description of Horde in long description
15b719b Debian: Set default horde_dir to /usr/share/horde
25d47fd Debian: pearrc is not needed because horde_dir is defined in php-horde-role package
c1dcda1 Merge branch 'for_upstream' of github.com:sathieu/horde into sathieu-for_upstream

-----------------------------------------------------------------------

commit 7246a81459063563db31bfa0978b4f8d5aa02c60
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Jan 6 22:14:50 2013 +0100

    Debian: Remove unneccesarry empty line

 components/data/distribute/debian/templates/watch |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/7246a81459063563db31bfa0978b4f8d5aa02c60

-----------------------------------------------------------------------

commit da1ce1dabf39ba3730aa27e90e2f4821e89853ce
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Jan 6 21:49:51 2013 +0100

    Debian: Add a description of Horde in long description

 components/data/distribute/debian/templates/control |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/da1ce1dabf39ba3730aa27e90e2f4821e89853ce

-----------------------------------------------------------------------

commit 15b719ba16894a1a941a81528fe031f87cf93be6
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Apr 6 21:07:53 2013 +0200

    Debian: Set default horde_dir to /usr/share/horde

 .../patches/0001-Set-default-horde_dir-to-usr-share-horde.patch   |   26 +++++
 .../distribute/debian/templates-php-horde-role/patches/series     |    1 +
 2 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 components/data/distribute/debian/templates-php-horde-role/patches/0001-Set-default-horde_dir-to-usr-share-horde.patch
 create mode 100644 components/data/distribute/debian/templates-php-horde-role/patches/series

http://git.horde.org/horde-git/-/commit/15b719ba16894a1a941a81528fe031f87cf93be6

-----------------------------------------------------------------------

commit 25d47fd5125a8399f17820d0c9d07286344caefe
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Fri Jan 11 21:42:37 2013 +0100

    Debian: pearrc is not needed because horde_dir is defined in php-horde-role package

 components/data/distribute/debian/templates/pearrc |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
 delete mode 100644 components/data/distribute/debian/templates/pearrc

http://git.horde.org/horde-git/-/commit/25d47fd5125a8399f17820d0c9d07286344caefe

-----------------------------------------------------------------------

commit c1dcda111db7d297d7a0f61452f844b51c614b53
Merge: cc10612 25d47fd
Author: Jan Schneider <jan at horde.org>
Date:   Mon Apr 8 11:11:45 2013 +0200

    Merge branch 'for_upstream' of github.com:sathieu/horde into sathieu-for_upstream

 .../patches/0001-Set-default-horde_dir-to-usr-share-horde.patch   |   26 +++++
 .../distribute/debian/templates-php-horde-role/patches/series     |    1 +
 components/data/distribute/debian/templates/control               |    4 +
 components/data/distribute/debian/templates/pearrc                |    2 -
 components/data/distribute/debian/templates/watch                 |    1 -
 5 files changed, 31 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/c1dcda111db7d297d7a0f61452f844b51c614b53