./packages/openofficeorg/3.1/experimental r1377: merge
------------------------------------------------------------
revno: 1377
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-01-07 01:09:13 +0100
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.31
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-07 01:06:22 +0100
message:
move *.so.* move to xmlsec conditional, as that her is the only thing having *.so.* in OOos program dir; revert desktop file changing improvement for now
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-02 05:54:16 +0000
+++ b/changelog 2009-01-07 00:09:13 +0000
@@ -39,8 +39,6 @@
- apply Python26 patchset if building with python 2.6
- install libsalalloc_malloc.so.3 into -qa-tools
- remove rest of if(n)eq ETCH_BACKPORT conditionals
- - for writer/calc/impress/draw/math/base, do our changes on
- the versions in share/xdg directly
* debian/control.reportdesign.in:
- add missing Depends: on ${java-runtime-depends}
* debian/control.in:
@@ -52,7 +50,7 @@
* debian/rules, debian/broffice.org.{preinst,postrm}.in: also change
UI-brand.xcu for BrOffice.org
- -- Rene Engelhard <rene@debian.org> Fri, 02 Jan 2009 06:53:22 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 02 Jan 2009 06:08:18 +0100
openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-03 00:55:34 +0000
+++ b/rules 2009-01-07 00:09:13 +0000
@@ -1596,12 +1596,6 @@
rm -rf $(CURDIR)/debian/tmp
cd ooo-build ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)" DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install
- # these have to go to -core, otherwise we get problems with the new
- # dpkg-shibdeps...
- for i in `find debian/tmp/pkg/openoffice.org-common/$(OODIR)/program/*.so.*`; do \
- mv $$i `echo $$i | sed -e s/common/core/`; \
- done
-
ifeq "$(HELPISOS)" ""
for i in common calc math draw writer impress base; do \
rm -rf debian/tmp/pkg/openoffice.org-$$i/$(OODIR)/help; \
@@ -1650,6 +1644,21 @@
endif
endif
+ifneq "$(USE_SYSTEM_XMLSEC)" "y"
+ # these have to go to -core, otherwise we get problems with the new
+ # dpkg-shibdeps...
+ for i in `find debian/tmp/pkg/openoffice.org-common/$(OODIR)/program/*.so.*`; do \
+ mv $$i `echo $$i | sed -e s/common/core/`; \
+ done
+ # move .so to -dev. The libuno_sal* libs don't have symlinks in
+ # the package here right now (see i#97041).
+ # Thus this only applies to the libxmlsec*.so things right now
+ cd debian/tmp/pkg; \
+ mkdir -p -m755 openoffice.org-dev/$(OODIR)/program; \
+ mv openoffice.org-common/$(OODIR)/program/*.so \
+ openoffice.org-dev/$(OODIR)/program
+endif
+
ifeq "$(ENABLE_MONO)" "y"
cd debian/tmp/pkg; \
mkdir -p openoffice.org-core/$(OOBRANDDIR)/ure/lib; \
@@ -2123,13 +2132,15 @@
endif
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
+ # menu files from sysui
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
for p in writer calc impress draw math base; do \
mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
- sed -e 's,Exec=openoffice.org$(VER) \(.*\) %U,Exec=ooffice$(VER) \1 %U,' \
- -e 's,Icon=openofficeorg[0123456789]\+,Icon=ooo,' \
- -e 's,Name=OpenOffice.org $(OOVER),Name=OpenOffice.org $(VER),' \
+ sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\) %U,Exec=ooffice$(VER) \1 %U,' \
+ -e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME}[0123456789]\+,Icon=ooo,' \
+ -e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org $(VER),' \
-e 's/ / /' \
- < $(PKGDIR)-$$p/$(OOBRANDDIR)/share/xdg/$$p.desktop \
+ < $$dirname/$$p.desktop \
> $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop || exit 1 ;\
done
@@ -2143,7 +2154,7 @@
-e "s/ / /" \
$(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
endif
- # we don't need the share/xdgs (anymore) except qstart
+ # we don't need the share/xdgs except qstart
for f in `find debian -name '*.desktop' | grep xdg | grep -v qstart`; do \
rm -f $$f; done
for f in `find debian -name '*.desktop'`; do \
Reply to: