This is an automated email from the git hooks/post-receive script. xguimard-guest pushed a commit to branch master in repository lemonldap-ng.
commit 9a3e06d3f3a11a4a4ed8b94a61c2f024cdd246c0 Author: Xavier Guimard <x.guim...@free.fr> Date: Fri Dec 25 13:08:42 2015 +0100 Replace fr-doc target by an alias to english documentation --- debian/changelog | 2 ++ debian/patches/alias-fr-doc-to-doc.patch | 31 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 34 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9d865ad..2a6c892 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ lemonldap-ng (1.4.6-3) UNRELEASED; urgency=medium * Replace jquery-ui libs by shared packages * Manager now depends on lemonldap-ng-doc * Add virtual packages saml-identity-provider and saml-service-provider + * Replace fr-doc target by an alias to english documentation. 'fr-doc' + Makefile target generates some errors with OmegaT. -- Xavier Guimard <x.guim...@free.fr> Tue, 22 Dec 2015 20:16:21 +0100 diff --git a/debian/patches/alias-fr-doc-to-doc.patch b/debian/patches/alias-fr-doc-to-doc.patch new file mode 100644 index 0000000..76d3a48 --- /dev/null +++ b/debian/patches/alias-fr-doc-to-doc.patch @@ -0,0 +1,31 @@ +Description: Alias fr-doc path to doc. + Fr-doc is not build in official Debian package since OmegaT use generates + some errors. +Author: Xavier Guimard <x.guim...@free.fr> +Forwarded: no +Last-Update: 2015-12-25 + +--- a/_example/etc/manager-apache2.X.conf ++++ b/_example/etc/manager-apache2.X.conf +@@ -37,19 +37,8 @@ + Options +FollowSymLinks + </Directory> + +- # French version (needs fr-doc installation) +- Alias /fr-doc/ __FRDOCDIR__ +- <Directory __FRDOCDIR__> +- <IfVersion >= 2.3> +- Require all granted +- </IfVersion> +- <IfVersion < 2.3> +- Order Deny,Allow +- Allow from all +- </IfVersion> +- ErrorDocument 404 /notfoundfr.html +- Options +FollowSymLinks +- </Directory> ++ # Fr doc is not build for official Debian release ++ Alias /fr-doc/ __DEFDOCDIR__ + + # Perl script + # Note: to avoid manager stay in memory, we don't use ModPerl::Registry diff --git a/debian/patches/series b/debian/patches/series index d3aeb7a..b9c959e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ change-js-libs-by-shared-packages.patch broken-inheritance.patch spelling-errors.patch +alias-fr-doc-to-doc.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits