From a401281db88c0df73a42228e6b156ca9f7af5733 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Tue, 20 Mar 2018 18:52:21 +0530
Subject: [PATCH] Tighten gollum-lib dependencies, remove math_lexer.rb
 initializer

---
 debian/control     | 2 +-
 debian/maintscript | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 81331cc71f..20e239b9e0 100644
--- a/debian/control
+++ b/debian/control
@@ -85,7 +85,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-omniauth-ldap (>= 2.0.4~),
  ruby-net-ldap,
 # Git Wiki
- ruby-gollum-lib (>= 4.2.1+debian~),
+ ruby-gollum-lib (>= 4.2.7~),
  ruby-gollum-rugged-adapter (>= 0.4.4~),
 # Language detection
  ruby-github-linguist (>= 4.7.0~),
diff --git a/debian/maintscript b/debian/maintscript
index fad7020134..628eafbeb7 100644
--- a/debian/maintscript
+++ b/debian/maintscript
@@ -1,4 +1,5 @@
 rm_conffile /etc/gitlab/initializers/devise_async.rb 8.8.2+dfsg-5    gitlab
 rm_conffile /etc/gitlab/gitlab.teatro.yml            8.11.3+dfsg1-1  gitlab
 rm_conffile /etc/gitlab/initializers/haml.rb         8.11.3+dfsg1-1  gitlab
+rm_conffile /etc/gitlab/initializers/math_lexer.rb   9.5.4+dfsg-7    gitlab
 dir_to_symlink /usr/share/gitlab/app/assets/javascripts/locale	/var/lib/gitlab/locale         9.5.4+dfsg-5  gitlab