------------------------------------------------------------
revno: 1379
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Wed 2009-01-07 03:07:15 +0100
message:
update ooo-build; update for ooo-build now installing into -qa-tools
directly; merge
modified:
changelog
presubj
rules
------------------------------------------------------------
revno: 1332.1.32
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2009-01-07 02:37:19 +0100
message:
* debian/presubj: point to OpenOffice.orgs README section
modified:
changelog
copyright
presubj
------------------------------------------------------------
revno: 1332.1.33
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2009-01-07 02:38:14 +0100
message:
oops
modified:
copyright
------------------------------------------------------------
revno: 1332.1.34
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2009-01-07 02:54:22 +0100
message:
fix extra license/readme file removal
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-07 00:09:13 +0000
+++ b/changelog 2009-01-07 02:07:15 +0000
@@ -4,7 +4,7 @@
- build without -march=armv5te for arm (closes: #501957)
- lbnames.h supports gcc 4.4 (closes: #505669)
* ooo-build:
- - back on trunk (r14987)
+ - back on trunk (r15008)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -39,6 +39,7 @@
- apply Python26 patchset if building with python 2.6
- install libsalalloc_malloc.so.3 into -qa-tools
- remove rest of if(n)eq ETCH_BACKPORT conditionals
+ - fix extra license/readme file removal
* debian/control.reportdesign.in:
- add missing Depends: on ${java-runtime-depends}
* debian/control.in:
@@ -49,8 +50,10 @@
non-Java archs.
* debian/rules, debian/broffice.org.{preinst,postrm}.in: also change
UI-brand.xcu for BrOffice.org
+ * debian/presubj: point to OpenOffice.orgs README sections
+ ("Problems During Program Startup" and "File Locking").
- -- Rene Engelhard <[email protected]> Fri, 02 Jan 2009 06:08:18 +0100
+ -- Rene Engelhard <[email protected]> Wed, 07 Jan 2009 02:53:42 +0100
openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
=== modified file 'presubj'
--- a/presubj 2008-07-30 01:52:28 +0000
+++ b/presubj 2009-01-07 01:37:19 +0000
@@ -18,7 +18,13 @@
causing it). Otherwise, don't file a bug, we can't look at it anyway.
IV) Please attach a backtrace if possible (see README.Debian). Install
- openoffice.org-dbg before doing this (and the packages it Recommends)
+ openoffice.org-dbg before doing this (and the packages it Recommends).
+
+ Please also read /usr/share/doc/openoffice.org-common/README.gz for common
+ problems ("Problems During Program Startup")
+ If you have NFS/Samba/... file locking problems (i.e. files opened
+ read-only when they should be read-write), also see the "File Locking"
+ section in above file.
V) If the bug is also in the version you can get from www.openoffice.org, file
it there in the first place. If you really think this also should be a bug
=== modified file 'rules'
--- a/rules 2009-01-07 00:30:48 +0000
+++ b/rules 2009-01-07 02:07:15 +0000
@@ -1664,14 +1664,6 @@
done
endif
-ifeq "$(PACKAGE_QA_TOOLS)" "y"
- cd debian/tmp/pkg; \
- mv openoffice.org-common/$(OODIR)/program/testtoolrc \
- openoffice.org-core/$(OODIR)/program
-else
- cd debian/tmp/pkg; \
- rm -f openoffice.org-common/$(OODIR)/program/testtoolrc
-endif
# remove eventually sneaked in .testtoolrc
cd debian/tmp/pkg; \
rm -f openoffice.org-common/$(OODIR)/program/.testtoolrc
@@ -2082,10 +2074,10 @@
install -m755 $(SOURCE_TREE)/ootesttool$(VER) $(PKGDIR)-qa-tools/usr/bin
install -m755 $(SOURCE_TREE)/oosmoketest$(VER)
$(PKGDIR)-qa-tools/usr/bin
- mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/program
- for f in testtool.bin libcommuni* libsimplecm*; do \
- mv $(PKGDIR)-core/$(OODIR)/program/$$f
$(PKGDIR)-qa-tools/$(OODIR)/program; \
- done
+ rm -rf $(PKGDIR)-qa-tools $(PKGDIR)-qa-tools.*.debhelper
+ cp -r --preserve=mode debian/tmp/pkg/openoffice.org-qa-tools \
+ debian/openoffice.org-qa-tools
+
install -D -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh;
echo $$UPD)/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/lib/libsalalloc_malloc.so.3
$(PKGDIR)-qa-tools/$(OOUREDIR)/lib/libsalalloc_malloc.so.3
ifeq "$(ENABLE_JAVA)" "y"
@@ -2106,14 +2098,8 @@
install -m644 $(SOURCE_TREE)/smoketestoo_native/data/scripts/*.x* \
$(PKGDIR)-qa-tools/$(OODIR)/presets/basic/Standard
- mv $(PKGDIR)-core/$(OODIR)/program/testtoolrc \
- $(PKGDIR)-qa-tools/$(OODIR)/program && \
- chmod 644 $(PKGDIR)-qa-tools/$(OODIR)/program/testtoolrc
else
- rm -f $(PKGDIR)-core/$(OODIR)/program/testtool.bin
- rm -f $(PKGDIR)-core/$(OODIR)/program/libcommuni*
- rm -f $(PKGDIR)-core/$(OODIR)/program/libsimplecm*
- rm -f $(PKGDIR)-common/$(OODIR)/program/testtoolrc
+ rm -f debian/tmp/pkg/openoffice.org-qa-tools
endif
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
@@ -2744,14 +2730,16 @@
endif
endif
# remove extra license files
- rm -rf $(PKGDIR)-commmon/$(OOBRANDDIR)/licenses
+ rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/licenses
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/LICENSE*
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/THIRDPARTYLICENSEREADME.html
- rm -f $(PKGDIR)-common/$(OOBRANDIR)/LICENSE.html
+ rm -f $(PKGDIR)-common/$(OOBRANDDIR)/LICENSE.html
# remove extra readme files
rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/readmes
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/README*
+ rm -f $(PKGDIR)-common/$(OOBRANDDIR)/README.html
+ rm -f $(PKGDIR)-common/$(OOBRANDDIR)/README
# install ooo-build desktop icons
for r in 16x16 22x22 24x24 32x32 48x48; do \
