[re-sending to fix abiword CC]
On Tue, 2011-01-18 at 12:55 +0100, Julien Cristau wrote:
> On Fri, Jan 14, 2011 at 14:01:16 +0100, Jakub Wilk wrote:
>
> > In the worst case we can change build-dependencies so that psiconv
> > is linked with ImageMagick (rather than GraphicsMagick).
>From your later messages, it sounds like this isn't the best idea.
> Another option would be to rebuild abiword and gnumeric without psiconv
> support, if that's easy?
I've verified that with the attached patches, both packages at least
build on squeeze without any apparent sign of using psiconv. (They're
both already out of sync wrt unstable so would need tpu uploads).
fwiw, abiword already removed psiconv support in the past; the changelog
gives no indication of when it was re-introduced:
abiword (2.6.4-1) unstable; urgency=medium
[...]
* Minor changes:
- Drop psiconv support overall to alleviate dependency bloat/package spam,
at the risk of offending the one guy who still has a Psion 5.
[...]
-- Joshua Kwan <jo...@triplehelix.org> Mon, 14 Jul 2008 10:26:14 -0700
Regards,
Adam
diff -u abiword-2.8.2/debian/rules abiword-2.8.2/debian/rules
--- abiword-2.8.2/debian/rules
+++ abiword-2.8.2/debian/rules
@@ -15,7 +15,7 @@
eml freetranslation gdict gimp goffice google grammar hancom \
hrtext iscii kword latex loadbindings mathview mht mif mswrite \
opendocument openwriter openxml opml ots paint passepartout pdb \
- pdf presentation psion s5 sdw t602 urldict wikipedia wmf wml \
+ pdf presentation s5 sdw t602 urldict wikipedia wmf wml \
wordperfect wpg xslfo \
garble
diff -u abiword-2.8.2/debian/control abiword-2.8.2/debian/control
--- abiword-2.8.2/debian/control
+++ abiword-2.8.2/debian/control
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Patrik Fimml <pat...@fimml.at>
-Build-Depends: cdbs, debhelper (>= 7), quilt, libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-1.1), libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-1.1), libasio-dev (>= 1.4.1), libenchant-dev (>= 1.2.0), libfreetype6-dev, libfribidi-dev, libglade2-dev, libglib2.0-dev, libgsf-1-dev (>= 1.13.2), libgtk2.0-dev, libgtkmathview-dev (>= 0.7.5), liblink-grammar4-dev, libloudmouth1-dev, libots-dev, libpng-dev, libpopt-dev, libreadline-dev, libwmf-dev, libwpd-dev, libwpg-dev (>= 0.1.0), libwps-dev, libwv-dev (>= 1.2), libgoffice-0.8-dev, libgucharmap2-dev, libpsiconv-dev (>= 0.9.4), librsvg2-dev (>= 2.16.0), libboost-regex-dev, libsoup2.4-dev, libdbus-glib-1-dev, libxslt-dev, libaspell-dev
+Build-Depends: cdbs, debhelper (>= 7), quilt, libaiksaurus-1.2-dev (>= 1.2.1+dev-0.12-1.1), libaiksaurusgtk-1.2-dev (>= 1.2.1+dev-0.12-1.1), libasio-dev (>= 1.4.1), libenchant-dev (>= 1.2.0), libfreetype6-dev, libfribidi-dev, libglade2-dev, libglib2.0-dev, libgsf-1-dev (>= 1.13.2), libgtk2.0-dev, libgtkmathview-dev (>= 0.7.5), liblink-grammar4-dev, libloudmouth1-dev, libots-dev, libpng-dev, libpopt-dev, libreadline-dev, libwmf-dev, libwpd-dev, libwpg-dev (>= 0.1.0), libwps-dev, libwv-dev (>= 1.2), libgoffice-0.8-dev, libgucharmap2-dev, librsvg2-dev (>= 2.16.0), libboost-regex-dev, libsoup2.4-dev, libdbus-glib-1-dev, libxslt-dev, libaspell-dev
Standards-Version: 3.8.4
Homepage: http://www.abisource.com/
Vcs-Browser: http://git.debian.org/?p=users/patrikf-guest/abiword.git;a=summary
diff -u abiword-2.8.2/debian/changelog abiword-2.8.2/debian/changelog
--- abiword-2.8.2/debian/changelog
+++ abiword-2.8.2/debian/changelog
@@ -1,3 +1,13 @@
+abiword (2.8.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Disable building of psion plugin due to psiconv breakage
+ (see #609535)
+ + debian/control: Drop libpsiconv-dev build-dependency
+ + debian/rules: Remove psion from the plugins list
+
+ -- Adam D. Barratt <a...@adam-barratt.org.uk> Sun, 23 Jan 2011 17:10:51 +0000
+
abiword (2.8.2-2) unstable; urgency=low
* Move from libgoffice-0-8-dev to libgoffice-0.8-dev (see #570351,
diff -Nru gnumeric-1.10.8/debian/changelog gnumeric-1.10.8/debian/changelog
--- gnumeric-1.10.8/debian/changelog 2010-11-07 12:04:00.000000000 +0000
+++ gnumeric-1.10.8/debian/changelog 2011-01-23 19:17:06.000000000 +0000
@@ -1,3 +1,14 @@
+gnumeric (1.10.8-1squeeze4.1) testing-proposed-updates; urgency=low
+
+ * Non-maintainer upload.
+ * Drop psiconv support (see #609535):
+ + debian/control: Drop libpsciconv-dev build-dependency
+ + debian/rules: Explicitly build without psiconv support
+ + debian/gnumeric-plugins-extra.install: Don't look for psiconv plugin
+ files
+
+ -- Adam D. Barratt <a...@adam-barratt.org.uk> Sun, 23 Jan 2011 19:15:50 +0000
+
gnumeric (1.10.8-1squeeze4) testing-proposed-updates; urgency=high
* [debian/patches/bca4b6c-backport, debian/patches/9ee41a9] Fix analysis
diff -Nru gnumeric-1.10.8/debian/control gnumeric-1.10.8/debian/control
--- gnumeric-1.10.8/debian/control 2010-09-05 18:10:49.000000000 +0100
+++ gnumeric-1.10.8/debian/control 2011-01-23 19:15:07.000000000 +0000
@@ -10,7 +10,7 @@
libpango1.0-dev (>= 1.12.0),
libgtk2.0-dev (>= 2.12.0), libglade2-dev (>= 1:2.4.0),
libart-2.0-dev (>= 2.3.16-5),
- pxlib-dev (>= 0.5.1-2+b1), libpsiconv-dev (>= 0.9.8-2), libperl-dev,
+ pxlib-dev (>= 0.5.1-2+b1), libperl-dev,
python-dev, python-gtk2-dev
Homepage: http://www.gnumeric.org/
Vcs-git: git://git.gnome.org/gnumeric
diff -Nru gnumeric-1.10.8/debian/gnumeric-plugins-extra.install gnumeric-1.10.8/debian/gnumeric-plugins-extra.install
--- gnumeric-1.10.8/debian/gnumeric-plugins-extra.install 2009-11-29 21:27:41.000000000 +0000
+++ gnumeric-1.10.8/debian/gnumeric-plugins-extra.install 2011-01-23 19:15:28.000000000 +0000
@@ -3,7 +3,6 @@
/usr/lib/gnumeric/*/plugins/gnome-glossary/*
/usr/lib/gnumeric/*/plugins/paradox/*
/usr/lib/gnumeric/*/plugins/perl*/*
-/usr/lib/gnumeric/*/plugins/psiconv/*
/usr/lib/gnumeric/*/plugins/py-func/*
/usr/lib/gnumeric/*/plugins/python-loader/*
# /usr/lib/gnumeric/*/plugins/python/*
diff -Nru gnumeric-1.10.8/debian/rules gnumeric-1.10.8/debian/rules
--- gnumeric-1.10.8/debian/rules 2010-07-31 11:15:06.000000000 +0100
+++ gnumeric-1.10.8/debian/rules 2011-01-23 19:14:56.000000000 +0000
@@ -44,7 +44,8 @@
features+= --without-gda --without-gnomedb
# Psion files support
-features+= --with-psiconv
+# psiconv removed from squeeze (#609535)
+features+= --without-psiconv
# Paradox database files plugin
features+= --with-paradox
