[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-123-g296261f
The following commit has been merged in the debian-experimental-4.0 branch:
commit c5d2866e06894eb3401ddd62c6e279c383699840
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 22 10:35:52 2012 +0100
the presenter console is not an extension anymore
diff --git a/control b/control
index 6bdb66e..80b64ac 100644
--- a/control
+++ b/control
@@ -165,6 +165,9 @@ Description: office productivity suite -- spreadsheet
Package: libreoffice-impress
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-draw (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libreoffice-presenter-console
+Provides: libreoffice-presenter-console
+Replaces: libreoffice-presenter-console
Suggests: bluez
Description: office productivity suite -- presentation
LibreOffice is a full-featured office productivity suite that provides
@@ -670,30 +673,6 @@ Description: LibreOffice extension for size-efficient presentations
quality as presentations designed for print."
Homepage: http://extensions.services.openoffice.org/project/PresentationMinimizer
-Package: libreoffice-presenter-console
-Section: misc
-Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
-Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
-Enhances: libreoffice-impress
-Description: LibreOffice Impress extension for a separate presenter's console
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the Presenter Console extension:
- .
- The Presenter Console for Impress is a feature that aids a presenter during a
- slide show. It provides information on a second screen, that typically is not
- visible to the audience. This includes
- .
- * a view to the currently displayed slide (for when the presenter faces the
- audience and can not see the primary screen)
- * a preview of the next slide or next effect
- * the notes of the current slide
- * the current time and/or the elapsed time
- * navigation buttons for going to the previous/next slide
-Homepage: http://extensions.services.openoffice.org/project/presenter-screen
-
Package: libreoffice-pdfimport
Section: misc
Priority: extra
diff --git a/control.in b/control.in
index 47a119c..bc3ea77 100644
--- a/control.in
+++ b/control.in
@@ -277,6 +277,9 @@ Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-draw (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
+Conflicts: libreofficeVER-presenter-console
+Provides: libreofficeVER-presenter-console
+Replaces: libreofficeVER-presenter-console
Description: office productivity suite -- presentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.presenter.in b/control.presenter.in
deleted file mode 100644
index 6fe8360..0000000
--- a/control.presenter.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Package: libreofficeVER-presenter-console
-Section: misc
-Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
-Depends: ${shlibs:Depends}, libreofficeVER-core, libreofficeVER-impress,
- ${misc:Depends}
-Enhances: libreofficeVER-impress
-Description: LibreOffice Impress extension for a separate presenter's console
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the Presenter Console extension:
- .
- The Presenter Console for Impress is a feature that aids a presenter during a
- slide show. It provides information on a second screen, that typically is not
- visible to the audience. This includes
- .
- * a view to the currently displayed slide (for when the presenter faces the
- audience and can not see the primary screen)
- * a preview of the next slide or next effect
- * the notes of the current slide
- * the current time and/or the elapsed time
- * navigation buttons for going to the previous/next slide
-Homepage: http://extensions.services.openoffice.org/project/presenter-screen
-
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 01e46b2..06d7512 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -53,17 +53,20 @@ index b5bec12..920fc4e 100644
gid_File_Tmp_Userinstall_Draw_Inf);
End
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
-index e3313c8..3f5e257 100644
+index e3313c8..52d5ea0 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
-@@ -43,6 +43,7 @@ Module gid_Module_Prg_Impress_Bin
- Default = YES;
- Styles = (HIDDEN_ROOT);
+@@ -45,7 +45,9 @@ Module gid_Module_Prg_Impress_Bin
Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
+ gid_File_Lib_Slideshow,
gid_File_Share_Registry_Impress_Xcd,
gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
- gid_File_Tmp_Userinstall_Impress_Inf);
+- gid_File_Tmp_Userinstall_Impress_Inf);
++ gid_File_Tmp_Userinstall_Impress_Inf,
++ gid_File_Lib_PresenterScreen);
+ End
+
+ Module gid_Module_Brand_Prg_Impress
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 55180c5..742cb6e 100644
--- a/scp2/source/kde/module_kde.scp
diff --git a/rules b/rules
index d1cf5ea..46570e7 100755
--- a/rules
+++ b/rules
@@ -259,7 +259,6 @@ else
endif
ENABLE_SDBC_POSTGRESQL=y
ENABLE_MINIMIZER=y
-ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
@@ -431,12 +430,10 @@ endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ENABLE_MINIMIZER=n
ENABLE_PDFIMPORT=n
- ENABLE_PRESENTER_CONSOLE=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)-presenter-console
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
ENABLE_MEDIAWIKI=n
@@ -536,9 +533,6 @@ endif
ifneq "$(ENABLE_MINIMIZER)" "y"
CONFIGURE_FLAGS += --disable-ext-presenter-minimizer
endif
-ifneq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- CONFIGURE_FLAGS += --disable-ext-presenter-console
-endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev
else
@@ -1412,10 +1406,6 @@ ifeq "$(ENABLE_MINIMIZER)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.minimizer.in
endif
-ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
- >> debian/control < debian/control.presenter.in
-endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.pdfimport.in
@@ -2884,7 +2874,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)-presenter-console \
-Nlibreoffice$(VER)-pdfimport \
-Nlibreoffice$(VER)-mysql-connector -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')" \
@@ -2918,10 +2907,6 @@ 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`
endif
-ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- dh_gencontrol -plibreoffice$(VER)-presenter-console -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/presenter/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
-endif
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
--
LibreOffice packaging repository
Reply to: