[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.2_rc1-1-46-gd69ceec

The following commit has been merged in the debian-experimental-4.1 branch:
commit d69ceec83c0fcdbac898c07381293ef765594d29
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Mar 18 18:20:17 2013 +0100

    git update; reportbuilder isn't a extension anymore either

diff --git a/control b/control
index bc72e98..39da917 100644
--- a/control
+++ b/control
@@ -1056,27 +1056,26 @@ Conflicts: libreoffice-common (<< 1:3.5~),
            ure (<< 1.5.1+OOo3.1.1-15)
 Provides: libreoffice-reportdesigner
 Enhances: libreoffice-base
-Description: LibreOffice extension for building database reports
+Description: LibreOffice component for building database reports
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the report builder extension:
+ This package contains the report builder:
   "Create with the Sun Report Builder stylish, smart-looking database reports.
   The flexible report editor can define group and page headers as well as
   group and page footers and even calculation fields are available to
   accomplish complex database reports."
-Homepage: http://extensions.services.openoffice.org/project/reportdesign
 
 Package: libreoffice-report-builder-bin
 Section: misc
 Architecture: amd64 armel armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Description: LibreOffice extension for building database reports -- libraries
+Description: LibreOffice component for building database reports -- libraries
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
  This package contains some architecture-dependent support libraries
- (librpt*.so) for the report builder extension.
+ (librpt*.so) for the report builder component.
 
 Package: libreoffice-presentation-minimizer
 Section: misc
diff --git a/control.reportdesign.in b/control.reportdesign.in
index d367fd0..1303c8b 100644
--- a/control.reportdesign.in
+++ b/control.reportdesign.in
@@ -13,16 +13,15 @@ Conflicts: libreoffice-common (<< 1:3.5~),
            ure (<< 1.5.1+OOo3.1.1-15)
 Provides: libreoffice-reportdesigner
 Enhances: libreoffice-base
-Description: LibreOffice extension for building database reports
+Description: LibreOffice component for building database reports
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- This package contains the report builder extension:
+ This package contains the report builder:
   "Create with the Sun Report Builder stylish, smart-looking database reports.
   The flexible report editor can define group and page headers as well as
   group and page footers and even calculation fields are available to
   accomplish complex database reports."
-Homepage: http://extensions.services.openoffice.org/project/reportdesign
 
 Package: libreoffice-report-builder-bin
 Section: misc
@@ -31,10 +30,10 @@ Depends: libreoffice-core,
          libreoffice-base,
          ${misc:Depends},
          ${shlibs:Depends}
-Description: LibreOffice extension for building database reports -- libraries
+Description: LibreOffice component for building database reports -- libraries
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
  This package contains some architecture-dependent support libraries
- (librpt*.so) for the report builder extension.
+ (librpt*.so) for the report builder component.
 
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 33f4b8c..3458404 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -3,9 +3,9 @@ index 1a245a6..dc9dbf0 100644
 --- a/scp2/source/base/module_base.scp
 +++ b/scp2/source/base/module_base.scp
 @@ -51,6 +51,20 @@ Module gid_Module_Prg_Base_Bin
-         ,gid_File_Lib_Rpt
-         ,gid_File_Lib_Rptui
-         ,gid_File_Lib_Rptxml
+         ,gid_File_Lib_Abp
+         ,gid_File_Lib_Dbp
+         ,gid_File_Lib_Dbu
 +        ,gid_File_Lib_dba_auto_installed
 +        ,gid_File_Lib_dbase_auto_installed
 +        ,gid_File_Lib_dbaxml_auto_installed
diff --git a/patches/reportdesign-mention-package.diff b/patches/reportdesign-mention-package.diff
index 3ccceb6..c2b3116 100644
--- a/patches/reportdesign-mention-package.diff
+++ b/patches/reportdesign-mention-package.diff
@@ -6,8 +6,8 @@ index 974b36e..2f42c27 100644
  String RID_STR_EXTENSION_NOT_PRESENT
  {
      // #i96130# use hard coded name
--    Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder.";
-+    Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder. For this, install the package 'libreoffice-report-builder'.";
+-    Text [ en-US ] = "The report, \"$file$\", requires the Oracle Report Builder feature.";
++    Text [ en-US ] = "The report, \"$file$\", requires the Oracle Report Builder feature. For this, install the package 'libreoffice-report-builder'.";
  };
  
  /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rules b/rules
index c35e05b..bcedb8d 100755
--- a/rules
+++ b/rules
@@ -167,7 +167,7 @@ else
 QT_MINVER= (>= 4:4.5)
 endif
 KDELIBS_MINVER= (>= 4:4.3.4)
-BUILD_DBG_PACKAGE=y
+BUILD_DBG_PACKAGE=n
 ifeq "$(BUILD_DBG_PACKAGE)" "y"
   ENABLE_SYMBOLS=y
   SMALL_SYMBOLS=y
@@ -428,13 +428,11 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
 	ENABLE_MINIMIZER=n
 	ENABLE_MYSQLNATIVE=n
 	DEBHELPER_OPTIONS += -Nlibreoffice-mysql-connector
-	DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
 	DEBHELPER_OPTIONS += -Nlibreoffice-presentation-minimizer
 endif
 ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
 	ENABLE_MEDIAWIKI=n
 	ENABLE_REPORTDESIGN=n
-	DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
 	DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher -Nlibreoffice-script-provider-python
 	CONFIGURE_FLAGS += --disable-extension-integration --disable-extensions
 else
@@ -844,7 +842,7 @@ export JAVA_HOME
 	CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
     endif
   else
-	CONFIGURE_FLAGS += --disable-ext-report-builder
+	CONFIGURE_FLAGS += --disable-report-builder
   endif
 	OOO_OFFICEBEAN_DEP = libreoffice-officebean
 	BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
@@ -1606,7 +1604,7 @@ $(STAMP_DIR)/build-arch:
 	MARIADBCONFIG=$(MARIADBCONFIG) \
 	./autogen.sh $(CONFIGURE_FLAGS) \
 		--without-doxygen --disable-ext-wiki-publisher \
-		--disable-ext-report-builder --disable-scripting-javascript \
+		--disable-report-builder --disable-scripting-javascript \
 		--disable-scripting-beanshell
 
 	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
@@ -1896,22 +1894,6 @@ ifeq "$(ENABLE_EVO2)" "y"
 		$(PKGDIR)-evolution/$(OODIR)/presets/database
 endif
 
-	# FIXME: Should have been done in gid2pkgdirs.sh but somehow the installer
-	# doesn't create the gid_Module_Pdfimport file and so that doesn't work.
-	# Do it manually here.
-	rm -rf $(PKGDIR)-pdfimport
-	mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/program
-	mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/share/registry
-	mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/share/xpdfimport
-	for i in program/xpdfimport share/xpdfimport share/registry/pdfimport.xcd; do \
-		mv $(PKGDIR)-common/$(OODIR)/$$i \
-			$(PKGDIR)-pdfimport/$(OODIR)/$$i; \
-	done
-	for i in program/xpdfimport program/pdfimport.uno.so; do \
-		mv $(PKGDIR)-core/$(OODIR)/$$i \
-			$(PKGDIR)-pdfimport/$(OODIR)/$$i; \
-	done
-
 	find debian/tmp ! -perm -200 | xargs -r chmod u+w
 
 	touch $@
@@ -2355,13 +2337,13 @@ ifneq "$(ENABLE_REPORTDESIGN)" "y"
 	# unneeded. a no-Java arch, so the report-builder can't work anyway.
 	# (and we need to remove it here anyway as it otherwise would end up
 	# in -base)
-	rm -f $(PKGDIR)-base/$(OODIR)/program/librpt*
+	rm -rf $(PKGDIR)-report-builder
 else
   ifeq "$(PACKAGE_BASE)" "y"
 	# move rpt stuff into -report-builder-bin
 	rm -rf $(PKGDIR)-report-builder-bin
 	mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
-	mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
+	mv $(PKGDIR)-report-builder/$(OODIR)/program/librpt* \
 		$(PKGDIR)-report-builder-bin/$(OODIR)/program
   endif
 endif
@@ -2662,15 +2644,6 @@ ifeq "$(ENABLE_JAVA)" "y"
   endif
 endif
 
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
-  ifeq "$(ENABLE_JAVA)" "y"
-	for i in THIRDPARTYREADMELICENSE.html readme_en-US.html readme_en-US.txt \
-		registration/LICENSE; do \
-		rm -f $(PKGDIR)-report-builder/$(OODIR)/share/extensions/report-builder/$$i; \
-	done
-  endif
-endif
-
 ifeq "$(ENABLE_MEDIAWIKI)" "y"
 	rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html
 endif
@@ -3037,7 +3010,6 @@ ifeq "$(ENABLE_JAVA)" "y"
         done
 endif
 	dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-		-Nlibreoffice-report-builder \
 		-Nlibreoffice-wiki-publisher \
 		-Nfonts-opensymbol \
 		-Nopenoffice.org-dtd-officedocument1.0 -- \
@@ -3067,8 +3039,7 @@ ifeq "$(ENABLE_REPORTDESIGN)" "y"
 	dh_gencontrol -plibreoffice-report-builder -- \
 		-V'base-version=$(BASE_VERSION)' \
 		-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
-		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-		-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/util/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)'
 endif
 	dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
 		-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 0b56556..c5e5827 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -116,7 +116,7 @@ create_package_directory gid_Module_Optional_Extensions_MINIMIZER	pkg/libreoffic
 create_package_directory gid_Module_Optional_Extensions_MySQLConnector  pkg/libreoffice-mysql-connector
 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_Reportbuilder	pkg/libreoffice-report-builder
 create_package_directory gid_Module_Optional_PostgresqlSdbc     pkg/libreoffice-sdbc-postgresql
 move_wrappers pkg/libreoffice-common soffice unopkg
 move_wrappers pkg/libreoffice-common libreoffice loffice lofromtemplate

-- 
LibreOffice packaging repository
Reply to: