Dear maintainers of plastex,

On Monday, 8 January 2018 23:40:14 AEDT Stuart Prescott wrote:
> Control: tags -1 patch
> 
> The attached patch does the minimum that is required to update the package.
> 
> There's a lot more that could be done with this package (including a new
> upstream release from a few years ago) but this is a start...

The attached is a patch series that I intend to include in an NMU shortly 
unless someone else beats me to it. 

The patches sit on top of the current DMPT git and I would include the changes 
that are sitting there but never uploaded. The source in git does not 
currently build at all (the patches get applied twice which fails) and so this 
is also fixed.

The main objective is, of course, to fix bug #866454.

regards
Stuart


-- 
Stuart Prescott    http://www.nanonanonano.net/   stu...@nanonanonano.net
Debian Developer   http://www.debian.org/         stu...@debian.org
GPG fingerprint    90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7
From 84611432fe2081b5ea59ae9d68413fbba20f8f81 Mon Sep 17 00:00:00 2001
From: Stuart Prescott <stu...@debian.org>
Date: Fri, 19 Jan 2018 01:03:18 +1100
Subject: [PATCH 1/4] Re-add lost changelog from NMU 0.9.2-1.1

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8db1d89..3f03e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,13 @@ plastex (0.9.2-2) UNRELEASED; urgency=low
 
  -- Jakub Wilk <jw...@debian.org>  Sun, 05 May 2013 16:01:31 +0200
 
+plastex (0.9.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build using dh-python. Closes: #786244.
+
+ -- Matthias Klose <d...@debian.org>  Sat, 22 Aug 2015 15:00:53 +0200
+
 plastex (0.9.2-1) unstable; urgency=low
 
   [ Carl Fürstenberg ]
-- 
2.11.0

>From 8c29d2d44c1f33853d523c0c926deff14e25a33b Mon Sep 17 00:00:00 2001
From: Stuart Prescott <stu...@debian.org>
Date: Fri, 19 Jan 2018 00:17:19 +1100
Subject: [PATCH 2/4] Switch from python-imaging to python-pil

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 77323ef..c8d21d6 100644
--- a/debian/control
+++ b/debian/control
@@ -16,13 +16,13 @@ Build-Depends-Indep: xsltproc (>= 1.1.21),
  libxml-libxml-perl, 
  texlive-base-bin, 
  dvipng, 
- python-imaging
+ python-pil
 Standards-Version: 3.8.3
 Homepage: http://plastex.sourceforge.net/
 
 Package: python-plastex
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, texlive-latex-base, dvipng, python-imaging
+Depends: ${python:Depends}, ${misc:Depends}, texlive-latex-base, dvipng, python-pil
 Recommends: python-kid, python-genshi, python-cheetah
 Description: LaTeX document processing framework in Python
  plasTeX is a collection of Python frameworks that allow you to process LaTeX 
-- 
2.11.0

>From 1904950f89895650f1f96c81dda498d4ae2aeef3 Mon Sep 17 00:00:00 2001
From: Stuart Prescott <stu...@debian.org>
Date: Fri, 19 Jan 2018 00:42:53 +1100
Subject: [PATCH 3/4] Switch to 3.0 (quilt) source format

Patches were being double-applied and so FTBFS
---
 debian/rules         | 1 -
 debian/source/format | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index a159263..cc91a1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include $(CURDIR)/debian/mk/docbook-xml-manpage.mk
 
 DOCBOOKXML_MANPAGE_SOURCES = debian/xml-man/plastex.xml
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
-- 
2.11.0

From a037eb632de18c5ee9ac69f2368044df6dde187d Mon Sep 17 00:00:00 2001
From: Stuart Prescott <stu...@debian.org>
Date: Fri, 19 Jan 2018 00:17:46 +1100
Subject: [PATCH 4/4] Finalise changelog for upload

---
 debian/changelog | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f03e1a..0cb60d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-plastex (0.9.2-2) UNRELEASED; urgency=low
+plastex (0.9.2-1.2) unstable; urgency=low
+
+  [ Stuart Prescott ]
+  * Non-maintainer upload.
+  * Replace python-imaging dependencies with python-pil (Closes: #866454).
+  * Switch to source format 3.0 (quilt) so that the package actually builds
+    following the svn to git-dpm conversion.
 
   [ Carl Fürstenberg ]
   * override lintian warning wrong-section-according-to-package-name, we stick
@@ -13,7 +19,7 @@ plastex (0.9.2-2) UNRELEASED; urgency=low
   [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
- -- Jakub Wilk <jw...@debian.org>  Sun, 05 May 2013 16:01:31 +0200
+ -- Stuart Prescott <stu...@debian.org>  Fri, 19 Jan 2018 00:17:25 +1100
 
 plastex (0.9.2-1.1) unstable; urgency=medium
 
-- 
2.11.0

_______________________________________________
Python-modules-team mailing list
Python-modules-team@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team

Reply via email to