./packages/openofficeorg/3.1/experimental r1393: merge
------------------------------------------------------------
revno: 1393
committer: Rene Engelhard <rene@debian.org>
branch nick: 31
timestamp: Wed 2009-01-21 17:23:34 +0100
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.52
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-21 03:37:17 +0100
message:
create .so symlinks for the UNO libs
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.53
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-21 03:51:22 +0100
message:
don't add double text/rtf
modified:
changelog
rules
------------------------------------------------------------
revno: 1388.1.3
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-21 03:57:36 +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
=== modified file 'changelog'
--- a/changelog 2009-01-20 16:06:30 +0000
+++ b/changelog 2009-01-21 16:23:34 +0000
@@ -28,7 +28,6 @@
- explicitely specify --with-stlport in USE_STLPORT=y case as
./configure now only defaults to STLport on i386. Add note
about STLport and some upcoming system stuff
- - remove +OOo3.0.0~ suffix for ure/uno-libs3s .shlibs, ure is now at 1.5.0
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
* debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
@@ -45,6 +44,10 @@
- use UREPACKAGEVERSION for determining ures version, more correct and
also includes the micro. Remove +OOo3.0.0~ suffix as ure now is at 1.4.1
and we bump .shlibs anyway
+ - create .so symlinks in UREs dir in -dev so that we have some even if
+ the SDK mechanism which creates a dir in $HOME fails.
+ - stop adding a extra text/rtf as writer.desktop now already contains
+ it upstream (closes: #512417)
* debian/control.in:
- make -common conflict against dictionaries-common (<< 0.98.14)
- move from Breaks: to Conflicts: as otherwise the experimental buildds
@@ -52,7 +55,7 @@
* merge from Ubuntu:
- make ure only Suggest a JRE
- -- Rene Engelhard <rene@debian.org> Tue, 20 Jan 2009 14:05:04 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 21 Jan 2009 03:49:36 +0100
openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-20 16:06:30 +0000
+++ b/rules 2009-01-21 16:23:34 +0000
@@ -2126,8 +2126,6 @@
echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
fi; \
done
- sed -i -e 's,;application/rtf,;application/rtf;text/rtf,' \
- $(PKGDIR)-writer/usr/share/applications/ooo$(VER)-writer.desktop
sed -i -e 's/Office;/Office;Graphics;/' $(PKGDIR)-draw/usr/share/applications/ooo$(VER)-draw.desktop
# invalid, according to lintian. make it shut up.
for i in writer calc impress draw math base; do \
@@ -2245,6 +2243,15 @@
cd $(PKGDIR)-dev/$(OOSDKDIR) && \
rm docs
+ # create .so symlinks upstream doesn't create (see i#97041).
+ # we do it here so that we don't need to patch the SDKs
+ # "deployment dir". The -L for the URE dir is added anyway.
+ 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; \
+ done
+
# install gsicheck into -dev
install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
Reply to: