On Fri, Oct 25, 2019 at 09:02:10AM +0200, Andreas Henriksson wrote:
> Control: tags 943016 + patch
[...]
> The easiest way to accomplish that would simply be to disable the
> python(2) plugin. Attaching a patch that does that (which maybe someone
> wants to extend with Breaks: towards affected reverse dependencies).
[...]
Improved patch attached.
v2:
- add debian/NEWS entry
- also close pygtk2 RC bug (#885271)
- add Breaks: as previously mentioned.
FYI the dia flatpak (as distributed by GNOME) seems to have recently
*enabled* building the python2 support, which means that might be an
option for those who want to continue using it.
Also note about dia on the tracker.debian.org page:
Marked for autoremoval on 23 November: #885271
Regards,
Andreas Henriksson
diff -Nru dia-0.97.3+git20160930/debian/changelog
dia-0.97.3+git20160930/debian/changelog
--- dia-0.97.3+git20160930/debian/changelog 2018-12-01 16:02:28.000000000
+0100
+++ dia-0.97.3+git20160930/debian/changelog 2019-10-25 09:23:46.000000000
+0200
@@ -1,3 +1,14 @@
+dia (0.97.3+git20160930-8.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop --with-python configure flag, dh-python usage and (build-)deps.
+ (Closes: #943016, #885271)
+ * Add Breaks on current versions of trac-diavisview and python-ldaptor
+ as they seem to use the python bindings (see #938690 and #936830)
+ * add debian/NEWS entry about python disabled and mention dia flatpak.
+
+ -- Andreas Henriksson <andr...@fatal.se> Fri, 25 Oct 2019 09:23:46 +0200
+
dia (0.97.3+git20160930-8.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru dia-0.97.3+git20160930/debian/control
dia-0.97.3+git20160930/debian/control
--- dia-0.97.3+git20160930/debian/control 2018-02-14 14:15:39.000000000
+0100
+++ dia-0.97.3+git20160930/debian/control 2019-10-25 09:20:06.000000000
+0200
@@ -7,7 +7,6 @@
automake,
dblatex,
debhelper (>= 10),
- dh-python,
docbook-xml,
docbook-xsl,
intltool,
@@ -22,8 +21,6 @@
libxml-parser-perl,
libxml2-dev,
libxslt1-dev,
- python-dev,
- python-gtk2,
texlive-lang-cyrillic,
texlive-lang-french,
texlive-lang-german,
@@ -37,8 +34,9 @@
Package: dia-common
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: dia
+Breaks: trac-diavisview (<= 0.3-2), python-ldaptor (<= 0.0.43+debian1-7.2)
Description: Diagram editor (common files)
Dia is an editor for diagrams, graphs, charts etc. There is support for UML
static structure diagrams (class diagrams), Entity-Relationship diagrams,
diff -Nru dia-0.97.3+git20160930/debian/NEWS dia-0.97.3+git20160930/debian/NEWS
--- dia-0.97.3+git20160930/debian/NEWS 1970-01-01 01:00:00.000000000 +0100
+++ dia-0.97.3+git20160930/debian/NEWS 2019-10-25 09:23:39.000000000 +0200
@@ -0,0 +1,9 @@
+dia (0.97.3+git20160930-8.2) unstable; urgency=medium
+
+ The python interface to dia has been disabled since Python 2 will
+ soon go end of life. If you have a need for the python interface
+ the current recommendation is to look into using the dia flatpak
+ as that (still as of right now) seems to carry the python2 parts
+ and might be usable for your needs.
+
+ -- Andreas Henriksson <andr...@fatal.se> Fri, 25 Oct 2019 09:21:38 +0200
diff -Nru dia-0.97.3+git20160930/debian/rules
dia-0.97.3+git20160930/debian/rules
--- dia-0.97.3+git20160930/debian/rules 2018-02-11 22:52:07.000000000 +0100
+++ dia-0.97.3+git20160930/debian/rules 2019-10-25 08:38:05.000000000 +0200
@@ -9,13 +9,13 @@
DPKG_EXPORT_BUILDFLAGS = 1
%:
- dh $@ --parallel --with python2
+ dh $@ --parallel
override_dh_auto_configure:
libtoolize --copy --force
autoreconf -fi
intltoolize
- dh_auto_configure -- --with-python --with-cairo --with-hardbooks
+ dh_auto_configure -- --with-cairo --with-hardbooks
override_dh_auto_build:
# docbook-xsl source for referenced pngs
