------------------------------------------------------------
revno: 1062
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-04-30 08:32:57 +0200
message:
merge; update ooo-build/to m10; fix depends
modified:
changelog
control
control.in
control.pdfimport.in
control.presenter.in
rules
------------------------------------------------------------
revno: 1022.1.64
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Tue 2008-04-29 10:04:29 +0200
message:
Only depend on openoffice.org-writer2latex when Java is enabled
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.65
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-30 00:12:01 +0200
message:
also install pythonscript.py into $(SITE_PACKAGES)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-28 17:42:35 +0000
+++ b/changelog 2008-04-30 06:32:57 +0000
@@ -1,10 +1,10 @@
-openoffice.org (1:3.0.0~bea300~dev300m7-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~bea300~dev300m10-0.1pre) experimental; urgency=low
- * OpenOffice 3.0.0 development milestone 7 (DEV300_m7)
+ * OpenOffice 3.0.0 development milestone 10 (DEV300_m10)
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
* ooo-build:
- - update (r12357)
+ - update (r12388)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -14,6 +14,7 @@
* debian/rules:
- run dh_lintian
- update milestone detection for the 3.0.0~beta~dev300mX format
+ - temporarily disable the binfilters again
- lots of updates for removed $UPD and changed locations
- bump ant builddep ant (>= 1.7.0) to when we build the mediawiki
extension
@@ -41,7 +42,7 @@
* debian/copyright: LGPL v3
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 28 Apr 2008 12:36:13 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 29 Apr 2008 21:28:55 +0200
openoffice.org (1:2.4.0-5.6pre) unstable; urgency=low
@@ -55,10 +56,12 @@
right versioned build-dep for !etch
- correct control.mono.in inclusion regardless of host architecture
- explicitely set ENABLE_REPORTDESIGN=n in arch conditonals for
- disabling java (-> arm(el))
+ disabling java (-> arm(el)). Only depend on openoffice.org-writer2latex
+ when Java is enabled
+ - also install pythonscript.py into $(SITE_PACKAGES)
* debian/scripts/vars.ppc64: actually add
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 27 Apr 2008 00:59:54 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 29 Apr 2008 23:34:39 +0200
openoffice.org (1:2.4.0-5) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-04-26 23:02:50 +0000
+++ b/control 2008-04-30 06:32:57 +0000
@@ -115,7 +115,7 @@
Package: openoffice.org-common
Architecture: all
-Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts,
openoffice.org-style-andromeda
+Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts,
openoffice.org-style-galaxy
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (=
2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer
(<< ${base-version}), openoffice.org-calc (<< ${base-version}),
openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<<
${base-version}), openoffice.org-math (<< ${base-version})
@@ -295,17 +295,17 @@
This package contains the "hicontrast" symbol style, needs to be manually
enabled in the OpenOffice.org option menu.
-Package: openoffice.org-style-andromeda
+Package: openoffice.org-style-galaxy
Architecture: all
Depends: openoffice.org-common (= ${Source-Version})
-Replaces: openoffice.org-common (<< 2.1~m190), openoffice.org-style-default
-Conflicts: openoffice.org-style-default
-Provides: openoffice.org-style-default
-Description: Default symbol style for OpenOffice.org
+Replaces: openoffice.org-common (<< 2.1~m190), openoffice.org-style-default,
openoffice.org-style-andromeda
+Conflicts: openoffice.org-style-default, openoffice.org-style-andromeda
+Provides: openoffice.org-style-default, openoffice.org-style-andromeda
+Description: Galaxy (Default) symbol style for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the "Andromeda" symbol style from Sun, normally used on
+ This package contains the "Galaxy" symbol style from Sun, normally used on
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the OpenOffice.org option menu.
@@ -3131,7 +3131,7 @@
Section: misc
Priority: optional
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~beta~dev300m6),
openoffice.org-impress (>= 1:3.0.0~beta~dev300m6)
+Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6),
openoffice.org-impress (>= 1:3.0.0~beta~dev300m6)
Enhances: openoffice.org-impress
Description: OpenOffice.org Presenter Screen extension
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.in'
--- a/control.in 2008-04-23 20:05:59 +0000
+++ b/control.in 2008-04-30 06:32:57 +0000
@@ -254,7 +254,7 @@
Package: openoffice.orgVER-common
Architecture: all
Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts,
- openoffice.orgVER-style-andromeda
+ openoffice.orgVER-style-galaxy
Suggests: openoffice.orgVER-style-industrial,
openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
@@ -516,17 +516,17 @@
This package contains the "hicontrast" symbol style, needs to be manually
enabled in the OpenOffice.org option menu.
-Package: openoffice.orgVER-style-andromeda
+Package: openoffice.orgVER-style-galaxy
Architecture: all
Depends: openoffice.orgVER-common (= ${Source-Version})
-Replaces: openoffice.orgVER-common (<< 2.1~m190),
openoffice.orgVER-style-default
-Conflicts: openoffice.orgVER-style-default
-Provides: openoffice.orgVER-style-default
-Description: Default symbol style for OpenOffice.org
+Replaces: openoffice.orgVER-common (<< 2.1~m190),
openoffice.orgVER-style-default, openoffice.org-style-andromeda
+Conflicts: openoffice.orgVER-style-default, openoffice.org-style-andromeda
+Provides: openoffice.orgVER-style-default, openoffice.org-style-andromeda
+Description: Galaxy (Default) symbol style for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the "Andromeda" symbol style from Sun, normally used on
+ This package contains the "Galaxy" symbol style from Sun, normally used on
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the OpenOffice.org option menu.
=== modified file 'control.pdfimport.in'
--- a/control.pdfimport.in 2008-04-04 19:50:40 +0000
+++ b/control.pdfimport.in 2008-04-30 06:32:57 +0000
@@ -2,7 +2,7 @@
Section: misc
Priority: extra
Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 2.3)
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.0.0~bea300~dev300m6)
Description: OpenOffice.org PDF Import extension
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.presenter.in'
--- a/control.presenter.in 2008-04-03 21:26:12 +0000
+++ b/control.presenter.in 2008-04-30 06:32:57 +0000
@@ -2,7 +2,7 @@
Section: misc
Priority: optional
Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.0.0~beta~dev300m6),
openoffice.orgVER-impress (>= 1:3.0.0~beta~dev300m6)
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>=
1:3.0.0~bea300~dev300m6), openoffice.orgVER-impress (>= 1:3.0.0~beta~dev300m6)
Enhances: openoffice.orgVER-impress
Description: OpenOffice.org Presenter Screen extension
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'rules'
--- a/rules 2008-04-29 15:54:47 +0000
+++ b/rules 2008-04-30 06:32:57 +0000
@@ -88,7 +88,7 @@
PACKAGE_NPSOPLUGIN=y
PACKAGE_PCVSLIB=n
BUILD_JARS_NATIVE=y
-BUILD_BINFILTERS=y
+BUILD_BINFILTERS=n
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
JDK=java-gcj-compat
@@ -484,10 +484,12 @@
CONFIGURE_FLAGS += --disable-qadevooo
endif
-ifeq "$(PACKAGE_WRITER2LATEX)" "n"
+ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(PACKAGE_WRITER2LATEX)" "n"
CONFIGURE_FLAGS += --without-writer2latex
- ifeq "$(USE_EXTERNAL_WRITER2LATEX)" "y"
+ ifeq "$(USE_EXTERNAL_WRITER2LATEX)" "y"
WRITER_W2L_DEP = openoffice.org-writer2latex
+ endif
endif
endif
@@ -2130,6 +2132,7 @@
mv debian/python-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
mv debian/python-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
mv debian/python-uno/$(OODIR)/program/pythonloader.py $(PYTHON_SITE)
+ mv debian/python-uno/$(OODIR)/program/pythonscript.py $(PYTHON_SITE)
mv debian/python-uno/$(OODIR)/program/pyuno.so $(PYTHON_SITE)
touch debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u+w debian/python-uno/$(OODIR)/program/pythonloader.unorc
