./packages/openofficeorg/3.1/experimental r1384: merge

To: debian-openoffice@lists.debian.org
Subject: ./packages/openofficeorg/3.1/experimental r1384: merge
From: Rene Engelhard <rene@debian.org>
Date: Thu, 08 Jan 2009 22:31:04 +0100
Message-id: <[🔎] E1LL2Ws-0000BU-EJ@alioth.debian.org>

------------------------------------------------------------
revno: 1384
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2009-01-08 22:31:04 +0100
message:
  merge
modified:
  changelog
  control
  control.in
  rules
    ------------------------------------------------------------
    revno: 1332.1.37
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Thu 2009-01-08 03:09:31 +0100
    message:
      fix -kdes description: remove KDE adressbook mentioning, it's in -kab
    modified:
      changelog
      control
      control.in
    ------------------------------------------------------------
    revno: 1332.1.38
    committer: Rene Engelhard <rene@debian.org>
    branch nick: experimental
    timestamp: Thu 2009-01-08 22:26:37 +0100
    message:
      -common Breaks: old openclipart-openoffice.org
      $(OODIR)/sdk -> $(OOSDKDIR)
      update ooo-build
    modified:
      changelog
      control
      control.in
      rules

=== modified file 'changelog'
--- a/changelog	2009-01-08 00:03:03 +0000
+++ b/changelog	2009-01-08 21:31:04 +0000
@@ -35,6 +35,9 @@
 
 openoffice.org (1:3.0.1~rc1-2.3pre) experimental; urgency=low
 
+  * ooo-build:
+    - update (r15033):
+      - remove workaround for #i97491 again
   * build without stray ure.links (closes: #509793)
   * debian/startcenter.desktop.in: use ooo-gulls.png as Icon 
   * debian/rules:
@@ -43,11 +46,14 @@
     - remove rest of if(n)eq ETCH_BACKPORT conditionals
     - fix extra license/readme file removal
     - remove empty .../ure/lib dir in -common
+    - fix OOSDKDIR setting and move all $(OODIR)/sdk to $(OOSDKDIR)
   * debian/control.reportdesign.in:
     - add missing Depends: on ${java-runtime-depends}
   * debian/control.in:
     - only recommend ttf-liberation and change it to
       ttf-liberation | msttcorefonts (closes: #509193) 
+    - fix -kdes description: remove KDE adressbook mentioning, it's in -kab
+    - -common Breaks: openclipart-openoffice.org (<= 0.18+dfsg-5)
   * debian/rules, control.gcj.in: disable ppc for -gcj as gij doesn't work
     there anyway (#478760). Fix Architecture: of -gcj to not include
     non-Java archs.
@@ -56,7 +62,7 @@
   * debian/presubj: point to OpenOffice.orgs README sections
     ("Problems During Program Startup" and "File Locking"). 
 
- -- Rene Engelhard <rene@debian.org>  Wed, 07 Jan 2009 21:14:24 +0100
+ -- Rene Engelhard <rene@debian.org>  Thu, 08 Jan 2009 18:00:58 +0100
 
 openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
 

=== modified file 'control'
--- a/control	2009-01-08 00:03:03 +0000
+++ b/control	2009-01-08 21:31:04 +0000
@@ -117,9 +117,10 @@
 Depends: openoffice.org-style-galaxy
 Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
 Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
+Breaks: openclipart-openoffice.org (<= 0.18+dfsg-5)
 Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version})
 Provides: openoffice.org2-common, openoffice.org-l10n-en-us
-Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org (<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us, openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base (<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1)
+Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org (<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us, openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base (<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1), openoffice.org-core (<< 1:3.0.1~rc1-3)
 Description: OpenOffice.org office suite architecture independent files
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -334,8 +335,7 @@
  a near drop-in replacement for Microsoft(R) Office.
  .
  This package contains the KDE plugin for drawing OOo's widgets with
- KDE/Qt, a KDEish File Picker when running under KDE and KDE Addressbook
- integration.
+ KDE/Qt and a KDEish File Picker when running under KDE.
  You can extend the functionality of this by installing these packages:
  .
   * konqueror / kmail

=== modified file 'control.in'
--- a/control.in	2008-12-26 00:09:24 +0000
+++ b/control.in	2009-01-08 21:31:04 +0000
@@ -261,6 +261,7 @@
  openoffice.orgVER-style-hicontrast
 Recommends: openoffice.orgVER-style-tango,
  openoffice.orgVER-style-crystal
+Breaks: openclipart-openoffice.org (<= 0.18+dfsg-5)
 Conflicts: openoffice.org-debian-files, 
  openoffice.org-mimelnk,
  openoffice.org2-common,
@@ -286,7 +287,8 @@
  openoffice.org-calc (<< 2.0.4~rc1),
  openoffice.org-base (<< 2.0.4~rc1),
  openoffice.org-math (<< 2.0.4~rc1),
- broffice.org (<< 2.2.1~rc1-1)
+ broffice.org (<< 2.2.1~rc1-1),
+ openoffice.org-core (<< 1:3.0.1~rc1-3)
 Description: OpenOffice.org office suite architecture independent files
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -568,8 +570,7 @@
  a near drop-in replacement for Microsoft(R) Office.
  .
  This package contains the KDE plugin for drawing OOo's widgets with
- KDE/Qt, a KDEish File Picker when running under KDE and KDE Addressbook
- integration.
+ KDE/Qt and a KDEish File Picker when running under KDE.
  You can extend the functionality of this by installing these packages:
  .
   * konqueror / kmail

=== modified file 'rules'
--- a/rules	2009-01-08 00:03:03 +0000
+++ b/rules	2009-01-08 21:31:04 +0000
@@ -43,7 +43,7 @@
 OODIRNAME=openoffice$(VER)
 OOBRANDDIR:=usr/lib/$(OODIRNAME)
 OOBASISDIR:=$(OOBRANDDIR)/basis$(OOVER)
-OOSDKDIR:=$(OOBRANDDIR)/sdk
+OOSDKDIR:=$(OOBASISDIR)/sdk
 OOUREDIR:=usr/lib/ure
 # compatability
 OODIR:=$(OOBASISDIR)
@@ -1744,14 +1744,14 @@
 		$(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev && \
 	mv $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/sdk/docs \
 		$(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev
-	mkdir -p $(PKGDIR)-dev-doc/$(OODIR)/sdk
+	mkdir -p $(PKGDIR)-dev-doc/$(OOSDKDIR)
 	mv $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/sdk/index.html \
-		$(PKGDIR)-dev-doc/$(OODIR)/sdk
-	rm -f $(PKGDIR)-dev/$(OODIR)/sdk/index.html
+		$(PKGDIR)-dev-doc/$(OOSDKDIR)
+	rm -f $(PKGDIR)-dev/$(OOSDKDIR)/index.html
 	rm -rf $(PKGDIR)-dev/usr/share/doc/openoffice.org \
 		$(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/sdk
-	mv $(PKGDIR)-dev/$(OODIR)/sdk/examples \
-		$(PKGDIR)-dev-doc/$(OODIR)/sdk
+	mv $(PKGDIR)-dev/$(OOSDKDIR)/examples \
+		$(PKGDIR)-dev-doc/$(OOSDKDIR)
 endif
 
 	# fixup ure-link symlink. The move is done in install-arch
@@ -2203,40 +2203,40 @@
   endif
   ifeq "$(ENABLE_JAVA)" "y"
 	# move SDK Java stuff into /usr/share/java/openoffice
-	rm -f $(PKGDIR)-dev/$(OODIR)/sdk/classes
+	rm -f $(PKGDIR)-dev/$(OOSDKDIR)/classes
 	mkdir -p $(PKGDIR)-dev/usr/share/java/$(OODIRNAME)/win
 	mkdir -p $(PKGDIR)-dev/usr/share/java/$(OODIRNAME)/com/sun/star/lib/loader
-	mkdir -p $(PKGDIR)-dev/$(OODIR)/sdk/classes/com/sun/star/lib/loader
+	mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/classes/com/sun/star/lib/loader
 	mv $(PKGDIR)-dev/usr/share/openoffice$(VER)/sdk/classes/com/sun/star/lib/loader/* \
 		$(PKGDIR)-dev/usr/share/java/$(OODIRNAME)/com/sun/star/lib/loader && \
 	mv $(PKGDIR)-dev/usr/share/openoffice$(VER)/sdk/classes/win \
-		$(PKGDIR)-dev/$(OODIR)/sdk/classes
-	chmod 644 $(PKGDIR)-dev/$(OODIR)/sdk/classes/win/unowinreg.dll
-	cd $(PKGDIR)-dev/$(OODIR)/sdk/classes/com/sun/star/lib/loader && \
+		$(PKGDIR)-dev/$(OOSDKDIR)/classes
+	chmod 644 $(PKGDIR)-dev/$(OOSDKDIR)/classes/win/unowinreg.dll
+	cd $(PKGDIR)-dev/$(OOSDKDIR)/classes/com/sun/star/lib/loader && \
 		for i in $(CURDIR)/$(PKGDIR)-dev/usr/share/java/$(OODIRNAME)/com/sun/star/lib/loader/*.class; do \
 			ln -s `echo $$i | sed -e 's,$(CURDIR)/$(PKGDIR)-dev,,'` `basename $$i`; \
 		done
 	rm -rf $(PKGDIR)-dev/usr/share/openoffice$(VER)/sdk
   endif
-	chmod 644 $(PKGDIR)-dev/$(OODIR)/sdk/configure.pl
+	chmod 644 $(PKGDIR)-dev/$(OOSDKDIR)/configure.pl
 	for i in csh csh.in; do \
 		perl -pi -e 's,/usr/bin/csh,/bin/csh,'\
-			$(PKGDIR)-dev/$(OODIR)/sdk/setsdkenv_unix.$$i; \
+			$(PKGDIR)-dev/$(OOSDKDIR)/setsdkenv_unix.$$i; \
 	done
 	# create wrapper scripts
-	cd $(PKGDIR)-dev/$(OODIR)/sdk/bin && \
+	cd $(PKGDIR)-dev/$(OOSDKDIR)/bin && \
 	for i in *; do \
 		mv $$i $$i.bin && \
 		( \
 		  echo "#!/bin/sh"; \
 		  echo "# wrapper script for OOos SDK programs"; \
 		  echo ""; \
-		  echo 'LD_LIBRARY_PATH=/$(OOUREDIR)/lib /$(OODIR)/sdk/bin/`basename $$0`.bin "$$@"'; \
+		  echo 'LD_LIBRARY_PATH=/$(OOUREDIR)/lib /$(OOSDKDIR)/bin/`basename $$0`.bin "$$@"'; \
 		) > $$i; \
 		chmod 755 $$i; \
 	done
         # remove symlink, it should be in -dev-doc
-	cd $(PKGDIR)-dev/$(OODIR)/sdk && \
+	cd $(PKGDIR)-dev/$(OOSDKDIR) && \
 		rm docs
 
 	# install gsicheck into -dev
@@ -2590,13 +2590,13 @@
 ifeq "$(PACKAGE_SDK)" "y"
 	chmod 644 $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/images/bg_table2.gif
 	chmod 644 $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/images/bg_table3.gif
-	chmod 644 $(PKGDIR)-dev-doc/$(OODIR)/sdk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
-	chmod 644 $(PKGDIR)-dev-doc/$(OODIR)/sdk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
-	chmod 644 `find $(PKGDIR)-dev-doc/$(OODIR)/sdk/examples/java/Inspector -type f | xargs`
-	chmod 644 `find $(PKGDIR)-dev-doc/$(OODIR)/sdk/examples/java/EmbedDocument -type f | xargs`
+	chmod 644 $(PKGDIR)-dev-doc/$(OOSDKDIR)/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
+	chmod 644 $(PKGDIR)-dev-doc/$(OOSDKDIR)/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
+	chmod 644 `find $(PKGDIR)-dev-doc/$(OOSDKDIR)/examples/java/Inspector -type f | xargs`
+	chmod 644 `find $(PKGDIR)-dev-doc/$(OOSDKDIR)/examples/java/EmbedDocument -type f | xargs`
 	rm -f $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev-doc/LICENSE
 	perl -pi -e 's,license.html,http://www.gnu.org/licenses/lgpl.html,' \
-		$(PKGDIR)-dev-doc/$(OODIR)/sdk/index.html
+		$(PKGDIR)-dev-doc/$(OOSDKDIR)/index.html
 
   ifeq "$(ENABLE_JAVA)" "y"
         # fix links
@@ -2839,26 +2839,26 @@
 
 ifeq "$(PACKAGE_SDK)" "y"
 	# add symlinks for docs and examples
-	cd $(PKGDIR)-dev-doc/$(OODIR)/sdk && \
+	cd $(PKGDIR)-dev-doc/$(OOSDKDIR) && \
 		rm -rf docs && \
 		ln -sf /usr/share/doc/openoffice.org-dev/docs docs
 	cd $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev-doc && \
 		ln -s /usr/share/doc/openoffice.org-dev/docs docs
 	cd $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev-doc && \
-		ln -s /$(OODIR)/sdk/examples examples
+		ln -s /$(OOSDKDIR)/examples examples
 	cd $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev && \
-		ln -s /$(OODIR)/sdk/examples examples
+		ln -s /$(OOSDKDIR)/examples examples
 	# and the index
 	cd $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev && \
-		ln -s /$(OODIR)/sdk/index.html index.html
+		ln -s /$(OOSDKDIR)/index.html index.html
 endif
 
-#ifneq "$(DIST)" "Ubuntu"
-#	# ooo-build has a patch with this hardcoded.
-#	perl -pi -e "s/Ubuntu helper/helper/" $(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
-#	perl -pi -e "s/Ubuntu config/config/" $(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
-#	perl -pi -e "s/Ubuntu stuff/stuff/" $(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
-#endif
+ifneq "$(DIST)" "Ubuntu"
+	# ooo-build has a patch with this hardcoded.
+	perl -pi -e "s/Ubuntu helper/helper/" $(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+	perl -pi -e "s/Ubuntu config/config/" $(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+	perl -pi -e "s/Ubuntu stuff/stuff/" $(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+endif
 
 ifeq "$(ENABLE_MEDIAWIKI)" "y"
 	rm -rf $(PKGDIR)-wiki-publisher

Reply to:

Prev by Date: ./packages/openofficeorg/3.0.1/experimental r1370: -common Breaks: old openclipart-openoffice.org
Next by Date: ./packages/openofficeorg/3.0.1/experimental r1371: install ooo-build/NEWS
Previous by thread: ./packages/openofficeorg/3.0.1/experimental r1370: -common Breaks: old openclipart-openoffice.org
Next by thread: ./packages/openofficeorg/3.0.1/experimental r1371: install ooo-build/NEWS
Index(es):
- Date
- Thread