------------------------------------------------------------
revno: 1236
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-01-14 12:58:50 +0100
message:
backport some tiny, hopefully uncontroversial stuff
modified:
changelog
presubj
rules
=== modified file 'changelog'
--- a/changelog 2008-12-23 13:31:12 +0000
+++ b/changelog 2009-01-14 11:58:50 +0000
@@ -2,8 +2,12 @@
* debian/control.in:
- openoffice.org-base-core needs to depend on openoffice.org-core....
+ * debian/rules:
+ - fix extra license/readme file removal
* debian/control.reportdesign.in:
- add missing Depends: on ${java-runtime-depends}
+ * debian/presubj: point to OpenOffice.orgs README sections
+ ("Problems During Program Startup" and "File Locking").
-- Rene Engelhard <r...@debian.org> Sun, 14 Dec 2008 23:49:35 +0100
=== modified file 'presubj'
--- a/presubj 2006-12-02 11:58:06 +0000
+++ b/presubj 2009-01-14 11:58:50 +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 2008-12-23 21:03:07 +0000
+++ b/rules 2009-01-14 11:58:50 +0000
@@ -2590,7 +2590,7 @@
endif
endif
# remove extra license files
- rm -rf $(PKGDIR)-commmon/$(OODIR)/licenses
+ rm -rf $(PKGDIR)-common/$(OODIR)/licenses
rm -rf $(PKGDIR)-common/$(OODIR)/share/readme/LICENSE*
rm -f $(PKGDIR)-common/$(OODIR)/THIRDPARTYLICENSEREADME.html
rm -f $(PKGDIR)-common/$(OODIR)/LICENSE.html
@@ -2598,6 +2598,8 @@
# remove extra readme files
rm -rf $(PKGDIR)-common/$(OODIR)/readmes
rm -rf $(PKGDIR)-common/$(OODIR)/share/readme/README*
+ rm -f $(PKGDIR)-common/$(OODIR)/README.html
+ rm -f $(PKGDIR)-common/$(OODIR)/README
# install Ximian desktop icons
for r in 16x16 22x22 24x24 32x32 48x48; do \
