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

r806 ./packages/openofficeorg/2.3/experimental: move *rpt* in to a -reportdesign package; register the reportdesign.oxt extension to actually get this feature, install *updchk* again

------------------------------------------------------------
revno: 806
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2007-07-28 13:00:35 +0200
message:
  move *rpt* in to a -reportdesign package; register the reportdesign.oxt extension to actually get this feature, install *updchk* again
added:
  openoffice.org-reportdesigner.postinst.in
  openoffice.org-reportdesigner.preinst.in
  openoffice.org-reportdesigner.prerm.in
modified:
  changelog
  control
  control.in
  rules

=== added file 'openoffice.org-reportdesigner.postinst.in'
--- a/openoffice.org-reportdesigner.postinst.in	1970-01-01 00:00:00 +0000
+++ b/openoffice.org-reportdesigner.postinst.in	2007-07-28 11:00:35 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=openoffice.org-reportdesigner
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
+	/usr/lib/openoffice/program/unopkg add --shared \
+		/usr/lib/openoffice/share/extension/install/reportdesign.oxt
+fi
+
+#DEBHELPER#
+
+exit 0

=== added file 'openoffice.org-reportdesigner.preinst.in'
--- a/openoffice.org-reportdesigner.preinst.in	1970-01-01 00:00:00 +0000
+++ b/openoffice.org-reportdesigner.preinst.in	2007-07-28 11:00:35 +0000
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+# preinst script for openoffice.org-sdbc-reportdesigner
+
+THIS_PACKAGE=openoffice.org-reportdesigner
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+	upgrade)
+		/usr/lib/openoffice/program/unopkg remove --shared \
+			com.sun.reportdesigner
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== added file 'openoffice.org-reportdesigner.prerm.in'
--- a/openoffice.org-reportdesigner.prerm.in	1970-01-01 00:00:00 +0000
+++ b/openoffice.org-reportdesigner.prerm.in	2007-07-28 11:00:35 +0000
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+# preinst script for openoffice.org-sdbc-reportdesigner
+
+THIS_PACKAGE=openoffice.org-reportdesigner
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+	remove)
+		/usr/lib/openoffice/program/unopkg remove --shared \
+			com.sun.reportdesigner
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== modified file 'changelog'
--- a/changelog	2007-07-26 15:21:49 +0000
+++ b/changelog	2007-07-28 11:00:35 +0000
@@ -9,7 +9,7 @@
       (closes: #386250)
   * ooo-build:
     - use trunk again
-    - update (r9939)
+    - update (r9957)
       + apply Split section. Fixes the binfilter split so that StarWriter
         3.0-5.0 etc. do not appear anymore when -filter-binfilter is not
         installed (indirectly closes: #421274)
@@ -44,6 +44,8 @@
     - reenable km again due to demand of the Khmer people... [RE]
     - uuencode all ooo-build/desktop icons [CC]
     - add USE_SYSTEM_VIGRA conditional, enable it [RE]
+    - install *updchk* again, as the extension manager UI now apparently
+      needs this one, too...
   * debian/control.in:
     - build-depend on libxml-parser-perl [RE]
     - Add XS-Vcs-{Bzr,Svn} fields [RE]
@@ -60,10 +62,12 @@
   * debian/scripts/fix_image_rgb: add [RE]
   * debian/openoffice.org-core.shlibs.local: add
     libuno_purpenvhelpergcc3 [RE]
+  * debian/rules, debian/openoffice.org-reportdesigner*: properly
+    install/package the reportdesigner extension [RE]
 
    (CC = Chris Cheney)
 
- -- Rene Engelhard <rene@debian.org>  Thu, 26 Jul 2007 16:05:34 +0200
+ -- Rene Engelhard <rene@debian.org>  Fri, 27 Jul 2007 23:00:50 +0200
 
 openoffice.org (2.2.1-6) unstable; urgency=low
 

=== modified file 'control'
--- a/control	2007-07-26 15:21:49 +0000
+++ b/control	2007-07-28 11:00:35 +0000
@@ -468,6 +468,17 @@
  This package contains the Document Type Definition (DTD) of the
  OpenOffice.org 1.x(!) XML file format.
 
+Package: openoffice.org-reportdesigner
+Section: misc
+Priority: optional
+Architecture: i386 powerpc sparc amd64 ppc64
+Depends: ${shlibs:Depends}, openoffice.org-base (>= 2.3.0~src680m220), openoffice.org-core
+Description: OpenOffice.org Report Designer extension
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a report design extension.
+
 Package: openoffice.org-l10n-af
 Architecture: all
 Depends: locales | belocs-locales-data | locales-all

=== modified file 'control.in'
--- a/control.in	2007-07-23 20:07:00 +0000
+++ b/control.in	2007-07-28 11:00:35 +0000
@@ -711,3 +711,14 @@
  This package contains the Document Type Definition (DTD) of the
  OpenOffice.org 1.x(!) XML file format.
 
+Package: openoffice.orgVER-reportdesigner
+Section: misc
+Priority: optional
+Architecture: %OOO_ARCHS%
+Depends: ${shlibs:Depends}, openoffice.orgVER-base (>= 2.3.0~src680m220), openoffice.org-core
+Description: OpenOffice.org Report Designer extension
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a report design extension.
+

=== modified file 'rules'
--- a/rules	2007-07-26 15:21:49 +0000
+++ b/rules	2007-07-28 11:00:35 +0000
@@ -1971,6 +1971,20 @@
 	install -D -m644 $(SOURCE_TREE)/scsolver/ChangeLog \
 		$(PKGDIR)-calc/usr/share/doc/openoffice.org$(VER)-calc/changelog.scsolver
 
+	# move rpt stuff into -reportdesigner
+	rm -rf $(PKGDIR)-reportdesigner
+	mkdir -p $(PKGDIR)-reportdesigner/$(OODIR)/program
+	mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
+		$(PKGDIR)-reportdesigner/$(OODIR)/program
+ifeq "$(ENABLE_JAVA)" "y"
+	# install this; we need to register this ourselved later in
+	# the maintainer scripts. This is intended upstream (**rpt* stuff
+	# in 2.3 and the actual designer as an extension, without which
+	# the *rpt* stuff is a no-op.
+	install -D -m644 $(SOURCE_TREE)/reportdesign/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/reportdesign.oxt \
+		$(PKGDIR)-reportdesigner/$(OODIR)/share/extension/install/reportdesign.oxt
+endif
+
 	for i in $(ARCH_DEP_PACKAGES); do \
 		install -D -m644 debian/presubj \
 			debian/$$i/usr/share/bug/$$i/presubj; \
@@ -1979,7 +1993,7 @@
 				debian/$$i/usr/share/bug/$$i/control; \
 		fi ;\
 	done
-	
+
 	touch $@
 	
 broffice: $(STAMP_DIR)/broffice
@@ -2285,8 +2299,7 @@
 	# Add them now because openoffice.org-help-* packaged in contrib or so
 	# will need them
 	set -e; \
-	for z in images.zip images_industrial.zip images_crystal.zip images_hicontrast.zip\
-		images_tango.zip; do \
+	for z in images.zip images_industrial.zip images_crystal.zip images_hicontrast.zip images_tango.zip; do \
 		echo "repackaging $$z..."; \
 		rm -rf $$z; mkdir $$z; \
 		cd $$z; \
@@ -2379,8 +2392,6 @@
 		ln -s /$(OODIR)/sdk/examples examples
 endif
 
-	rm -f $(PKGDIR)-core/$(OODIR)/program/*updchk*
-
 ifneq "$(DIST)" "Ubuntu"
 	perl -pi -e "s/Ubuntu helper/helper/" $(PKGDIR)-common/$(OODIR)/program/soffice
 	perl -pi -e "s/Ubuntu config/config/" $(PKGDIR)-common/$(OODIR)/program/soffice
@@ -2488,7 +2499,7 @@
 # This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
 # causes ldd crashes sometimes when used with fakeroot:
 #          -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
-	dh_gencontrol -s -- \
+	dh_gencontrol -s -Nopenoffice.org$(VER)-reportdesigner -- \
 		-V'base-version=$(BASE_VERSION)' \
 		-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
 		-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
@@ -2504,6 +2515,8 @@
 		-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
 		-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
 		-v$(BINARY_VERSION)
+	dh_gencontrol -popenoffice.org$(VER)-reportdesigner -- \
+		-v$(shell grep "<version" $(SOURCE_TREE)/reportdesign/util/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo$(BINARY_VERSION)
 	dh_md5sums -s
 	dh_builddeb -s
Reply to: