[libreoffice] 01/02: remove extra libreoffice-pdfimport, merge back to -common/-core
Rene Engelhard
rene at moszumanska.debian.org
Thu Feb 16 20:58:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit 62c1088e1580f01cc925cf5f883c5d7ff0e27d57
Author: Rene Engelhard <rene at debian.org>
Date: Thu Feb 16 19:32:20 2017 +0100
remove extra libreoffice-pdfimport, merge back to -common/-core
---
changelog | 5 +++++
control | 33 +++++++++++++++++----------------
control.in | 25 ++++++-------------------
control.transitionals.in | 13 +++++++++++++
rules | 2 ++
scripts/gid2pkgdirs.sh | 2 +-
6 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/changelog b/changelog
index e02bbf4..08da1cd 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,11 @@ libreoffice (1:5.4.0~alpha0~git20170213-1) UNRELEASED; urgency=medium
but close enough, so this closes: #814598
(unfortunately only using internal pdfium. sigh.)
+ * debian/scripts/gid2pkgdirs.sh, debian/control{,.transitionals}.in:
+ remove extra libreoffice-pdfimport, merge (even though the poppler
+ dependecy...) back to -common/-core since it has the above new feature and
+ otherwise it may get confusing what is what.
+
* tarballs/9ac66c71463f9440e3ccc996c5e66556-pdfium-3004.tar.bz2,
debian/copyright, debian/source/include-binaries: include pdfium
diff --git a/control b/control
index c645eb8..849bc4d 100644
--- a/control
+++ b/control
@@ -213,7 +213,6 @@ Recommends: fonts-crosextra-caladea,
libreoffice-librelogo,
libreoffice-nlpsolver,
libreoffice-ogltrans,
- libreoffice-pdfimport,
libreoffice-report-builder [!hppa !ia64 !mips64 !s390 !sparc],
libreoffice-script-provider-bsh,
libreoffice-script-provider-js,
@@ -375,6 +374,7 @@ Breaks: browser-plugin-libreoffice,
libreoffice-kab (<< 1:3.4.1~),
libreoffice-kde (<< ${binary:Version}),
libreoffice-officebean (<< ${binary:Version}),
+ libreoffice-pdfimport (<< 1:5.4~),
libreoffice-presentation-minimizer (<< 1:4.2~),
libreoffice-sdbc-postgresql (<< 0.8.1~),
libreoffice-style-andromeda (<< 1:3.3.0-1),
@@ -433,6 +433,7 @@ Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5),
libreoffice-common (<< 1:4.4.0~rc3-1),
+ libreoffice-pdfimport (<< 1:5.4~),
uno-libs3 (<< 1:3.6.1-2),
ure (<< 1:3.6.1-2)
Description: office productivity suite -- arch-dependent files
@@ -463,7 +464,7 @@ Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
libreoffice-mysql-connector (<< 1.0.1+LibO3.6.5-1),
- libreoffice-pdfimport (<< 1.0.6),
+ libreoffice-pdfimport (<< 1:5.4~),
libreoffice-presentation-minimizer (<< 1.0.4),
libreoffice-presenter-console (<< 1.1.1),
libreoffice-report-builder (<< 1.2.3),
@@ -488,6 +489,7 @@ Breaks: libreoffice-core (<< 1:${oover}~),
openoffice.org-common (<< 1:3.3.0~),
zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1)
Replaces: libreoffice-emailmerge (<< 1:4.0.2~rc1),
+ libreoffice-pdfimport (<< 1:5.4~),
openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
@@ -834,20 +836,6 @@ Description: JavaScript script support provider for LibreOffice scripting framew
.
This package contains the script provider to support JavaScript.
-Package: libreoffice-pdfimport
-Section: misc
-Priority: extra
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 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.
-
Package: libreoffice-avmedia-backend-gstreamer
Section: misc
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
@@ -4639,3 +4627,16 @@ Description: Firebird SDBC driver for LibreOffice
The Firebird SDBC Driver allows one to use the Firebird database from
LibreOffice without any wrapper layer such as ODBC or JDBC.
+Package: libreoffice-pdfimport
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: libreoffice-common (>= 1:5.4~), libreoffice-core (>= 1:5.4~)
+Description: transitional package for 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 formerly contained a component enabling LibreOffice to import PDF
+ Documents. This now has been merged back into the "main" packages and this
+ package thus can be safely removed once installed.
+
diff --git a/control.in b/control.in
index ac26808..6aad72f 100644
--- a/control.in
+++ b/control.in
@@ -55,7 +55,6 @@ Recommends: fonts-sil-gentium-basic,
libreoffice-ogltrans,
libreoffice-librelogo,
libreoffice-nlpsolver,
- libreoffice-pdfimport,
libreoffice-report-builder%OOO_NO_REPORTDESIGN_ARCHS%,
libreoffice-wiki-publisher,
libreoffice-sdbc-postgresql
@@ -265,13 +264,15 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
myspell-sw (<< 1:3.1.0-3),
myspell-th (<< 1:3.1.0-3),
myspell-tl (<< 0.4-0-5),
- browser-plugin-libreoffice
+ browser-plugin-libreoffice,
+ libreoffice-pdfimport (<< 1:5.4~)
Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5),
libreoffice-common (<< 1:4.4.0~rc3-1),
uno-libs3 (<< 1:3.6.1-2),
- ure (<< 1:3.6.1-2)
+ ure (<< 1:3.6.1-2),
+ libreoffice-pdfimport (<< 1:5.4~)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -310,7 +311,7 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
libtextcat-data (<< 2.2-8),
openoffice.org-common (<< 1:3.3.0~),
- libreoffice-pdfimport (<< 1.0.6),
+ libreoffice-pdfimport (<< 1:5.4~),
libreoffice-presenter-console (<< 1.1.1),
libreoffice-wiki-publisher (<< 1.1.2),
libreoffice-report-builder (<< 1.2.3),
@@ -322,7 +323,7 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-writer2latex (<< 1.0.2-9),
libreoffice-writer2xhtml (<< 1.0.2-9),
zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1)
-Replaces: openoffice.org-common (<< 1:3.3.0~), libreoffice-emailmerge (<< 1:4.0.2~rc1)
+Replaces: openoffice.org-common (<< 1:3.3.0~), libreoffice-emailmerge (<< 1:4.0.2~rc1), libreoffice-pdfimport (<< 1:5.4~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -666,20 +667,6 @@ Description: JavaScript script support provider for LibreOffice scripting framew
.
This package contains the script provider to support JavaScript.
-Package: libreoffice-pdfimport
-Section: misc
-Priority: extra
-Architecture: %OOO_ARCHS%
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 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.
-
Package: libreoffice-avmedia-backend-gstreamer
Section: misc
Architecture: %OOO_ARCHS%
diff --git a/control.transitionals.in b/control.transitionals.in
new file mode 100644
index 0000000..d2be8cb
--- /dev/null
+++ b/control.transitionals.in
@@ -0,0 +1,13 @@
+Package: libreoffice-pdfimport
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: libreoffice-core (>= 1:5.4~), libreoffice-common (>= 1:5.4~)
+Description: transitional package for 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 formerly contained a component enabling LibreOffice to import PDF
+ Documents. This now has been merged back into the "main" packages and this
+ package thus can be safely removed once installed.
+
diff --git a/rules b/rules
index 8edbd36..f7699e0 100755
--- a/rules
+++ b/rules
@@ -1801,6 +1801,8 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
cat debian/control.firebird.in >> debian/control
endif
+ cat debian/control.transitionals.in >> debian/control
+
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BE_ARCHS%,$(OOO_BE_ARCHS),g" debian/control
perl -pi -e "s,%OOO_LE_ARCHS%,$(OOO_LE_ARCHS),g" debian/control
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 0c226ce..145f11f 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -111,7 +111,7 @@ create_package_directory gid_Module_Optional_Extensions_MEDIAWIKI pkg/libreoffic
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_NLPSolver pkg/libreoffice-nlpsolver
-create_package_directory gid_Module_Pdfimport pkg/libreoffice-pdfimport
+create_package_directory gid_Module_Pdfimport pkg/libreoffice-common
create_package_directory gid_Module_Optional_Extensions_PRESENTER_SCREEN pkg/libreoffice-presenter-console
create_package_directory gid_Module_Reportbuilder pkg/libreoffice-report-builder
create_package_directory gid_Module_Optional_PostgresqlSdbc pkg/libreoffice-sdbc-postgresql
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list