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 e5f19f07405290e8bd108ec631065495dfb7be14
Author: Xavier Guimard <x.guim...@free.fr>
Date: Sat Mar 5 08:26:10 2016 +0100
Remove patches now in upstream
---
debian/patches/alias-fr-doc-to-doc.patch | 31 -------------------------------
debian/patches/broken-inheritance.patch | 20 --------------------
debian/patches/series | 3 ---
debian/patches/spelling-errors.patch | 20 --------------------
4 files changed, 74 deletions(-)
diff --git a/debian/patches/alias-fr-doc-to-doc.patch
b/debian/patches/alias-fr-doc-to-doc.patch
deleted file mode 100644
index 76d3a48..0000000
--- a/debian/patches/alias-fr-doc-to-doc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/broken-inheritance.patch
b/debian/patches/broken-inheritance.patch
deleted file mode 100644
index 9b219a4..0000000
--- a/debian/patches/broken-inheritance.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: broken inheritance appears during upgrade after Jessie
- Note that it will not be patched upstream because Manager has been totaly
- rewrite for 1.9 which will be published as soon.
-Author: Xavier Guimard <x.guim...@free.fr>
-Bug-Debian: https://bugs.debian.org/808474
-Forwarded: http://mail.ow2.org/wws/arc/lemonldap-ng-users/2015-11/msg00022.html
-Last-Update: 2015-12-21
-
---- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
-+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
-@@ -20,6 +20,9 @@
- Lemonldap::NG::Manager::_i18n
- );
-
-+*li = *Lemonldap::NG::Manager::Downloader::li;
-+*span = *Lemonldap::NG::Manager::Downloader::span;
-+
- ## @cmethod Lemonldap::NG::Manager new(hashRef args)
- # Class constructor.
- #@param args hash reference
diff --git a/debian/patches/series b/debian/patches/series
index b9c959e..10aced8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
change-js-libs-by-shared-packages.patch
-broken-inheritance.patch
-spelling-errors.patch
-alias-fr-doc-to-doc.patch
diff --git a/debian/patches/spelling-errors.patch
b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 7636595..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Spelling error
-Author: Xavier Guimard <x.guim...@free.fr>
-Forwarded:
http://websvn.ow2.org/comp.php?repname=lemonldap%2F&compare[]=%2F@4051&compare[]=%2F@4052
-Last-Update: 2015-12-22
-
---- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Proxy.pm
-+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Proxy.pm
-@@ -206,10 +206,10 @@
- =item * B<LmProxyPass (required)>: Real server to push request to
-
- =item * B<LmLocationToReplace> (optional): substitution to do to avoid bad
--redirections. See synopsys for usage.
-+redirections. See synopsis for usage.
-
- =item * B<LmCookieDomainToReplace> (optional): substitution to do to set
cookies
--from proxied application. See synopsys for usage.
-+from proxied application. See synopsis for usage.
-
- =back
-
--
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
