Bug#813749: mozjs24: diff for NMU version 24.2.0-3.1

[Mattia Rizzolo]

Control: tags 813749 + pending

Dear maintainer,

I've prepared an NMU for mozjs24 (versioned as 24.2.0-3.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

diffstat for mozjs24-24.2.0 mozjs24-24.2.0

 changelog                   |    9 +++++++++
 control                     |    1 -
 patches/fix-perl-5.22.patch |   15 +++++++++++++++
 patches/series              |    1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

diff -Nru mozjs24-24.2.0/debian/changelog mozjs24-24.2.0/debian/changelog
--- mozjs24-24.2.0/debian/changelog	2015-05-02 14:13:04.000000000 +0000
+++ mozjs24-24.2.0/debian/changelog	2016-07-06 22:33:33.000000000 +0000
@@ -1,3 +1,12 @@
+mozjs24 (24.2.0-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove not needed Build-Conflicts, that are now cousing uninstallability
+    of the Build-Depends.  Closes: #813749
+  * Add patch (taken from Ubuntu) to fix build with perl 5.22.
+
+ -- Mattia Rizzolo <mat...@debian.org>  Wed, 06 Jul 2016 22:33:32 +0000
+
 mozjs24 (24.2.0-3) unstable; urgency=low
 
   * Update Standards-Version to 3.9.6 .
diff -Nru mozjs24-24.2.0/debian/control mozjs24-24.2.0/debian/control
--- mozjs24-24.2.0/debian/control	2015-05-02 13:40:23.000000000 +0000
+++ mozjs24-24.2.0/debian/control	2016-07-06 22:08:25.000000000 +0000
@@ -10,7 +10,6 @@
                pkg-kde-tools,
                python,
                zip
-Build-Conflicts: python3-minimal, python3.3-minimal, python3.4-minimal
 Standards-Version: 3.9.6
 Homepage: http://www.mozilla.org/js/spidermonkey/
 
diff -Nru mozjs24-24.2.0/debian/patches/fix-perl-5.22.patch mozjs24-24.2.0/debian/patches/fix-perl-5.22.patch
--- mozjs24-24.2.0/debian/patches/fix-perl-5.22.patch	1970-01-01 00:00:00.000000000 +0000
+++ mozjs24-24.2.0/debian/patches/fix-perl-5.22.patch	2016-07-06 22:25:47.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Fix build with perl 5.22
+Author: Rico Tzschichholz <ric...@ubuntu.com>
+Origin: vendor, Ubuntu, https://launchpad.net/ubuntu/+source/mozjs24/24.2.0-3ubuntu2
+
+--- a/js/src/config/milestone.pl
++++ b/js/src/config/milestone.pl
+@@ -56,7 +56,7 @@
+ #
+ my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
+ 
+-if (defined(@TEMPLATE_FILE)) {
++if (@TEMPLATE_FILE) {
+   my $TFILE;
+ 
+   foreach $TFILE (@TEMPLATE_FILE) {
diff -Nru mozjs24-24.2.0/debian/patches/series mozjs24-24.2.0/debian/patches/series
--- mozjs24-24.2.0/debian/patches/series	2015-05-02 14:17:34.000000000 +0000
+++ mozjs24-24.2.0/debian/patches/series	2016-07-06 22:23:27.000000000 +0000
@@ -2,3 +2,4 @@
 aarch64-support.patch
 hurd-support.patch
 hppa-support.patch
+fix-perl-5.22.patch

signature.asc
Description: PGP signature