------------------------------------------------------------
revno: 1394
committer: Rene Engelhard <[email protected]>
branch nick: 31
timestamp: Fri 2009-01-23 10:11:05 +0100
message:
update changelog; merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.55
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Thu 2009-01-22 10:02:29 +0100
message:
fix link
modified:
rules
------------------------------------------------------------
revno: 1332.1.56
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Fri 2009-01-23 09:58:02 +0100
message:
-2
modified:
changelog
------------------------------------------------------------
revno: 1388.1.4
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Fri 2009-01-23 09:59:24 +0100
message:
merge
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-21 16:23:34 +0000
+++ b/changelog 2009-01-23 09:11:05 +0000
@@ -5,9 +5,9 @@
- lbnames.h supports gcc 4.4 (closes: #505669)
- now has overline supports for word (closes: #228392)
- About box now fixes en-US tense and adds missing comma (closes: #470521)
- - fixes bridges for SELinux (closes: #440105)
+ - fixes bridges for SELinux (hopefully closes: #440105)
* ooo-build:
- - back on trunk (r15102)
+ - back on trunk (r15129)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -35,7 +35,7 @@
-- Rene Engelhard <[email protected]> Mon, 19 Jan 2009 11:04:44 +0100
-openoffice.org (1:3.0.1~rc2-1.2pre) experimental; urgency=low
+openoffice.org (1:3.0.1~rc2-2) experimental; urgency=low
* ooo-build:
- update (r15097)
@@ -55,7 +55,7 @@
* merge from Ubuntu:
- make ure only Suggest a JRE
- -- Rene Engelhard <[email protected]> Wed, 21 Jan 2009 03:49:36 +0100
+ -- Rene Engelhard <[email protected]> Thu, 22 Jan 2009 09:56:13 +0100
openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-21 16:23:34 +0000
+++ b/rules 2009-01-23 09:11:05 +0000
@@ -2249,7 +2249,7 @@
mkdir -p $(PKGDIR)-dev/$(OOUREDIR)/lib
cd $(PKGDIR)-dev/$(OOUREDIR)/lib && \
for i in cppu cppuhelpergcc3 sal salhelpergcc3; do \
- ln -s /$(OOUREDIR)/libuno_$${i}.so.3 libuno_$${i}.so; \
+ ln -s /$(OOUREDIR)/lib/libuno_$${i}.so.3
libuno_$${i}.so; \
done
# install gsicheck into -dev
