------------------------------------------------------------
revno: 1299
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-10-29 16:43:28 +0100
message:
merge, s/data/modules/
modified:
README.Debian-source
changelog
rules
------------------------------------------------------------
revno: 1022.1.186
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-10-22 20:46:11 +0200
message:
this one's gone upstream, too even in 2.4.1
modified:
README.Debian-source
changelog
------------------------------------------------------------
revno: 1022.1.187
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-10-22 20:48:10 +0200
message:
this one, too
modified:
README.Debian-source
------------------------------------------------------------
revno: 1022.1.188
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-10-22 20:51:00 +0200
message:
third time a a charm...
modified:
README.Debian-source
------------------------------------------------------------
revno: 1022.1.189
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-10-28 23:48:39 +0100
message:
typo
modified:
rules
=== modified file 'README.Debian-source'
--- a/README.Debian-source 2008-10-14 12:32:38 +0000
+++ b/README.Debian-source 2008-10-29 15:43:28 +0000
@@ -6,3 +6,4 @@
* system:
- dictionaries/{da_DK,en_GB,en_US,nl_NL,ru_RU}/hyph_*.dic:
hyphenation patterns violating licenses/having questionable license
+
=== modified file 'changelog'
--- a/changelog 2008-10-28 11:54:17 +0000
+++ b/changelog 2008-10-29 15:43:28 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:3.0.0-3.4pre) experimental; urgency=low
* ooo-build:
- - update (r14349)
+ - update (r14425)
- no-latex-filter-without-writer2latex.diff: don't include LaTeX stuff
in Writers filter list with --without-writer2latex (closes: #502549)
- sensible-browser.diff: run kde-open on mailto: URLs in kde-open-url.sh
@@ -14,7 +14,7 @@
* debian/rules, debian/broffice.org.{preinst,postrm}.in: fix Setup.xcu
diversion
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 28 Oct 2008 12:52:56 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 29 Oct 2008 16:42:34 +0100
openoffice.org (1:3.0.0-3) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-10-28 11:54:17 +0000
+++ b/rules 2008-10-29 15:43:28 +0000
@@ -1651,7 +1651,7 @@
# in the unstable version and backports which might use internal hsqldb
ifneq "$(USE_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 \
+ mv
debian/tmp/pkg/openoffice.org-common/$(OODIR)/program/classes/hsqldb.jar \
debian/tmp/pkg/openoffice.org-base/$(OODIR)/program/classes
endif
endif
@@ -2517,16 +2517,16 @@
mkdir -p debian/broffice.org$(VER)/usr/share/applications
mkdir -p debian/broffice.org$(VER)/usr/share/application-registry
mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/program/resource
- mkdir -p
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup
+ mkdir -p
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup
cat $(PKGDIR)-common/$(OOBRANDDIR)/program/bootstraprc \
| sed -e "s/OpenO/BrO/" | sed -e "s/openo/bro/" \
> debian/broffice.org$(VER)/$(OOBRANDDIR)/program/bootstraprc
cat $(PKGDIR)-common/$(OOBRANDDIR)/program/versionrc \
| sed -e "s/en-US/pt-BR/" | sed -e "s/OpenO/BrO/" \
> debian/broffice.org$(VER)/$(OOBRANDDIR)/program/versionrc
- cat
$(PKGDIR)-common/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup/Setup-brand.xcu
\
+ cat
$(PKGDIR)-common/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
\
| sed -e "s/OpenO/BrO/" \
- >
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup/Setup-brand.xcu
+ >
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
for iso in $(LANGPACKISOS); do \
if [ "$$iso" = "en-US" ]; then p=common; else p=l10n-`echo
$$iso | tr A-Z a-z`; fi; \
if [ -f
$(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res ]; then \
