[MediaWiki-commits] [Gerrit] mediawiki...html5depurate[debian-trusty]: Merge branch 'debian' into debian-trusty

2016-12-13 Thread Tim Starling (Code Review) 
Tim Starling has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/325429 )

Change subject: Merge branch 'debian' into debian-trusty
..


Merge branch 'debian' into debian-trusty

Change-Id: I50e41157b4819e7ce553b28485ba2052723bf508
---
M debian/changelog
1 file changed, 6 insertions(+), 8 deletions(-)

Approvals:
  Tim Starling: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index fee450c..baa2939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,15 @@
-<<< HEAD   (522479 Changelog for package 1.1.4~trusty)
-html5depurate (1.1.4~trusty) unstable; urgency=medium
-
-  * Backport to trusty
-
- -- Tim Starling   Fri, 02 Dec 2016 10:27:50 +1100
-===
 html5depurate (1.1.5) unstable; urgency=medium
 
   * Fix bug with incorrect reset of output streams during tag stack split
 (patch by Subramanya Sastry)
 
  -- Tim Starling   Tue, 06 Dec 2016 09:15:27 +1100
->>> BRANCH (a4577d Changelog for package version 1.1.5)
+
+html5depurate (1.1.4~trusty) unstable; urgency=medium
+
+  * Backport to trusty
+
+ -- Tim Starling   Fri, 02 Dec 2016 10:27:50 +1100
 
 html5depurate (1.1.4) unstable; urgency=medium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I50e41157b4819e7ce553b28485ba2052723bf508
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/html5depurate
Gerrit-Branch: debian-trusty
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Tim Starling 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...html5depurate[debian-trusty]: Merge branch 'debian' into debian-trusty

2016-12-05 Thread Tim Starling (Code Review) 
Tim Starling has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325429

Change subject: Merge branch 'debian' into debian-trusty
..

Merge branch 'debian' into debian-trusty

Change-Id: I50e41157b4819e7ce553b28485ba2052723bf508
---
M debian/changelog
1 file changed, 6 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/html5depurate 
refs/changes/29/325429/1

diff --git a/debian/changelog b/debian/changelog
index fee450c..baa2939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,15 @@
-<<< HEAD   (522479 Changelog for package 1.1.4~trusty)
-html5depurate (1.1.4~trusty) unstable; urgency=medium
-
-  * Backport to trusty
-
- -- Tim Starling   Fri, 02 Dec 2016 10:27:50 +1100
-===
 html5depurate (1.1.5) unstable; urgency=medium
 
   * Fix bug with incorrect reset of output streams during tag stack split
 (patch by Subramanya Sastry)
 
  -- Tim Starling   Tue, 06 Dec 2016 09:15:27 +1100
->>> BRANCH (a4577d Changelog for package version 1.1.5)
+
+html5depurate (1.1.4~trusty) unstable; urgency=medium
+
+  * Backport to trusty
+
+ -- Tim Starling   Fri, 02 Dec 2016 10:27:50 +1100
 
 html5depurate (1.1.4) unstable; urgency=medium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50e41157b4819e7ce553b28485ba2052723bf508
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/html5depurate
Gerrit-Branch: debian-trusty
Gerrit-Owner: Tim Starling 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...html5depurate[debian-trusty]: Merge branch 'debian' into debian-trusty

2016-12-01 Thread Tim Starling (Code Review) 
Tim Starling has submitted this change and it was merged.

Change subject: Merge branch 'debian' into debian-trusty
..


Merge branch 'debian' into debian-trusty

Change-Id: I9a2c3a4bdb3bf03eb821c53a4d1ec8c49a6efa11
---
M debian/changelog
1 file changed, 6 insertions(+), 8 deletions(-)

Approvals:
  Tim Starling: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index c0e2b7f..f868901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,15 @@
-<<< HEAD   (c3cdaa Merge branch 'debian' into debian-trusty)
-html5depurate (1.1.3~trusty) trusty; urgency=medium
-
-  * Backport to trusty
-
- -- Tim Starling   Fri, 11 Nov 2016 14:32:14 +1100
-===
 html5depurate (1.1.4) unstable; urgency=medium
 
   * Eliminate edge cases from p-wrapping and block tag interaction (patch by
 Subramanya Sastry).
 
  -- Tim Starling   Fri, 02 Dec 2016 10:23:21 +1100
->>> BRANCH (5364fe Changelog for package version 1.1.4)
+
+html5depurate (1.1.3~trusty) trusty; urgency=medium
+
+  * Backport to trusty
+
+ -- Tim Starling   Fri, 11 Nov 2016 14:32:14 +1100
 
 html5depurate (1.1.3) unstable; urgency=medium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/324830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a2c3a4bdb3bf03eb821c53a4d1ec8c49a6efa11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/html5depurate
Gerrit-Branch: debian-trusty
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Tim Starling 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...html5depurate[debian-trusty]: Merge branch 'debian' into debian-trusty

2016-12-01 Thread Tim Starling (Code Review) 
Tim Starling has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/324830

Change subject: Merge branch 'debian' into debian-trusty
..

Merge branch 'debian' into debian-trusty

Change-Id: I9a2c3a4bdb3bf03eb821c53a4d1ec8c49a6efa11
---
M debian/changelog
1 file changed, 6 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/html5depurate 
refs/changes/30/324830/1

diff --git a/debian/changelog b/debian/changelog
index c0e2b7f..f868901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,15 @@
-<<< HEAD   (c3cdaa Merge branch 'debian' into debian-trusty)
-html5depurate (1.1.3~trusty) trusty; urgency=medium
-
-  * Backport to trusty
-
- -- Tim Starling   Fri, 11 Nov 2016 14:32:14 +1100
-===
 html5depurate (1.1.4) unstable; urgency=medium
 
   * Eliminate edge cases from p-wrapping and block tag interaction (patch by
 Subramanya Sastry).
 
  -- Tim Starling   Fri, 02 Dec 2016 10:23:21 +1100
->>> BRANCH (5364fe Changelog for package version 1.1.4)
+
+html5depurate (1.1.3~trusty) trusty; urgency=medium
+
+  * Backport to trusty
+
+ -- Tim Starling   Fri, 11 Nov 2016 14:32:14 +1100
 
 html5depurate (1.1.3) unstable; urgency=medium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/324830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a2c3a4bdb3bf03eb821c53a4d1ec8c49a6efa11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/html5depurate
Gerrit-Branch: debian-trusty
Gerrit-Owner: Tim Starling 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits