I realized that d/patches/* wasn't enough. I also had to update d/control. Please see corrected patch attached.
From dc7147723a6297410cf56a451ba8a20b177e396b Mon Sep 17 00:00:00 2001 From: Stewart Ferguson <s...@ferg.aero> Date: Tue, 6 Aug 2019 19:01:57 +0200 Subject: [PATCH] Updating rouge dependency to 3.7.0 (Closes: #933784)
--- debian/control | 4 ++-- debian/patches/rouge_3_7.patch | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 debian/patches/rouge_3_7.patch diff --git a/debian/control b/debian/control index 6174cf5..2ade209 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Build-Depends: dbconfig-common, ruby-rmagick (>= 2.14.0~), ruby-roadie (>= 3.2.2~), ruby-roadie-rails (>= 1.3.0~), - ruby-rouge (>= 3.3.0~) + ruby-rouge (>= 3.7.0~) Build-Depends-Indep: po-debconf Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/ruby-team/redmine @@ -71,7 +71,7 @@ Depends: dbconfig-common, ruby-rmagick (>= 2.14.0~), ruby-roadie (>= 3.2.2~), ruby-roadie-rails (>= 1.3.0~), - ruby-rouge (>= 3.3.0~), + ruby-rouge (>= 3.7.0~), libjs-jquery, libjs-jquery-ui, libjs-raphael, diff --git a/debian/patches/rouge_3_7.patch b/debian/patches/rouge_3_7.patch new file mode 100644 index 0000000..a6a6a5a --- /dev/null +++ b/debian/patches/rouge_3_7.patch @@ -0,0 +1,26 @@ +Description: Updating rouge dependency to 3.7.0 + Debian provides ruby-rouge 3.7.0 while redmine 4.0.4 requires ~>3.3.0. + Shortly after releasing 4.0.4 upstream updated rouge dependency to 3.7.0 + with no further changes to the sources. Therefore it is safe to do the same + in Debian's release of 4.0.4. + . + This change is already applied in redmine release 4.1.0. This patch should be + removed when importing that version or higher. +Author: Stewart Ferguson <s...@ferg.aero> +Bug: http://www.redmine.org/issues/31556 +Forwarded: not-needed +Applied-Upstream: 4.1.0 +Last-Update: 2019-08-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Gemfile ++++ b/Gemfile +@@ -3,7 +3,7 @@ source 'https://rubygems.org' + gem "bundler", ">= 1.5.0" + + gem "rails", "~> 5.2.2" +-gem "rouge", "~> 3.3.0" ++gem "rouge", "~> 3.7.0" + gem "request_store", "~> 1.1" + gem "mini_mime", "~> 1.0.1" + gem "actionpack-xml_parser" diff --git a/debian/patches/series b/debian/patches/series index 8178d32..a740184 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0004-Add-multi-tenancy-support.patch 0005-Assume-default-instance.patch use_system_jquery_libs.patch +rouge_3_7.patch -- 2.23.0.rc1
signature.asc
Description: This is a digitally signed message part