[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-163-g4cfc286
The following commit has been merged in the debian-experimental-4.0 branch:
commit 4cfc28601f27c848c3337d792e58fee4ea5123cb
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 29 12:39:38 2012 +0100
pdfimport has an own scp2 module again; remove ENABLE_PDFIMPORT, it's not disableable anymore
diff --git a/changelog b/changelog
index a1d7d35..34dc647 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.0~alpha1+git20121127-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha1+git20121129-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
diff --git a/control.in b/control.in
index da8b0b9..77cf926 100644
--- a/control.in
+++ b/control.in
@@ -628,3 +628,17 @@ Description: JavaScript script support provider for LibreOffice scripting framew
.
This package contains the script provider to support JavaScript.
+Package: libreofficeVER-pdfimport
+Section: misc
+Priority: extra
+Architecture: %OOO_ARCHS%
+Depends: ${shlibs:Depends}, libreofficeVER-core,
+ ${misc:Depends}
+Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+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 a component enabling LibreOffice to import PDF
+ Documents.
+
diff --git a/control.pdfimport.in b/control.pdfimport.in
deleted file mode 100644
index c10a9cd..0000000
--- a/control.pdfimport.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: libreofficeVER-pdfimport
-Section: misc
-Priority: extra
-Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}, libreofficeVER-core,
- ${misc:Depends}
-Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
-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 a component enabling LibreOffice to import PDF
- Documents.
-
diff --git a/rules b/rules
index 7dcab6a..09da98c 100755
--- a/rules
+++ b/rules
@@ -259,7 +259,6 @@ else
endif
ENABLE_SDBC_POSTGRESQL=y
ENABLE_MINIMIZER=y
-ENABLE_PDFIMPORT=y
BUILD_GTK=y
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
@@ -533,11 +532,7 @@ endif
ifneq "$(ENABLE_MINIMIZER)" "y"
CONFIGURE_FLAGS += --disable-ext-presenter-minimizer
endif
-ifeq "$(ENABLE_PDFIMPORT)" "y"
BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev
-else
- CONFIGURE_FLAGS += --disable-pdfimport
-endif
# fails their tests
ifeq "$(DEB_HOST_ARCH)" "armel"
@@ -1412,10 +1407,6 @@ ifeq "$(ENABLE_MINIMIZER)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.minimizer.in
endif
-ifeq "$(ENABLE_PDFIMPORT)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
- >> debian/control < debian/control.pdfimport.in
-endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.fonts.in
@@ -1859,18 +1850,6 @@ ifeq "$(ENABLE_EVO2)" "y"
$(PKGDIR)-evolution/$(OODIR)/presets/database
endif
-ifeq "$(ENABLE_PDFIMPORT)" "y"
- rm -rf $(PKGDIR)-pdfimport
- mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/program
- mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/share/
- mv $(PKGDIR)-core/$(OODIR)/program/pdfimport.uno.so \
- $(PKGDIR)-pdfimport/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/xpdfimport \
- $(PKGDIR)-pdfimport/$(OODIR)/program
- mv $(PKGDIR)-common/$(OODIR)/share/xpdfimport \
- $(PKGDIR)-pdfimport/$(OODIR)/share
-endif
-
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index f7c325a..ebfb157 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -114,7 +114,7 @@ create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_Java
create_package_directory gid_Module_Optional_Extensions_MEDIAWIKI pkg/libreoffice-wiki-publisher
create_package_directory gid_Module_Optional_Extensions_MINIMIZER pkg/libreoffice-presentation-minimizer
create_package_directory gid_Module_Optional_Extensions_MySQLConnector pkg/libreoffice-mysql-connector
-create_package_directory gid_Module_Optional_Extensions_PDFIMPORT pkg/libreoffice-pdfimport
+create_package_directory gid_Module_Pdfimport pkg/libreoffice-pdfimport
create_package_directory gid_Module_Optional_Extensions_PRESENTER_SCREEN pkg/libreoffice-presenter-console
create_package_directory gid_Module_Optional_Extensions_REPORTDESIGN pkg/libreoffice-report-builder
create_package_directory gid_Module_Optional_PostgresqlSdbc pkg/libreoffice-sdbc-postgresql
--
LibreOffice packaging repository
Reply to: