------------------------------------------------------------
revno: 1497
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Wed 2009-04-15 14:58:32 +0200
message:
prepare for m10; w2l will be gone there
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-04-15 11:38:25 +0000
+++ b/changelog 2009-04-15 12:58:32 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.1.0~rc1-3) UNRELEASED; urgency=low
+openoffice.org (1:3.1.0~rc2-1) UNRELEASED; urgency=low
* ooo-build
- update (f51d5e08421d33dc4d88f193c252451c6262a23f)
@@ -12,6 +12,10 @@
in 3.8.0. (ccache,lang=en-US de -> ccache lang=en-US,de)
* debian/rules, debian/control.debug.in:
- fix lintians dbg-package-missing-depends
+ * debian/rules, debian/control.in:
+ - remove writer2latex remains as it a) is not a "bundled extension"
+ anymore and b) is not in the code anymore either. Still available
+ externally.
* debian/rules:
- remove Python26 special-casing, we now have a generic patch for 2.4 and
2.6
=== modified file 'control'
--- a/control 2009-04-15 11:38:25 +0000
+++ b/control 2009-04-15 12:58:32 +0000
@@ -13,7 +13,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin,
ttf-dejavu, ${ooo-officebean-dep}, ${writer-w2l-dep},
openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends},
${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin,
ttf-dejavu, ${ooo-officebean-dep}, openoffice.org-filter-mobiledev,
${lucene-depends}, ${java-common-depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ttf-liberation | msttcorefonts
Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1,
libgl1, openoffice.org-gnome, iceweasel | firefox | icedove | thunderbird |
iceape-browser | mozilla-browser, ${java-runtime-depends},
openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat |
imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${binary:Version}), openoffice.org-java-common
(<< 1:3.0.0)
@@ -143,7 +143,7 @@
Package: openoffice.org-writer
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}, openoffice.org-emailmerge,
openoffice.org-math
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, openoffice.org-emailmerge, openoffice.org-math
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-writer (<< ${binary:Version}), openoffice.org-common (<<
1:2.3.1)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<<
${binary:Version}), openoffice.org-java-common (<= 1:2.3.1)
Provides: openoffice.org2-writer
=== modified file 'control.in'
--- a/control.in 2009-04-15 11:38:25 +0000
+++ b/control.in 2009-04-15 12:58:32 +0000
@@ -68,7 +68,6 @@
openoffice.orgVER-report-builder-bin,
ttf-dejavu,
${ooo-officebean-dep},
- ${writer-w2l-dep},
openoffice.orgVER-filter-mobiledev,
${lucene-depends},
${java-common-depends},
@@ -330,7 +329,7 @@
openoffice.orgVER-base-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}, openoffice.orgVER-emailmerge,
openoffice.orgVER-math
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, openoffice.orgVER-emailmerge, openoffice.orgVER-math
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-writer (<< ${binary:Version}),
=== modified file 'rules'
--- a/rules 2009-04-15 11:38:25 +0000
+++ b/rules 2009-04-15 12:58:32 +0000
@@ -63,7 +63,7 @@
MWS=OOO310
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e
s/$(shell echo $(MWS) | tr A-Z a-z)//)
-MILESTONE=m9
+MILESTONE=m10
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-1
@@ -519,11 +519,6 @@
CONFIGURE_FLAGS += --disable-qadevooo
-ifeq "$(ENABLE_JAVA)" "y"
- WRITER_W2L_DEP = openoffice.org-writer2latex
- CONFIGURE_FLAGS += --without-writer2latex
-endif
-
ifeq "$(RUN_SMOKETEST)" "y"
BUILD_DEPS += , xvfb, xbase-clients, xfonts-base
endif
@@ -3000,7 +2995,6 @@
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
- -V'writer-w2l-dep=$(WRITER_W2L_DEP)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
