The following commit has been merged in the debian-experimental-3.4.0 branch: commit 22190ecdb8fd40a1481274014b51f6bcf552dcb9 Author: Rene Engelhard <r...@debian.org> Date: Mon Aug 15 19:53:31 2011 +0000
fix-distro-config.diff diff --git a/changelog b/changelog index 7fa01b7..7a9ddee 100644 --- a/changelog +++ b/changelog @@ -1,12 +1,13 @@ libreoffice (1:3.4.2-2) UNRELEASED; urgency=low * debian/patches/make-gengal-work-again.diff: as name says + * debian/patches/fix-distro-config.diff: really use system sane.h * debian/rules: - fix syntax of graphite removal from SYSTEM_STUFF (forgot s/+=/:=/) - install gengal again - -- Rene Engelhard <r...@debian.org> Fri, 12 Aug 2011 20:56:23 +0200 + -- Rene Engelhard <r...@debian.org> Mon, 15 Aug 2011 19:52:52 +0000 libreoffice (1:3.4.2-1) experimental; urgency=low diff --git a/patches/fix-distro-config.diff b/patches/fix-distro-config.diff new file mode 100644 index 0000000..087a490 --- /dev/null +++ b/patches/fix-distro-config.diff @@ -0,0 +1,11 @@ +--- libreoffice-3.4.2.orig/libreoffice-build/distro-configs/Debian.conf.in ++++ libreoffice-3.4.2/libreoffice-build/distro-configs/Debian.conf.in +@@ -2,7 +2,7 @@ + --with-system-expat + --with-system-odbc + --with-system-curl +---with-system-sane ++--with-system-sane-header + --with-system-xrender-headers + --enable-gnome-vfs + --enable-symbols diff --git a/patches/series b/patches/series index 4df5c64..28b578b 100644 --- a/patches/series +++ b/patches/series @@ -19,3 +19,4 @@ vbaobj-visibility-fix.diff fix-bridges-cpp-uno-depends.diff no-prctl-on-kfreebsd.diff make-gengal-work-again.diff +fix-distro-config.diff -- LibreOffice packaging repository -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qt4xj-0007dr...@vasks.debian.org