[Pkg-sympa-commits] [sympa] 06/14: Refresh patches

Emmanuel Bouthenot kolter at moszumanska.debian.org
Thu Jul 27 10:43:19 UTC 2017


This is an automated email from the git hooks/post-receive script.

kolter pushed a commit to branch master
in repository sympa.

commit 87aaabc4d22e57c2b4c3c1ff1aaf514004739d16
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Tue Jul 25 15:17:30 2017 +0200

    Refresh patches
---
 debian/patches/2001_ca_bundle_check_as_warning.patch    | 2 +-
 debian/patches/2002_support_jquery3_using_migrate.patch | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/patches/2001_ca_bundle_check_as_warning.patch b/debian/patches/2001_ca_bundle_check_as_warning.patch
index fda0fe2..65dfbd4 100644
--- a/debian/patches/2001_ca_bundle_check_as_warning.patch
+++ b/debian/patches/2001_ca_bundle_check_as_warning.patch
@@ -35,7 +35,7 @@ Last-Update: 2013-07-02
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/lib/Conf.pm
 +++ b/src/lib/Conf.pm
-@@ -823,7 +823,11 @@
+@@ -827,7 +827,11 @@
  
      ## Check cafile and capath access
      if (defined $Conf{'cafile'} && $Conf{'cafile'}) {
diff --git a/debian/patches/2002_support_jquery3_using_migrate.patch b/debian/patches/2002_support_jquery3_using_migrate.patch
index 3c5835b..4c66408 100644
--- a/debian/patches/2002_support_jquery3_using_migrate.patch
+++ b/debian/patches/2002_support_jquery3_using_migrate.patch
@@ -7,12 +7,11 @@ Last-Update: 2017-02-10
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/default/web_tt2/head_javascript.tt2
 +++ b/default/web_tt2/head_javascript.tt2
-@@ -55,6 +55,8 @@
+@@ -29,6 +29,7 @@
  
+ [%# Now retrieving the javascript files ~%]
  <script src="[% static_content_url %]/external/jquery.js"></script>
- 
 +<script src="[% static_content_url %]/external/jquery-migrate.js"></script>
-+
  <script src="[% static_content_url %]/external/jquery-ui.js"></script>
- 
  <script src="[% static_content_url %]/external/jquery.jqplot.min.js"></script>
+ <script src="[% static_content_url %]/external/jqplot.categoryAxisRenderer.min.js"></script>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/sympa.git



More information about the Pkg-sympa-commits mailing list