The following commit has been merged in the debian-experimental-4.0 branch:
commit 57cb0c65e0e02a3d3b850486506397fdea8d747a
Author: Rene Engelhard <[email protected]>
Date: Sun Nov 25 16:46:07 2012 +0100
micro-optimization: xpdfimport is arch-dep, do it in gid2pkgdirs.sh already
diff --git a/rules b/rules
index ed795b4..71afaef 100755
--- a/rules
+++ b/rules
@@ -1860,7 +1860,7 @@ ifeq "$(ENABLE_PDFIMPORT)" "y"
mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/share/
mv $(PKGDIR)-core/$(OODIR)/program/pdfimport.uno.so \
$(PKGDIR)-pdfimport/$(OODIR)/program
- mv $(PKGDIR)-common/$(OODIR)/program/xpdfimport \
+ mv $(PKGDIR)-core/$(OODIR)/program/xpdfimport \
$(PKGDIR)-pdfimport/$(OODIR)/program
mv $(PKGDIR)-common/$(OODDIR)/share/xpdfimport \
$(PKGDIR)-pdfimport/$(OODIR)/share
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index b520740..f3aa94f 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -151,7 +151,7 @@ mkdir -p
$OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program; \
fi &&
( cd pkg/libreoffice-common/$OOINSTBASE/program
find -maxdepth 1 \
- -regex
'\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\)'
\
+ -regex
'\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\)'
\
-exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \;
);
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
