[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Update version in changelog and other packaging fix-ups

[Legoktm (Code Review)]

Legoktm has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373432 )

Change subject: Update version in changelog and other packaging fix-ups
..


Update version in changelog and other packaging fix-ups

Change-Id: I918dddae0707afcce975231ab7fb444c896ff851
---
M debian/changelog
M debian/mediawiki.install
A debian/patches/pear-phail-fail-shebang.diff
M debian/patches/series
M vendor/pear/mail_mime/scripts/phail.php
5 files changed, 12 insertions(+), 3 deletions(-)

Approvals:
  Legoktm: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index af46ce3..bfac1a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mediawiki (1:1.29.0-1) unstable; urgency=medium
+mediawiki (1:1.29.1-1) unstable; urgency=medium
 
   * New upstream release
   * Update debian/copyright for new bundled libraries
diff --git a/debian/mediawiki.install b/debian/mediawiki.install
index 151f52f..ace55b1 100644
--- a/debian/mediawiki.install
+++ b/debian/mediawiki.install
@@ -1,4 +1,4 @@
 debian/etc/*   etc/mediawiki
-*.php *.phtml includes index.php languages maintenance mw-config resources 
serialized skins vendor usr/share/mediawiki
+*.php includes index.php languages maintenance mw-config resources serialized 
skins vendor usr/share/mediawiki
 cache extensions images var/lib/mediawiki
 debian/images/*.png usr/share/mediawiki/resources/assets/debian
diff --git a/debian/patches/pear-phail-fail-shebang.diff 
b/debian/patches/pear-phail-fail-shebang.diff
new file mode 100644
index 000..a980291
--- /dev/null
+++ b/debian/patches/pear-phail-fail-shebang.diff
@@ -0,0 +1,8 @@
+--- a/vendor/pear/mail_mime/scripts/phail.php
 b/vendor/pear/mail_mime/scripts/phail.php
+@@ -1,4 +1,4 @@
+-#!@prefix@/bin/php -Cq
++#!/usr/bin/php -Cq
+ https://gerrit.wikimedia.org/r/373432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I918dddae0707afcce975231ab7fb444c896ff851
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[master-stable]: Update version in changelog and other packaging fix-ups

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373432 )

Change subject: Update version in changelog and other packaging fix-ups
..

Update version in changelog and other packaging fix-ups

Change-Id: I918dddae0707afcce975231ab7fb444c896ff851
---
M debian/changelog
M debian/mediawiki.install
A debian/patches/pear-phail-fail-shebang.diff
M debian/patches/series
M vendor/pear/mail_mime/scripts/phail.php
5 files changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/32/373432/1

diff --git a/debian/changelog b/debian/changelog
index af46ce3..bfac1a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mediawiki (1:1.29.0-1) unstable; urgency=medium
+mediawiki (1:1.29.1-1) unstable; urgency=medium
 
   * New upstream release
   * Update debian/copyright for new bundled libraries
diff --git a/debian/mediawiki.install b/debian/mediawiki.install
index 151f52f..ace55b1 100644
--- a/debian/mediawiki.install
+++ b/debian/mediawiki.install
@@ -1,4 +1,4 @@
 debian/etc/*   etc/mediawiki
-*.php *.phtml includes index.php languages maintenance mw-config resources 
serialized skins vendor usr/share/mediawiki
+*.php includes index.php languages maintenance mw-config resources serialized 
skins vendor usr/share/mediawiki
 cache extensions images var/lib/mediawiki
 debian/images/*.png usr/share/mediawiki/resources/assets/debian
diff --git a/debian/patches/pear-phail-fail-shebang.diff 
b/debian/patches/pear-phail-fail-shebang.diff
new file mode 100644
index 000..a980291
--- /dev/null
+++ b/debian/patches/pear-phail-fail-shebang.diff
@@ -0,0 +1,8 @@
+--- a/vendor/pear/mail_mime/scripts/phail.php
 b/vendor/pear/mail_mime/scripts/phail.php
+@@ -1,4 +1,4 @@
+-#!@prefix@/bin/php -Cq
++#!/usr/bin/php -Cq
+ https://gerrit.wikimedia.org/r/373432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I918dddae0707afcce975231ab7fb444c896ff851
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master-stable
Gerrit-Owner: Legoktm 

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