[lemonldap-ng] 01/01: Update patches
Xavier Guimard
xguimard-guest at moszumanska.debian.org
Mon Dec 4 16:27:22 UTC 2017
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 a8c718edaa342f29221920d420a8d8ee8ad4046a
Author: Xavier Guimard <x.guimard at free.fr>
Date: Mon Dec 4 17:27:02 2017 +0100
Update patches
---
debian/changelog | 13 ++++++++-----
debian/patches/avoid-modify-sources.patch | 18 ------------------
debian/patches/javascript-typo.patch | 20 --------------------
debian/patches/replace-mouse-by-moose.patch | 2 +-
debian/patches/series | 2 --
5 files changed, 9 insertions(+), 46 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c6643fd..65ed8cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
-lemonldap-ng (1.9.13-3) UNRELEASED; urgency=medium
-
- [ Xavier Guimard ]
- * Update metadata to point to new repository
+lemonldap-ng (1.9.14-1) UNRELEASED; urgency=medium
[ Damyan Ivanov ]
* declare conformance with Policy 4.1.2 (no changes needed)
- -- Xavier Guimard <x.guimard at free.fr> Sat, 11 Nov 2017 14:07:57 +0100
+ [ Xavier Guimard ]
+ * Update metadata to point to new repository
+ * Remove javascript-typo.patch and avoid-modify-sources.patch now included
+ in upstream
+ * Update replace-mouse-by-moose.patch
+
+ -- Xavier Guimard <x.guimard at free.fr> Mon, 04 Dec 2017 17:25:23 +0100
lemonldap-ng (1.9.13-2) unstable; urgency=medium
diff --git a/debian/patches/avoid-modify-sources.patch b/debian/patches/avoid-modify-sources.patch
deleted file mode 100644
index 43023df..0000000
--- a/debian/patches/avoid-modify-sources.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Avoid modify sources
- Makefile updates sources if some timestamp are not up-to-date. This is not
- required for Debian packaging (and recommends to add perltidy in build
- dependencies
-Forwarded: not-needed
-Last-Update: 2016-04-01
-
---- a/Makefile
-+++ b/Makefile
-@@ -258,7 +258,7 @@
- # Configure targets
- # -----------------
-
--configure: json common_conf handler_conf portal_conf manager_conf
-+configure: common_conf handler_conf portal_conf manager_conf
-
- minify: $(JSDSTFILES) $(CSSDSTFILES)
-
diff --git a/debian/patches/javascript-typo.patch b/debian/patches/javascript-typo.patch
deleted file mode 100644
index 6458ddf..0000000
--- a/debian/patches/javascript-typo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix for little javascript error
- Import upstream patch to fix an error with Form replay feature (javascript
- generates error for fields with a dot)
-Author: Xavier Guimard <x.guimard at free.fr>
-Origin: upstream
-Bug: https://jira.ow2.org/browse/LEMONLDAP-1310
-Forwarded: no
-Last-Update: 2017-10-25
-
---- lemonldap-ng-1.9.13.orig/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main.pm
-+++ lemonldap-ng-1.9.13/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main.pm
-@@ -745,7 +745,7 @@ sub postJavascript {
- use bytes;
- my $value = "x" x bytes::length( $data->{$name} );
- $filler .=
--"form.find('input[name=$name], select[name=$name], textarea[name=$name]').val('$value')\n";
-+"form.find('input[name=\"$name\"], select[name=\"$name\"], textarea[name=\"$name\"]').val('$value')\n";
- }
-
- my $submitter =
diff --git a/debian/patches/replace-mouse-by-moose.patch b/debian/patches/replace-mouse-by-moose.patch
index 1a2a317..2ffbd20 100644
--- a/debian/patches/replace-mouse-by-moose.patch
+++ b/debian/patches/replace-mouse-by-moose.patch
@@ -172,7 +172,7 @@ Last-Update: 2016-05-02
use utf8;
-use Mouse;
+use Moose;
- our $VERSION = '1.9.13';
+ our $VERSION = '1.9.14';
use Lemonldap::NG::Common::Conf::Constants;
use Lemonldap::NG::Common::PSGI::Constants;
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm
diff --git a/debian/patches/series b/debian/patches/series
index d01d9cd..e4c0b24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
javascript-path.patch
-avoid-modify-sources.patch
replace-mouse-by-moose.patch
Avoid-developer-tests.patch
-javascript-typo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git
More information about the Pkg-perl-cvs-commits
mailing list