Control: tags -1 + patch
On Sat, 22 Aug 2020 at 08:10:50 +0200, Paul Gevers wrote:
> The latest upload of mozilla-devscripts FTBFS.
>
> https://buildd.debian.org/status/fetch.php?pkg=mozilla-devscripts&arch=all&ver=0.54.1&stamp=1596924970&raw=0
>
...
> tests/dh_xul-ext/test
> make[1]: tests/dh_xul-ext/test: No such file or directory
Try this:
https://salsa.debian.org/webext-team/webext-devscripts/-/merge_requests/2
(or, equivalently, the attached patches).
(Build-tested and .deb comparison with diffoscope looks reasonable, but I
have not actually run the resulting web extension development scripts
since I don't really know how.)
Regards,
smcv
>From 697b356bfd848a4a5849e366a7b3a1064dad4b92 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Sun, 23 Aug 2020 21:34:22 +0100
Subject: [PATCH 1/4] Change shebang on Python 2 scripts to #!/usr/bin/python2
/usr/bin/python is no longer an indirect build dependency, but python2
now is.
Similarly, when invoking setup.py from the Makefile, use python2.
Closes: #968841
---
Makefile | 2 +-
dh_xul-ext | 2 +-
install-xpi | 2 +-
moz-version | 2 +-
setup.py | 2 +-
tests/dh_xul-ext/test | 2 +-
tests/test-moz-version | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 3d78412..85e2726 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ test:
tests/test-moz-version
install:
- python setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
+ python2 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
clean:
rm -rf build *.pyc
diff --git a/dh_xul-ext b/dh_xul-ext
index 1d3e231..02c16ea 100755
--- a/dh_xul-ext
+++ b/dh_xul-ext
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# Copyright (c) 2009-2012, Benjamin Drung <bdr...@debian.org>
#
diff --git a/install-xpi b/install-xpi
index 18fd064..7fcffdc 100755
--- a/install-xpi
+++ b/install-xpi
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# Copyright (c) 2009-2013, Benjamin Drung <bdr...@debian.org>
#
diff --git a/moz-version b/moz-version
index e1b5e78..cb7062f 100755
--- a/moz-version
+++ b/moz-version
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# Copyright (c) 2009-2011, Benjamin Drung <bdr...@debian.org>
#
diff --git a/setup.py b/setup.py
index fd23c09..1d4aa77 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import glob
import os
diff --git a/tests/dh_xul-ext/test b/tests/dh_xul-ext/test
index 485cd26..8dc3e88 100755
--- a/tests/dh_xul-ext/test
+++ b/tests/dh_xul-ext/test
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# Copyright (c) 2011, Benjamin Drung <bdr...@debian.org>
#
diff --git a/tests/test-moz-version b/tests/test-moz-version
index c9df2ec..b6e7e10 100755
--- a/tests/test-moz-version
+++ b/tests/test-moz-version
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# Copyright (c) 2010 Benjamin Drung <bdr...@debian.org>
#
--
2.28.0
>From a209a12d6513f2f65b51131721dfe993ccb8162f Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Sun, 23 Aug 2020 21:38:14 +0100
Subject: [PATCH 2/4] Use non-deprecated syntax for python-librdf dependency
The comparator ">" is deprecated because it looks as though it ought
to mean "strictly greater", but actually means "greater than or equal".
The version of python-librdf that stops hard-coding python (as opposed
to python2) is 1.0.17.1+dfsg-1.4, so we do want greater than or equal,
">=", rather than strictly greater, ">>".
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 666c727..047ad61 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Benjamin Drung <bdr...@debian.org>
Build-Depends: debhelper-compat (= 12),
dh-python,
python-all (>= 2.6.6-3~),
- python-librdf (> 1.0.17.1+dfsg-1.4),
+ python-librdf (>= 1.0.17.1+dfsg-1.4),
python3
Standards-Version: 4.4.1
VCS-Browser: https://salsa.debian.org/webext-team/webext-devscripts
--
2.28.0
>From 11eed83115133174eb9808151ba4a7533899193b Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Sun, 23 Aug 2020 21:41:46 +0100
Subject: [PATCH 3/4] Update changelog
---
debian/changelog | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5606944..46b60eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mozilla-devscripts (0.54.2) UNRELEASED; urgency=medium
+
+ * Change shebang on Python 2 scripts to #!/usr/bin/python2
+ (Closes: #968841)
+ * Use non-deprecated syntax for python-librdf dependency
+
+ -- Simon McVittie <s...@debian.org> Sun, 23 Aug 2020 21:41:26 +0100
+
mozilla-devscripts (0.54.1) unstable; urgency=medium
* Non-maintainer upload.
--
2.28.0
>From c54edb63ee1f90ae3bba99fa119d2daff5bbf4b8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Sun, 23 Aug 2020 21:42:17 +0100
Subject: [PATCH 4/4] Document the python-librdf change in the previous version
---
debian/changelog | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 46b60eb..7955160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,13 +3,15 @@ mozilla-devscripts (0.54.2) UNRELEASED; urgency=medium
* Change shebang on Python 2 scripts to #!/usr/bin/python2
(Closes: #968841)
* Use non-deprecated syntax for python-librdf dependency
+ * Document the python-librdf change in the previous version
-- Simon McVittie <s...@debian.org> Sun, 23 Aug 2020 21:41:26 +0100
mozilla-devscripts (0.54.1) unstable; urgency=medium
* Non-maintainer upload.
- * No-change upload to generate dependency on python2. Closes: #967175.
+ * Re-upload to generate dependency on python2. Closes: #967175.
+ * Build-depend on a version of python-librdf with #966787 fixed.
-- Matthias Klose <d...@debian.org> Sat, 08 Aug 2020 21:43:05 +0200
--
2.28.0
