BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386405 )
Change subject: Merge branch 'wmf-1.13' into wmf-1.13-jessie
......................................................................
Merge branch 'wmf-1.13' into wmf-1.13-jessie
... And release 1.13.6-2+wmf1~jessie1
Change-Id: Ia0a80b232154f97175638f94b224118fd3a06ae8
---
M debian/changelog
M debian/control
2 files changed, 3 insertions(+), 6 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 605711e..39c678f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,13 @@
-<<<<<<< HEAD (d2a06d Release 1.13.5-1+wmf1~jessie1)
-nginx (1.13.5-1+wmf1~jessie1) jessie-wikimedia; urgency=high
+nginx (1.13.6-2+wmf1~jessie1) jessie-wikimedia; urgency=high
* Jessie-specific deviations from our stretch build:
* Work with debhelper 9
* Change ssl dep from libssl-dev to libssl11-dev
* Manual -dbg packages
- -- Brandon Black <[email protected]> Wed, 27 Sep 2017 16:50:15 +0000
+ -- Brandon Black <[email protected]> Wed, 25 Oct 2017 15:11:12 +0000
-nginx (1.13.5-1+wmf1) stretch-wikimedia; urgency=high
-=======
nginx (1.13.6-2+wmf1) stretch-wikimedia; urgency=high
->>>>>>> BRANCH (702c66 Release 1.13.6-2+wmf1 for stretch)
* Based on debian/1.13.6-2
* Forward-port existing WMF patches:
diff --git a/debian/control b/debian/control
index 4b9bb48..670777b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@
Build-Depends: autotools-dev,
debhelper (>= 9),
po-debconf,
+ dh-systemd (>= 1.5),
dpkg-dev (>= 1.15.5),
libexpat-dev,
libgd-dev,
--
To view, visit https://gerrit.wikimedia.org/r/386405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0a80b232154f97175638f94b224118fd3a06ae8
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.13-jessie
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
