------------------------------------------------------------
revno: 1391
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Sun 2009-01-25 19:23:28 +0100
message:
+ * debian/control.in:
+ - allow imagemagick for build again, as it seem to create the splash
+ correctly now
+ * debian/openoffice.org-common.preinst.in: fix typo to actually also remove
+ dictionary.lst.old
modified:
changelog
control.in
rules
------------------------------------------------------------
revno: 1022.3.15
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Sun 2009-01-25 19:15:57 +0100
message:
mention issue nr
modified:
rules
=== modified file 'changelog'
--- a/changelog 2009-01-23 09:05:05 +0000
+++ b/changelog 2009-01-25 18:23:28 +0000
@@ -4,6 +4,11 @@
- add build-conflicts against xulrunner-dev is MOZILLA != libxul
- build-depend on libsuitesparse (>= 3.2.0) and a lp-solve also built
against it to prepare the transition
+ * debian/control.in:
+ - allow imagemagick for build again, as it seem to create the splash
+ correctly now
+ * debian/openoffice.org-common.preinst.in: fix typo to actually also remove
+ dictionary.lst.old
-- Rene Engelhard <[email protected]> Thu, 22 Jan 2009 15:59:15 +0100
=== modified file 'control.in'
--- a/control.in 2009-01-20 09:07:51 +0000
+++ b/control.in 2009-01-25 18:23:28 +0000
@@ -36,7 +36,7 @@
libexpat1-dev,
fastjar,
xsltproc,
- graphicsmagick-imagemagick-compat,
+ imagemagick,
netpbm,
fdupes,
xml-core,
=== modified file 'rules'
--- a/rules 2009-01-24 15:32:20 +0000
+++ b/rules 2009-01-25 18:23:28 +0000
@@ -1368,7 +1368,7 @@
# configure.in looks for libxul.pc and if it finds it it
# just uses this. when we specify some other mozilla I guess we
# want to use its headers, not of libxul. We need a build-conflicts
- # here unfortunately.
+ # here unfortunately until i#98370 is fixed.
perl -pi -e "s/(Build-Conflicts: .*)/\1, xulrunner-dev/" debian/control
endif
