[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-149-g7769f6b
The following commit has been merged in the debian-experimental-4.0 branch:
commit 0153c86d71b6a86f947d3e6379dd10f6bf072145
Author: Rene Engelhard <rene@debian.org>
Date: Sun Nov 25 14:10:00 2012 +0100
in-the-blind update for new non-extension pdfimport...
diff --git a/changelog b/changelog
index 0e712de..133e906 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.0~alpha1+git20121124-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha1+git20121125-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
diff --git a/control b/control
index c48308c..bd862e8 100644
--- a/control
+++ b/control
@@ -678,13 +678,12 @@ Priority: extra
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
-Description: LibreOffice extension for importing PDF documents
+Description: PDF Import component for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains an extension to open PDF documents with
- LibreOffice Draw.
-Homepage: http://extensions.services.openoffice.org/project/pdfimport
+ This package contains a component enabling LibreOffice to import PDF
+ Documents.
Package: fonts-opensymbol
Section: fonts
diff --git a/control.pdfimport.in b/control.pdfimport.in
index 32f138d..c8c5f09 100644
--- a/control.pdfimport.in
+++ b/control.pdfimport.in
@@ -1,15 +1,14 @@
Package: libreofficeVER-pdfimport
Section: misc
Priority: extra
-Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
+Architecture: %OOO_ARCHS%
Depends: ${shlibs:Depends}, libreofficeVER-core,
${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
-Description: LibreOffice extension for importing PDF documents
+Description: PDF Import component for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains an extension to open PDF documents with
- LibreOffice Draw.
-Homepage: http://extensions.services.openoffice.org/project/pdfimport
+ This package contains a component enabling LibreOffice to import PDF
+ Documents.
diff --git a/rules b/rules
index fe53aed..04e4e4e 100755
--- a/rules
+++ b/rules
@@ -430,11 +430,10 @@ endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ENABLE_MINIMIZER=n
- ENABLE_PDFIMPORT=n
ENABLE_MYSQLNATIVE=n
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-mysql-connector
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-pdfimport -Nlibreoffice$(VER)-presentation-minimizer
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-presentation-minimizer
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
ENABLE_MEDIAWIKI=n
@@ -537,7 +536,7 @@ endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev
else
- CONFIGURE_FLAGS += --disable-ext-pdfimport
+ CONFIGURE_FLAGS += --disable-pdfimport
endif
# fails their tests
@@ -2336,10 +2335,6 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
rm -f $(PKGDIR)-mysql-connector/$(OODIR)/share/extensions/mysql-connector-ooo/registration/LICENSE
endif
-ifeq "$(ENABLE_PDFIMPORT)" "y"
- rm -f $(PKGDIR)-pdfimport/$(OODIR)/share/extensions/pdfimport/registration/LICENSE
-endif
-
ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/registration/LICENSE
endif
@@ -2353,6 +2348,15 @@ endif
# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
#endif
+ifeq "$(ENABLE_PDFIMPORT)" "y"
+ rm -rf $(PKGDIR)-pdfimport
+ mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/program
+ for i in xpdfimport xpdfimport_err.pdf pdfimport.uno.so; do \
+ mv $(PKGDIR)-core/$(OODIR)/program/$$i \
+ $(PKGDIR)-pdfimport/$(OODIR)/program; \
+ done
+endif
+
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
@@ -2874,7 +2878,6 @@ endif
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
dh_gencontrol -s $(DEBHELPER_OPTIONS) -Nure -Nure-dbg -Nuno-libs3 -Nuno-libs3-dbg \
-Nlibreoffice$(VER)-presentation-minimizer \
- -Nlibreoffice$(VER)-pdfimport \
-Nlibreoffice$(VER)-mysql-connector -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')" \
-V'base-version=$(BASE_VERSION)' \
@@ -2899,10 +2902,6 @@ ifeq "$(ENABLE_JAVA)" "y"
debian/libreoffice$(VER)-officebean/DEBIAN/control
endif
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
-ifeq "$(ENABLE_PDFIMPORT)" "y"
- dh_gencontrol -plibreoffice$(VER)-pdfimport -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/pdfimport/description.xml | perl -pi -e 's,<version.*value=\"(.*)\" />,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
-endif
ifeq "$(ENABLE_MINIMIZER)" "y"
dh_gencontrol -plibreoffice$(VER)-presentation-minimizer -- \
-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/minimizer/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
--
LibreOffice packaging repository
Reply to: