[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#943080: fonts-monoid: diff for NMU version 0.61-2.1



Dear maintainer,

Gunnar Hjalmarsson  prepared an NMU for fonts-monoid (versioned as
0.61-2.1) and I 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 fonts-monoid-0.61 fonts-monoid-0.61

 changelog                          |    9 +++++++
 control                            |    2 -
 patches/0001-fix-for-python3.patch |   47 +++++++++++++++++++++++++++++++++++++
 patches/series                     |    1 
 rules                              |    2 -
 5 files changed, 59 insertions(+), 2 deletions(-)

diff -Nru fonts-monoid-0.61/debian/changelog fonts-monoid-0.61/debian/changelog
--- fonts-monoid-0.61/debian/changelog	2018-03-05 16:51:35.000000000 +0100
+++ fonts-monoid-0.61/debian/changelog	2020-04-06 17:45:00.000000000 +0200
@@ -1,3 +1,12 @@
+fonts-monoid (0.61-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Move to python3-fontforge:
+    - Upload the commit done on the official salsa repo to move to Python3.
+      Closes: #943080; LP: #1871140
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Mon, 06 Apr 2020 17:45:00 +0200
+
 fonts-monoid (0.61-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru fonts-monoid-0.61/debian/control fonts-monoid-0.61/debian/control
--- fonts-monoid-0.61/debian/control	2018-03-04 17:32:49.000000000 +0100
+++ fonts-monoid-0.61/debian/control	2020-04-06 17:45:00.000000000 +0200
@@ -2,7 +2,7 @@
 Section: fonts
 Priority: optional
 Build-Depends: debhelper (>= 11~),
- python-fontforge
+ python3-fontforge
 Maintainer: Debian Fonts Task Force <debian-fonts@lists.debian.org>
 Uploaders: Vasudev Kamath <vasudev@copyninja.info>
 Standards-Version: 4.1.3
diff -Nru fonts-monoid-0.61/debian/patches/0001-fix-for-python3.patch fonts-monoid-0.61/debian/patches/0001-fix-for-python3.patch
--- fonts-monoid-0.61/debian/patches/0001-fix-for-python3.patch	1970-01-01 01:00:00.000000000 +0100
+++ fonts-monoid-0.61/debian/patches/0001-fix-for-python3.patch	2020-04-06 17:45:00.000000000 +0200
@@ -0,0 +1,47 @@
+From: Hideki Yamane <henrich@debian.org>
+Date: Sat, 16 Nov 2019 22:15:39 +0900
+Subject: fix for python3
+
+---
+ Scripts/build.py       | 2 +-
+ Scripts/fontbuilder.py | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Scripts/build.py b/Scripts/build.py
+index 38bef64..8556b87 100755
+--- a/Scripts/build.py
++++ b/Scripts/build.py
+@@ -9,7 +9,7 @@ if len(sys.argv) < 4:
+     Second: The parallel batch number (0+)
+     Third: The .sfdir for the font
+     """
+-    print >> sys.stderr, usage
++    print(usage, file=sys.stderr)
+     exit(1)
+ 
+ from fontbuilder import *
+diff --git a/Scripts/fontbuilder.py b/Scripts/fontbuilder.py
+index 3efe7df..2d8037e 100644
+--- a/Scripts/fontbuilder.py
++++ b/Scripts/fontbuilder.py
+@@ -58,9 +58,9 @@ def permutations():
+     bitmap_max = 1 << count
+ 
+     # Iterate over all possible permutations
+-    for i in xrange(bitmap_max):
++    for i in range(bitmap_max):
+         # Map the iteration's permutations using a bitmap
+-        bitmap = [i >> n & 1 for n in xrange(count)]
++        bitmap = [i >> n & 1 for n in range(count)]
+         for opts in _expand_options(bitmap):
+             yield(int(float(i)/bitmap_max*100), opts)
+ 
+@@ -93,7 +93,7 @@ def _build(dstdir, font, permutations):
+         fnt.close()
+ 
+         # Log progress to prevent timeoout
+-        print(str(prcnt) + '%.. ' + name)
++        print((str(prcnt) + '%.. ' + name))
+ 
+ def build(dstdir, font):
+     _build(dstdir, font, permutations())
diff -Nru fonts-monoid-0.61/debian/patches/series fonts-monoid-0.61/debian/patches/series
--- fonts-monoid-0.61/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ fonts-monoid-0.61/debian/patches/series	2020-04-06 17:45:00.000000000 +0200
@@ -0,0 +1 @@
+0001-fix-for-python3.patch
diff -Nru fonts-monoid-0.61/debian/rules fonts-monoid-0.61/debian/rules
--- fonts-monoid-0.61/debian/rules	2018-03-04 17:03:04.000000000 +0100
+++ fonts-monoid-0.61/debian/rules	2020-04-06 17:45:00.000000000 +0200
@@ -6,7 +6,7 @@
 override_dh_auto_build-indep:
 	for font in $(wildcard Source/*.sfdir) $(wildcard Monoisome/*.sfdir) ; \
 	do \
-		python Scripts/build.py 1 0 $${font} ; \
+		python3 Scripts/build.py 1 0 $${font} ; \
 	done
 
 override_dh_clean:

Attachment: signature.asc
Description: PGP signature


Reply to: