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 719f8c37d3d61ba91c1369626aedefe37bc7a5e3 Author: Xavier Guimard <x.guim...@free.fr> Date: Mon Oct 12 12:52:01 2015 +0200 Remove spelling patch now included in upstream --- debian/changelog | 3 ++- debian/patches/series | 1 - debian/patches/spelling-errors.patch | 34 ---------------------------------- 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2670663..3654ede 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ lemonldap-ng (1.4.6-1) UNRELEASED; urgency=medium TODO: - the changes in the conffiles probably need some handling via dpkg-maintscript-helper (rm_conffile and/or mv_conffile) + => Not really: customized My::Package will continue to work and + web admins have to check by hand their Apache files [ gregor herrmann ] * Add Dutch debconf translation. @@ -30,7 +32,6 @@ lemonldap-ng (1.4.6-1) UNRELEASED; urgency=medium * Add libjs-bootstrap in recommended dependencies * Really remove bootstrap fonts * Remove jquery copyright since it is deleted in packages - * Add spelling error patch -- Xavier Guimard <x.guim...@free.fr> Mon, 21 Sep 2015 20:42:56 +0200 diff --git a/debian/patches/series b/debian/patches/series index c16efa6..10aced8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ change-js-libs-by-shared-packages.patch -spelling-errors.patch diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch deleted file mode 100644 index 4e30820..0000000 --- a/debian/patches/spelling-errors.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: spelling errors -Author: Xavier Guimard <x.guim...@free.fr> -Forwarded: http://websvn.ow2.org/comp.php?repname=lemonldap&compare[]=%2F@3903&compare[]=%2F@3904 -Last-Update: 2015-09-24 - ---- a/doc/pages/documentation/1.4/applications.html -+++ b/doc/pages/documentation/1.4/applications.html -@@ -32,7 +32,7 @@ - - <p> - --Applications listed bellow are known to be easy to integrate in <acronym title="LemonLDAP::NG">LL::NG</acronym>. As <acronym title="LemonLDAP::NG">LL::NG</acronym> works like classic WebSSO (like Siteminderâ„¢), many other applications are easy to integrate. -+Applications listed below are known to be easy to integrate in <acronym title="LemonLDAP::NG">LL::NG</acronym>. As <acronym title="LemonLDAP::NG">LL::NG</acronym> works like classic WebSSO (like Siteminderâ„¢), many other applications are easy to integrate. - </p> - - <p> -@@ -166,4 +166,4 @@ - </table> - - </div> --<!-- SECTION "SAML connectors" [2610-] --></div><!-- closes <div class="dokuwiki export">--> -\ No newline at end of file -+<!-- SECTION "SAML connectors" [2610-] --></div><!-- closes <div class="dokuwiki export">--> ---- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm -+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm -@@ -2836,7 +2836,7 @@ - - Controls if a previous session is always available. If true, it call the sub - C<existingSession> with two parameters: id and a scalar tied on Apache::Session --module choosed to store sessions. See bellow -+module choosed to store sessions. See below. - - =head3 existingSession - -- 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