[commits] Horde branch master updated. 6e7ebf6322a40b2d1afd4e6d8ed51a014de04dc3

[Jan Schneider]

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

from: c2bd7b09d6f2daf54b6fbaa1db6a1a413239c64f

b46a90c Remove php extension on binaries
3f48687 Use the same shebang on all binaries
6620306 More on @php_bin@ uniformisation
6e7ebf6 Merge branch 'for_upstream' of git://github.com/sathieu/horde into sathieu-for_upstream

Summary: http://github.com/horde/horde/compare/c2bd7b09d6f2daf54b6fbaa1db6a1a413239c64f...6e7ebf6322a40b2d1afd4e6d8ed51a014de04dc3

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

commit b46a90c9ba0df6d804ca36a2d1599d53fc7ff86e
Author: Mathieu Parent <mathieu.parent at nantesmetropole.fr>
Date:   Thu Oct 31 11:50:45 2013 +0100

    Remove php extension on binaries
    
    When scripts are installed into a directory in the system PATH, the script name should not include an extension such as .sh or .pl that denotes the scripting language currently used to implement it. The implementation language may change; if it does, leaving the name the same would be confusing and changing it would be disruptive.
    
    Ref: http://lintian.debian.org/tags/script-with-language-extension.html

 horde/bin/horde-pref-remove     |   53 +++++++++++++++++++++++++++++++++++++++
 horde/bin/horde-pref-remove.php |   53 ---------------------------------------
 horde/bin/horde-sql-shell       |   42 ++++++++++++++++++++++++++++++
 horde/bin/horde-sql-shell.php   |   42 ------------------------------
 horde/package.xml               |    8 +++---
 5 files changed, 99 insertions(+), 99 deletions(-)
 create mode 100755 horde/bin/horde-pref-remove
 delete mode 100755 horde/bin/horde-pref-remove.php
 create mode 100755 horde/bin/horde-sql-shell
 delete mode 100755 horde/bin/horde-sql-shell.php

http://github.com/horde/horde/commit/b46a90c9ba0df6d804ca36a2d1599d53fc7ff86e
http://git.horde.org/horde-git/-/commit/b46a90c9ba0df6d804ca36a2d1599d53fc7ff86e

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

commit 3f4868746e9f602774ff96be43737a3be2c3204a
Author: Mathieu Parent <mathieu.parent at nantesmetropole.fr>
Date:   Thu Oct 31 11:53:31 2013 +0100

    Use the same shebang on all binaries

 horde/bin/horde-pref-remove |    2 +-
 horde/bin/horde-sql-shell   |    2 +-
 horde/package.xml           |    8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/3f4868746e9f602774ff96be43737a3be2c3204a
http://git.horde.org/horde-git/-/commit/3f4868746e9f602774ff96be43737a3be2c3204a

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

commit 66203067f179225fae3f4a3f1e2f19c021d62d3a
Author: Mathieu Parent <mathieu.parent at nantesmetropole.fr>
Date:   Thu Oct 31 14:32:58 2013 +0100

    More on @php_bin@ uniformisation

 framework/Feed/doc/Horde/Feed/examples/blogroll.php               |    2 +-
 framework/Feed/doc/Horde/Feed/examples/reader.php                 |    2 +-
 framework/Feed/package.xml                                        |    8 +++-
 framework/Kolab_Filter/package.xml                                |    4 +-
 framework/Kolab_Filter/script/Horde/Kolab/Filter/kolabfilter.php  |    2 +-
 .../Kolab_Filter/script/Horde/Kolab/Filter/kolabmailboxfilter.php |    2 +-
 framework/Rampage/package.xml                                     |    2 +-
 framework/Rampage/scripts/Horde/Rampage/rampage.php               |    2 +-
 koward/package.xml                                                |    2 +-
 koward/script/Koward/koward.php                                   |    2 +-
 10 files changed, 16 insertions(+), 12 deletions(-)

http://github.com/horde/horde/commit/66203067f179225fae3f4a3f1e2f19c021d62d3a
http://git.horde.org/horde-git/-/commit/66203067f179225fae3f4a3f1e2f19c021d62d3a

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

commit 6e7ebf6322a40b2d1afd4e6d8ed51a014de04dc3
Merge: c2bd7b09 6620306
Author: Jan Schneider <jan at horde.org>
Date:   Fri Nov 1 14:10:00 2013 +0100

    Merge branch 'for_upstream' of git://github.com/sathieu/horde into sathieu-for_upstream
    
    Signed-off-by: Jan Schneider <jan at horde.org>

 framework/Feed/doc/Horde/Feed/examples/blogroll.php               |    2 +-
 framework/Feed/doc/Horde/Feed/examples/reader.php                 |    2 +-
 framework/Feed/package.xml                                        |    8 +-
 framework/Kolab_Filter/package.xml                                |    4 +-
 framework/Kolab_Filter/script/Horde/Kolab/Filter/kolabfilter.php  |    2 +-
 .../Kolab_Filter/script/Horde/Kolab/Filter/kolabmailboxfilter.php |    2 +-
 framework/Rampage/package.xml                                     |    2 +-
 framework/Rampage/scripts/Horde/Rampage/rampage.php               |    2 +-
 horde/bin/horde-pref-remove                                       |   53 +++++
 horde/bin/horde-pref-remove.php                                   |   53 -----
 horde/bin/horde-sql-shell                                         |   42 ++++
 horde/bin/horde-sql-shell.php                                     |   42 ----
 horde/package.xml                                                 |   12 +-
 koward/package.xml                                                |    2 +-
 koward/script/Koward/koward.php                                   |    2 +-
 15 files changed, 119 insertions(+), 111 deletions(-)

http://github.com/horde/horde/commit/6e7ebf6322a40b2d1afd4e6d8ed51a014de04dc3
http://git.horde.org/horde-git/-/commit/6e7ebf6322a40b2d1afd4e6d8ed51a014de04dc3