Hi, Juhani Numminen kirjoitti 25.12.2019 klo 15.45:
> I propose that we stop shipping the python2 file which in fact is > part of build system for a PDF, and ship the actual PDF book in > the package instead. How do you find this approach? > > An NMU patch is attached and I've tested it using sbuild. > > Regards, > Juhani > I'll now move on to sending a request for sponsorship. A revised debdiff is attached. Links to the pull requests I have opened against Fernando's repos: https://github.com/fike/fortunes-mario/pull/2 https://github.com/fike/fortunes-mario-deb/pull/4 Juhani
diff -Nru fortunes-mario-0.21/debian/changelog fortunes-mario-0.21/debian/changelog --- fortunes-mario-0.21/debian/changelog 2015-08-22 06:19:48.000000000 +0300 +++ fortunes-mario-0.21/debian/changelog 2019-12-30 14:20:57.000000000 +0200 @@ -1,3 +1,11 @@ +fortunes-mario (0.21-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Converted livro.py to python3 (Closes: #945672). + * Ship the actual book PDF instead of its build files. + + -- Juhani Numminen <juhaninummin...@gmail.com> Mon, 30 Dec 2019 14:20:57 +0200 + fortunes-mario (0.21-1) unstable; urgency=medium * New upstream release. diff -Nru fortunes-mario-0.21/debian/control fortunes-mario-0.21/debian/control --- fortunes-mario-0.21/debian/control 2015-08-18 03:31:52.000000000 +0300 +++ fortunes-mario-0.21/debian/control 2019-12-30 14:03:25.000000000 +0200 @@ -3,7 +3,13 @@ Priority: optional Maintainer: Otavio Salvador <ota...@debian.org> Uploaders: Fernando Ike de Oliveira <f...@midstorm.org> -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper (>= 9), + ghostscript, + poppler-utils, + psutils, + python3, + texlive-lang-portuguese, + texlive-latex-extra Build-Depends-Indep: fortune-mod (>= 1.99.1-6) Standards-Version: 3.9.6 Homepage: http://github.com/fike/fortunes-mario @@ -13,7 +19,6 @@ Package: fortunes-mario Architecture: all Depends: fortune-mod (>= 1.99.1-6), - python, ${misc:Depends} Provides: fortune-cookie-db Description: Fortunes files from Mario diff -Nru fortunes-mario-0.21/debian/docs fortunes-mario-0.21/debian/docs --- fortunes-mario-0.21/debian/docs 2015-08-22 06:10:43.000000000 +0300 +++ fortunes-mario-0.21/debian/docs 2019-12-25 14:54:27.000000000 +0200 @@ -2,3 +2,4 @@ LEIAME BUGS CREDITOS +livro/mario_fortunes-livro.pdf diff -Nru fortunes-mario-0.21/debian/install fortunes-mario-0.21/debian/install --- fortunes-mario-0.21/debian/install 2015-08-18 03:31:52.000000000 +0300 +++ fortunes-mario-0.21/debian/install 2019-12-25 13:02:32.000000000 +0200 @@ -1,2 +1 @@ mario.* usr/share/games/fortunes/ -livro usr/share/games/fortunes/ diff -Nru fortunes-mario-0.21/debian/patches/livro-python3.patch fortunes-mario-0.21/debian/patches/livro-python3.patch --- fortunes-mario-0.21/debian/patches/livro-python3.patch 1970-01-01 02:00:00.000000000 +0200 +++ fortunes-mario-0.21/debian/patches/livro-python3.patch 2019-12-30 14:20:57.000000000 +0200 @@ -0,0 +1,43 @@ +Description: livro.py: Switch to python3 and utf8 + livro/Makefile requires bash: In Debian, /bin/sh is dash which cannot + expand brace expansion {tex,dvi,...} used in the clean target. + It is a bashism: https://mywiki.wooledge.org/Bashism#Expansions +Author: Juhani Numminen <juhaninummin...@gmail.com> +Forwarded: https://github.com/fike/fortunes-mario/pull/2 +Bug-Debian: https://bugs.debian.org/945672 + +--- a/livro/livro.py ++++ b/livro/livro.py +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 ++# -*- coding: utf-8 -*- + + import sys + +@@ -12,7 +13,7 @@ + \usepackage[brazil]{babel} + \usepackage{indentfirst} + % #\usepackage[T1]{fontenc} +-\usepackage[latin1]{inputenc} ++\usepackage[utf8x]{inputenc} + \usepackage{fancyhdr} + \usepackage{fancyvrb} + \usepackage{url} +@@ -68,7 +69,7 @@ + tex_file.write(r'\chapter{' + section_name + '}\n') + tex_file.write(bminipage + '\n') + +- print section_name ++ print(section_name) + if section_name == 'mario.arteascii': + tex_file.write(bverbatimascii + '\n') + elif section_name == 'mario.computadores': +--- a/livro/Makefile ++++ b/livro/Makefile +@@ -1,3 +1,5 @@ ++SHELL=/bin/bash ++ + all: booklet_from_pdf + + SRCDIR=../ diff -Nru fortunes-mario-0.21/debian/patches/series fortunes-mario-0.21/debian/patches/series --- fortunes-mario-0.21/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ fortunes-mario-0.21/debian/patches/series 2019-12-30 14:05:27.000000000 +0200 @@ -0,0 +1 @@ +livro-python3.patch diff -Nru fortunes-mario-0.21/debian/rules fortunes-mario-0.21/debian/rules --- fortunes-mario-0.21/debian/rules 2015-08-18 03:31:52.000000000 +0300 +++ fortunes-mario-0.21/debian/rules 2019-12-30 14:02:48.000000000 +0200 @@ -5,6 +5,8 @@ override_dh_auto_clean: rm -f *.dat + cd livro && $(MAKE) clean override_dh_auto_build: find -name "mario.*" -exec strfile {} \; + cd livro && $(MAKE)
