update changelog

gitlab Debian release 11.3.11+dfsg-1

debian/changelog

@@ -1,3 +1,13 @@
+gitlab (11.3.11+dfsg-1~bpo9+1) stretch-backports; urgency=medium
+
+  [ Pirate Praveen ]
+  * Rebuild for stretch-backports.
+
+  [ Abhijith PA ]
+  * Refresh ruby-github-markup.patch
+
+ -- Pirate Praveen <praveen@debian.org>  Fri, 14 Dec 2018 19:14:56 +0530
+
 gitlab (11.3.11+dfsg-1) unstable; urgency=high
 
   * New upstream security release 11.3.11+dfsg (Fixes: CVE-2018-19493,
@@ -22,6 +32,18 @@ gitlab (11.3.10+dfsg-1) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Wed, 21 Nov 2018 11:49:29 +0530
 
+gitlab (11.2.8+dfsg-2~bpo9+2) stretch-backports; urgency=medium
+
+  * Relax ruby-github-markup and ruby-gitaly-proto dependencies
+
+ -- Pirate Praveen <praveen@debian.org>  Sat, 02 Feb 2019 14:06:52 +0530
+
+gitlab (11.2.8+dfsg-2~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Pirate Praveen <praveen@debian.org>  Wed, 12 Dec 2018 19:22:32 +0530
+
 gitlab (11.2.8+dfsg-2) unstable; urgency=medium
 
   * Add gitlab-rake as a command (Closes: #814506)
@@ -36,6 +58,15 @@ gitlab (11.2.8+dfsg-1) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Sun, 18 Nov 2018 18:42:27 +0530
 
+gitlab (11.1.8+dfsg-2~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+  * Relax rdoc dependency to >= 4.2
+  * Tighten dependency on ruby-octokit
+  * Set minimum version of ruby-sass to 3.5
+
+ -- Pirate Praveen <praveen@debian.org>  Sun, 09 Dec 2018 20:42:47 +0530
+
 gitlab (11.1.8+dfsg-2) unstable; urgency=medium
 
   * Reupload to unstable
@@ -54,6 +85,12 @@ gitlab (11.1.8+dfsg-1) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Fri, 16 Nov 2018 16:45:36 +0530
 
+gitlab (10.8.7+dfsg-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Pirate Praveen <praveen@debian.org>  Tue, 30 Oct 2018 23:15:56 +0530
+
 gitlab (10.8.7+dfsg-1) unstable; urgency=medium
 
   * New upstream version 10.8.7+dfsg
@@ -88,6 +125,7 @@ gitlab (10.7.7+dfsg-2) unstable; urgency=medium
   * Bump Standards-Version to 4.2.1 (no changes needed)
 
  -- Pirate Praveen <praveen@debian.org>  Sat, 13 Oct 2018 00:11:14 +0530
+>>>>>>> master
 
 gitlab (10.7.7+dfsg-1) experimental; urgency=medium
 

debian/control

@@ -143,7 +143,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-rouge (>= 3.1~),
  ruby-truncato (>= 0.7.9~),
  ruby-bootstrap-form (>= 2.7~),
- ruby-nokogiri (>= 1.8.2~),
+ ruby-nokogiri (>= 1.8.4~),
 # Calendar rendering
  ruby-icalendar,
 # Diffs
@@ -229,6 +229,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-rack-proxy (>= 0.6~),
 #
  ruby-sass-rails (>= 5.0.6~),
+ ruby-sass (>= 3.5~),
  ruby-uglifier (>= 2.7.2~),
 #
  ruby-addressable (>= 2.5.2~),
@@ -265,7 +266,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-prometheus-client-mmap (>= 0.9.3~),
  ruby-raindrops (>= 0.18~),
 #
- ruby-octokit (>= 4.8~),
+ ruby-octokit (>= 4.9~),
 #
  ruby-mail-room (>= 0.9.1~),
 #

debian/patches/0420-relax-rdoc.patch

@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -139,7 +139,7 @@
+ gem 'redcarpet', '~> 3.4'
+ gem 'commonmarker', '~> 0.17'
+ gem 'RedCloth', '~> 4.3', '>= 4.3.2'
+-gem 'rdoc', '~> 6.0'
++gem 'rdoc', '>= 4.2'
+ gem 'org-ruby', '~> 0.9.12'
+ gem 'creole', '~> 0.5.0'
+ gem 'wikicloth', '0.8.1'

debian/patches/0430-relax-rdoc.patch

@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -141,7 +141,7 @@
+ gem 'redcarpet', '~> 3.4'
+ gem 'commonmarker', '~> 0.17'
+ gem 'RedCloth', '~> 4.3', '>= 4.3.2'
+-gem 'rdoc', '~> 6.0'
++gem 'rdoc', '>= 4.2'
+ gem 'org-ruby', '~> 0.9.12'
+ gem 'creole', '~> 0.5.0'
+ gem 'wikicloth', '0.8.1'

debian/patches/0440-use-github-markup.patch

@@ -0,0 +1,13 @@
+Index: gitlab/Gemfile
+===================================================================
+--- gitlab.orig/Gemfile
++++ gitlab/Gemfile
+@@ -137,7 +137,7 @@ gem 'seed-fu', '~> 2.3', '>= 2.3.7'
+ # Markdown and HTML processing
+ gem 'html-pipeline', '~> 2.8'
+ gem 'deckar01-task_list', '2.0'
+-gem 'gitlab-markup', '~> 1.6', '>= 1.6.4'
++gem 'github-markup', '~> 1.6', '>= 1.6.4'
+ gem 'redcarpet', '~> 3.4'
+ gem 'commonmarker', '~> 0.17'
+ gem 'RedCloth', '~> 4.3', '>= 4.3.2'

debian/patches/0670-allow-doorkeepr-4_3.patch

@@ -2,7 +2,7 @@ Bug, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22966
 
 --- a/config/initializers/doorkeeper.rb
 +++ b/config/initializers/doorkeeper.rb
-@@ -107,15 +107,6 @@
+@@ -114,15 +114,6 @@
    base_controller '::Gitlab::BaseDoorkeeperController'
  end
  

debian/patches/series

@@ -9,6 +9,8 @@
 0400-Relax-recaptcha-version.patch
 0410-relax-dropzonejs-rails.patch
 0420-relax-js-regex.patch
+0430-relax-rdoc.patch
+0440-use-github-markup.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
 0520-add-system-lib-path-for-webpack.patch