------------------------------------------------------------
revno: 1479
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Thu 2009-04-02 23:20:55 +0200
message:
don't put OGLTrans into -ogltrans
removed:
control.ogltrans.in
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-04-02 20:02:52 +0000
+++ b/changelog 2009-04-02 21:20:55 +0000
@@ -8,7 +8,10 @@
- src: add GSI_ro.sdf.bz2 from ftp.linux.cz/DEV300 (closes: #522180)
* debian/rules:
- add conditional to use python-support
- - (temporarily) revert to build with boost 1.34 (closes: #521035)
+ * debian/control.in, debian/control.ogltrans.in, debian/rules:
+ - don't put OGLTrans into -ogltrans, services.rdb references it and
+ Impress crashes horribly if it's not there (closes: #521035). Add
+ Conflict/Replaces/Provides.
* debian/rules, ooo-build/*: switch to Fedoras solution for PyUNO. Replace
RPATH with os.path.append in uno.py and just install uno*.py into
site-packages (closes: #520944)
@@ -16,7 +19,7 @@
- add last three ${misc:Depends}, even where we have no Depends: line
otherwise
- -- Rene Engelhard <r...@debian.org> Thu, 02 Apr 2009 22:00:11 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 02 Apr 2009 23:13:58 +0200
openoffice.org (1:3.0.1-9) unstable; urgency=high
=== modified file 'control'
--- a/control 2009-04-02 20:02:52 +0000
+++ b/control 2009-04-02 21:20:55 +0000
@@ -170,9 +170,9 @@
Package: openoffice.org-impress
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-draw (=
${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-impress (<< ${binary:Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
-Provides: openoffice.org2-impress
-Conflicts: openoffice.org-debian-files, openoffice.org2-impress (<<
${binary:Version})
+Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-impress (<< ${binary:Version}), openoffice.org-common (<<
2.0.3+2.0.4m179),
+Provides: openoffice.org2-impress, openoffice.org-ogltrans
+Conflicts: openoffice.org-debian-files, openoffice.org2-impress (<<
${binary:Version}), openoffice.org-ogltrans (<= 1:3.1.0~ooo300m6-1)
Description: full-featured office productivity suite -- presentation
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3295,19 +3295,6 @@
This package contains a Mozilla/Netscape compatible plugin which can handle
all OOo documents.
-Package: openoffice.org-ogltrans
-Section: graphics
-Priority: extra
-Architecture: i386 powerpc sparc s390 amd64 ia64 ppc64
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.1.0~),
openoffice.org-impress (>> 1:3.1.0~), openoffice.org-common (>> 1:3.1.0~),
${misc:Depends}
-Enhances: openoffice.org-impress
-Description: OpenOffice.org Impress extension for transitions using OpenGL
- OpenOffice.org is a full-featured office productivity suite that provide
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the extension making OpenOffice.org able to use
- OpenGL for impress transitions.
-
Package: openoffice.org-wiki-publisher
Section: misc
Priority: optional
=== modified file 'control.in'
--- a/control.in 2009-04-02 13:02:22 +0000
+++ b/control.in 2009-04-02 21:20:55 +0000
@@ -380,10 +380,12 @@
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-impress (<< ${binary:Version}),
- openoffice.org-common (<< 2.0.3+2.0.4m179)
-Provides: openoffice.org2-impress
+ openoffice.org-common (<< 2.0.3+2.0.4m179),
+Provides: openoffice.org2-impress,
+ openoffice.org-ogltrans
Conflicts: openoffice.org-debian-files,
- openoffice.org2-impress (<< ${binary:Version})
+ openoffice.org2-impress (<< ${binary:Version}),
+ openoffice.org-ogltrans (<= 1:3.1.0~ooo300m6-1)
Description: full-featured office productivity suite -- presentation
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== removed file 'control.ogltrans.in'
--- a/control.ogltrans.in 2009-03-29 21:16:28 +0000
+++ b/control.ogltrans.in 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-Package: openoffice.orgVER-ogltrans
-Section: graphics
-Priority: extra
-Architecture: %OOO_OGLTRANS_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.1.0~),
openoffice.orgVER-impress (>> 1:3.1.0~), openoffice.orgVER-common (>> 1:3.1.0~),
- ${misc:Depends}
-Enhances: openoffice.orgVER-impress
-Description: OpenOffice.org Impress extension for transitions using OpenGL
- OpenOffice.org is a full-featured office productivity suite that provide
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the extension making OpenOffice.org able to use
- OpenGL for impress transitions.
-
=== modified file 'rules'
--- a/rules 2009-04-02 20:02:52 +0000
+++ b/rules 2009-04-02 21:20:55 +0000
@@ -1347,10 +1347,6 @@
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mozilla.in
endif
-ifneq "$(OOO_OGLTRANS_ARCHS)" ""
- sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
- >> debian/control < debian/control.ogltrans.in
-endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(ENABLE_MEDIAWIKI)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
@@ -1393,7 +1389,6 @@
perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g"
debian/control
- perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_BUILD_SVN%,$(OOO_BUILD_SVN)," debian/control
@@ -2401,13 +2396,8 @@
$(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extension/install/postgresql-sdbc-$(shell
grep ^PQ_SDBC_M
$(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"="
-f2 | xargs | sed -e s/\ /\./g).zip
ifeq "$(ENABLE_OPENGL)" "y"
- rm -rf $(PKGDIR)-ogltrans
- mkdir -p $(PKGDIR)-ogltrans/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/OGLTrans.uno.so \
- $(PKGDIR)-ogltrans/$(OODIR)/program
- mkdir -p $(PKGDIR)-ogltrans/$(OODIR)/share/config/soffice.cfg/simpress/
- mv
$(PKGDIR)-impress/$(OODIR)/share/config/soffice.cfg/simpress/transitions-ogl.xml
\
-
$(PKGDIR)-ogltrans/$(OODIR)/share/config/soffice.cfg/simpress/transitions-ogl.xml
+ $(PKGDIR)-impress/$(OODIR)/program
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
