./packages/openofficeorg/3.1/experimental r1392: merge
------------------------------------------------------------
revno: 1392
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2009-01-23 09:59:24 +0100
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.3.10
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-15 22:02:12 +0100
message:
close #507865
modified:
changelog
------------------------------------------------------------
revno: 1022.3.11
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2009-01-19 01:04:53 +0100
message:
-16
modified:
changelog
------------------------------------------------------------
revno: 1022.3.12
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-21 12:57:54 +0100
message:
fix #i88376; -17
modified:
changelog
------------------------------------------------------------
revno: 1332.1.54
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-01-21 13:28:09 +0100
message:
fake merge
------------------------------------------------------------
revno: 1332.1.55
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-22 10:02:29 +0100
message:
fix link
modified:
rules
------------------------------------------------------------
revno: 1332.1.56
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2009-01-23 09:58:02 +0100
message:
-2
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2009-01-21 02:57:36 +0000
+++ b/changelog 2009-01-23 08:59:24 +0000
@@ -32,7 +32,7 @@
-- Rene Engelhard <rene@debian.org> 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)
@@ -52,7 +52,7 @@
* merge from Ubuntu:
- make ure only Suggest a JRE
- -- Rene Engelhard <rene@debian.org> Wed, 21 Jan 2009 03:49:36 +0100
+ -- Rene Engelhard <rene@debian.org> 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 02:57:36 +0000
+++ b/rules 2009-01-23 08:59:24 +0000
@@ -2243,7 +2243,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
Reply to: