./packages/openofficeorg/3.0/experimental r1222: merge

To: debian-openoffice@lists.debian.org
Subject: ./packages/openofficeorg/3.0/experimental r1222: merge
From: Rene Engelhard <rene@debian.org>
Date: Sat, 16 Aug 2008 02:49:17 -0300
Message-id: <[🔎] E1KUEgK-0004zj-G0@alioth.debian.org>

------------------------------------------------------------
revno: 1222
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2008-08-16 02:49:17 -0300
message:
  merge
modified:
  changelog
  control
  control.in
  control.reportdesign.in
  rules
    ------------------------------------------------------------
    revno: 1022.1.143
    committer: Rene Engelhard <rene@debian.org>
    branch nick: unstable
    timestamp: Sat 2008-08-16 02:23:17 -0300
    message:
      split librpt* out into a -report-builder-bin package
    modified:
      changelog
      control.reportdesign.in
      rules
    ------------------------------------------------------------
    revno: 1022.1.144
    committer: Rene Engelhard <rene@debian.org>
    branch nick: unstable
    timestamp: Sat 2008-08-16 02:25:48 -0300
    message:
      Replaces: openoffice.org-java-common (= 1:2.4.1-3~bpo40+1) at -base
    modified:
      changelog
      control.in
    ------------------------------------------------------------
    revno: 1022.1.145
    committer: Rene Engelhard <rene@debian.org>
    branch nick: unstable
    timestamp: Sat 2008-08-16 02:32:36 -0300
    message:
      fix hsqldbjar location in internal hsqldb case
    modified:
      changelog
      rules
    ------------------------------------------------------------
    revno: 1022.1.146
    committer: Rene Engelhard <rene@debian.org>
    branch nick: unstable
    timestamp: Sat 2008-08-16 02:40:19 -0300
    message:
      better comment
    modified:
      changelog
    ------------------------------------------------------------
    revno: 1022.1.147
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Sat 2008-08-16 02:45:26 -0300
    message:
      regenerate control
    modified:
      control

=== modified file 'changelog'
--- a/changelog	2008-08-16 02:33:23 +0000
+++ b/changelog	2008-08-16 05:49:17 +0000
@@ -27,6 +27,8 @@
     - build with OpenJDK
     - add conditional to decide whether to build with Suns Solver or Koheis
       as ooo-build supports it. Use Suns solver for now
+    - put hsqldb.jar also to -base  with internal hsqldb so that we don't
+      get file differences between sids package and backports.
   * debian/rules, debian/control.help.in: recommend
     liblucene2-java/openoffice.org-java-common. We don't depend on it as we
     don't want to make the help depend on Java (lucene is needed for "search"
@@ -49,6 +51,9 @@
     - fix -andromedas Replaces:
     - Homepage: http://www.go-oo.org, thanks Renato Yamane
     - move bsh from Depends to Suggests at -java-common
+    - For upgrades from 1:2.4.1-3~bpo40+1 add a Replaces:
+      openoffice.org-java-common (= 1:2.4.1-3~bpo40+1) to -base because of
+      hsqldb, see below.
   * debian/control.ure.in:
     - uno-libs3-dbg is Priority: extra
   * debian/copyright:
@@ -57,6 +62,10 @@
   * debian/rules, debian/control.in,
     openoffice.org-headless.lintian-overrides: libvclplug_svp is now in
     -coreXY upstream. Follow.
+  * debian/rules, debian/control.reportdesign.in:
+    - split librpt* out into a -report-builder-bin package. Newer versions of
+      the SRB also often work with older librpt*/OOo, but that would not work
+      with the current packaging due to shlibdeps.
 
  -- Rene Engelhard <rene@debian.org>  Fri, 15 Aug 2008 19:03:00 -0300
 

=== modified file 'control'
--- a/control	2008-08-16 02:33:23 +0000
+++ b/control	2008-08-16 05:49:17 +0000
@@ -166,7 +166,6 @@
  a near drop-in replacement for Microsoft(R) Office.
  .
  This package contains the spreadsheet component for OpenOffice.org.
- It also contains the scsolver calc solver, replacing Suns solver.
 
 Package: openoffice.org-impress
 Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
@@ -223,7 +222,7 @@
 Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
 Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}
 Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java, openoffice.org-gcj, openoffice.org-report-builder
-Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-java
+Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.4.1-3~bpo40+1)
 Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-common (= 2.0.4-4)
 Provides: openoffice.org2-base
 Description: OpenOffice.org office suite - database
@@ -3242,7 +3241,7 @@
 Section: misc
 Priority: optional
 Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
-Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.org-base (>= 2.3.0~src680m225), openoffice.org-core (>> 1:2.3.0~oog680m1), openoffice.org-java-common (>= 1:2.3.0~oog680m1)
+Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.org-base (>= 2.3.0~src680m225), openoffice.org-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
 Conflicts: openoffice.org-reportdesigner
 Replaces: openoffice.org-reportdesigner
 Provides: openoffice.org-reportdesigner
@@ -3258,6 +3257,18 @@
   accomplish complex database reports."
 Homepage: http://extensions.services.openoffice.org/project/reportdesign
 
+Package: openoffice.org-report-builder-bin
+Section: misc
+Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1)
+Replaces: openoffice.org-report-builder
+Description: OpenOffice.org Report Builder extension - support libraries
+ OpenOffice.org 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.
+
 Package: openoffice.org-presentation-minimizer
 Section: misc
 Priority: optional

=== modified file 'control.in'
--- a/control.in	2008-08-11 02:31:06 +0000
+++ b/control.in	2008-08-16 05:49:17 +0000
@@ -440,7 +440,8 @@
  openoffice.org-bin (<< 1.9),
  openoffice.org-debian-files,
  openoffice.org2-base (<< ${Source-Version}),
- openoffice.org-java
+ openoffice.org-java,
+ openoffice.org-java-common (= 1:2.4.1-3~bpo40+1)
 Conflicts: openoffice.org-debian-files,
  openoffice.org2-base (<< ${Source-Version}),
  openoffice.org-common (= 2.0.4-4)

=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in	2008-04-14 10:30:53 +0000
+++ b/control.reportdesign.in	2008-08-16 05:23:17 +0000
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Architecture: %OOO_JAVA_ARCHS%
-Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.orgVER-base (>= 2.3.0~src680m225), openoffice.orgVER-core (>> 1:2.3.0~oog680m1), openoffice.org-java-common (>= 1:2.3.0~oog680m1)
+Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.orgVER-base (>= 2.3.0~src680m225), openoffice.orgVER-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
 Conflicts: openoffice.org-reportdesigner
 Replaces: openoffice.org-reportdesigner
 Provides: openoffice.org-reportdesigner
@@ -18,3 +18,15 @@
   accomplish complex database reports."
 Homepage: http://extensions.services.openoffice.org/project/reportdesign
 
+Package: openoffice.orgVER-report-builder-bin
+Section: misc
+Architecture: %OOO_JAVA_ARCHS%
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1)
+Replaces: openoffice.orgVER-report-builder
+Description: OpenOffice.org Report Builder extension - support libraries
+ OpenOffice.org 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.
+

=== modified file 'rules'
--- a/rules	2008-08-16 02:33:23 +0000
+++ b/rules	2008-08-16 05:49:17 +0000
@@ -1638,6 +1638,13 @@
 			openoffice.org-base/usr/share/java/$(OODIRNAME); \
 		ln -s /usr/share/java/$(OODIRNAME)/sdbc_hsqldb.jar \
 			openoffice.org-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
+	# we need this in -base. Otherwise we get unwanted package differences
+	# in the unstable version and backports which might use internal hsqldb
+  ifneq "$(SYSTEM_HSQLDB)" "y"
+	mkdir -p debian/tmp/pkg/openoffice.org-base/$(OODIR)/program/classes
+	mv debiam/tmp/pkg/openoffice.org-common/$(OODIR)/program/classes/hsqldb.jar \
+		debian/tmp/pkg/openoffice.org-base/$(OODIR)/program/classes
+  endif
 endif
 
 	# move .so to -dev
@@ -2400,9 +2407,10 @@
 ifeq "$(ENABLE_REPORTDESIGN)" "y"
 	# move rpt stuff into -report-builder
 	rm -rf $(PKGDIR)-report-builder
-	mkdir -p $(PKGDIR)-report-builder/$(OODIR)/program
+	rm -rf $(PKGDIR)-report-builder-bin
+	mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
 	mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
-		$(PKGDIR)-report-builder/$(OODIR)/program
+		$(PKGDIR)-report-builder-bin/$(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

Reply to:

Prev by Date: ./packages/openofficeorg/2.4.1/unstable r1169: regenerate control
Next by Date: ./packages/openofficeorg/2.4.1/unstable r1170: close #494512
Previous by thread: ./packages/openofficeorg/2.4.1/unstable r1169: regenerate control
Next by thread: ./packages/openofficeorg/2.4.1/unstable r1170: close #494512
Index(es):
- Date
- Thread